diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-07-03 15:51:51 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2013-02-17 09:36:38 (GMT) |
commit | 00c441ccae7e5e94b28d5b22df9b2b8ed13af281 (patch) | |
tree | 2eb556f3e49dd8330dd1ed112a5b60443941cd86 | |
parent | 23fdcdf44c447fe4511a90e7cde9b4eed57065b2 (diff) | |
download | fluxbox_pavel-00c441ccae7e5e94b28d5b22df9b2b8ed13af281.zip fluxbox_pavel-00c441ccae7e5e94b28d5b22df9b2b8ed13af281.tar.bz2 |
Fix a bug in the default root menu
-rw-r--r-- | src/Screen.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 0165bfe..8e3091d 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -1400,13 +1400,17 @@ void BScreen::rereadMenu() { | |||
1400 | 1400 | ||
1401 | if (m_rootmenu->numberOfItems() == 0) { | 1401 | if (m_rootmenu->numberOfItems() == 0) { |
1402 | _FB_USES_NLS; | 1402 | _FB_USES_NLS; |
1403 | typedef FbTk::RefCount<FbTk::Command<void> > RefCmd; | ||
1404 | const FbTk::CommandParser<void> &parser = FbTk::CommandParser<void>::instance(); | ||
1405 | |||
1403 | m_rootmenu->setLabel(_FB_XTEXT(Menu, DefaultRootMenu, "Fluxbox default menu", "Title of fallback root menu")); | 1406 | m_rootmenu->setLabel(_FB_XTEXT(Menu, DefaultRootMenu, "Fluxbox default menu", "Title of fallback root menu")); |
1404 | FbTk::RefCount<FbTk::Command<void> > restart_fb(FbTk::CommandParser<void>::instance().parse("restart")); | 1407 | RefCmd execute_xterm(parser.parse("exec", "xterm")); |
1405 | FbTk::RefCount<FbTk::Command<void> > exit_fb(FbTk::CommandParser<void>::instance().parse("exit")); | 1408 | RefCmd reconfigure_fb(parser.parse("reconfigure")); |
1406 | FbTk::RefCount<FbTk::Command<void> > execute_xterm(FbTk::CommandParser<void>::instance().parse("exec xterm")); | 1409 | RefCmd restart_fb(parser.parse("restart")); |
1410 | RefCmd exit_fb(parser.parse("exit")); | ||
1407 | m_rootmenu->insert("xterm", execute_xterm); | 1411 | m_rootmenu->insert("xterm", execute_xterm); |
1408 | m_rootmenu->insert(_FB_XTEXT(Menu, Reconfigure, "Reconfigure", | 1412 | m_rootmenu->insert(_FB_XTEXT(Menu, Reconfigure, "Reconfigure", |
1409 | "Reload Configuration command")), | 1413 | "Reload Configuration command"), reconfigure_fb); |
1410 | m_rootmenu->insert(_FB_XTEXT(Menu, Restart, "Restart", "Restart command"), | 1414 | m_rootmenu->insert(_FB_XTEXT(Menu, Restart, "Restart", "Restart command"), |
1411 | restart_fb); | 1415 | restart_fb); |
1412 | m_rootmenu->insert(_FB_XTEXT(Menu, Exit, "Exit", "Exit command"), | 1416 | m_rootmenu->insert(_FB_XTEXT(Menu, Exit, "Exit", "Exit command"), |