add freedesktop menu

diff --git a/awesome/bindings.lua b/awesome/bindings.lua
index 75371fc57a8f32fc0428dcf7945d31225c803c77..a6a58b3f9ffb0f97dad24d7cd04affb18996e039 100644 (file)
--- a/awesome/bindings.lua
+++ b/awesome/bindings.lua
@@ -75,9 +75,6 @@ globalkeys = awful.util.table.join(
     -- switch layout
     awful.key({ modkey }, "]", function () awful.layout.inc(layouts,  1) end),
     awful.key({ modkey }, "[", function () awful.layout.inc(layouts, -1) end),
     -- switch layout
     awful.key({ modkey }, "]", function () awful.layout.inc(layouts,  1) end),
     awful.key({ modkey }, "[", function () awful.layout.inc(layouts, -1) end),

-    -- Shutdown menu
-    awful.key({        }, "F19", function () myshutdownmenu:show() end),
-    awful.key({ modkey }, "F1",  function () myshutdownmenu:show() end),

     -- Ksnapshot
     awful.key({        }, "F13", function () awful.util.spawn("ksnapshot") end),
     -- Layout manipulation
     -- Ksnapshot
     awful.key({        }, "F13", function () awful.util.spawn("ksnapshot") end),
     -- Layout manipulation

diff --git a/awesome/freedesktop b/awesome/freedesktop
new file mode 120000 (symlink)
index 0000000..bec2ca5
--- /dev/null
+++ b/awesome/freedesktop
@@ -0,0 +1 @@
+awesome-freedesktop/freedesktop
\ No newline at end of file

diff --git a/awesome/menu.lua b/awesome/menu.lua
index fcf4cdd3af93638dcae84e7758a021da492f51ba..e37f779e7c8264f8f5e1d4f426505d728a1d7bd0 100644 (file)
--- a/awesome/menu.lua
+++ b/awesome/menu.lua
@@ -1,3 +1,9 @@
+-- Freedesktop
+require('freedesktop.utils')
+require('freedesktop.menu')
+
+freedesktopmenu = freedesktop.menu.new()
+

 -- {{{ Menu
 -- Setup global menu keys
 awful.menu.menu_keys.up    = { "k", "Up"}
 -- {{{ Menu
 -- Setup global menu keys
 awful.menu.menu_keys.up    = { "k", "Up"}


@@ -13,20 +19,21 @@ myawesomemenu = {
    { "quit", awesome.quit }
 }
 
    { "quit", awesome.quit }
 }
 

-mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
-                                    { "open terminal", terminal }
-                                  }
-                        })
+systemmenu = { 
+    { "shutdown", "systemctl poweroff" },
+    { "restart",  "systemctl reboot"   },
+    { "suspend",  "systemctl suspend"  },
+}
+menu_items = {}
+table.insert(menu_items, { "menu"   , freedesktopmenu                       })
+table.insert(menu_items, { "awesome", myawesomemenu, beautiful.awesome_icon })
+table.insert(menu_items, { "system" , systemmenu                            })
+
+mymainmenu = awful.menu({ items = menu_items, width = 150 })

 
 mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
                                      menu = mymainmenu })
 
 
 mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
                                      menu = mymainmenu })
 

-myshutdownmenu = awful.menu({ items = { { "shutdown", "systemctl poweroff" },
-                                        { "restart",  "systemctl reboot"  },
-                                        { "suspend",  "systemctl suspend"  },
-                                      }
-                            })
-

 -- Menubar configuration
 menubar.utils.terminal = terminal -- Set the terminal for applications that require it
 -- }}}
 -- Menubar configuration
 menubar.utils.terminal = terminal -- Set the terminal for applications that require it
 -- }}}