diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-07-03 15:51:51 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2011-07-03 15:51:51 (GMT) |
commit | a6ba2bfaa84b294844f3fb353fe7fa329bdcba1b (patch) | |
tree | b530b15afe304f85c3ce57b990f57245fd10f2b6 /src/Screen.cc | |
parent | 702570b3e7959533024616a0e0b4623679af06af (diff) | |
download | fluxbox_pavel-a6ba2bfaa84b294844f3fb353fe7fa329bdcba1b.zip fluxbox_pavel-a6ba2bfaa84b294844f3fb353fe7fa329bdcba1b.tar.bz2 |
Fix a bug in the default root menu
Diffstat (limited to 'src/Screen.cc')
-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 414af85..f57c5ad 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -1389,13 +1389,17 @@ void BScreen::rereadMenu() { | |||
1389 | 1389 | ||
1390 | if (m_rootmenu->numberOfItems() == 0) { | 1390 | if (m_rootmenu->numberOfItems() == 0) { |
1391 | _FB_USES_NLS; | 1391 | _FB_USES_NLS; |
1392 | typedef FbTk::RefCount<FbTk::Command<void> > RefCmd; | ||
1393 | const FbTk::CommandParser<void> &parser = FbTk::CommandParser<void>::instance(); | ||
1394 | |||
1392 | m_rootmenu->setLabel(_FB_XTEXT(Menu, DefaultRootMenu, "Fluxbox default menu", "Title of fallback root menu")); | 1395 | m_rootmenu->setLabel(_FB_XTEXT(Menu, DefaultRootMenu, "Fluxbox default menu", "Title of fallback root menu")); |
1393 | FbTk::RefCount<FbTk::Command<void> > restart_fb(FbTk::CommandParser<void>::instance().parse("restart")); | 1396 | RefCmd execute_xterm(parser.parse("exec", "xterm")); |
1394 | FbTk::RefCount<FbTk::Command<void> > exit_fb(FbTk::CommandParser<void>::instance().parse("exit")); | 1397 | RefCmd reconfigure_fb(parser.parse("reconfigure")); |
1395 | FbTk::RefCount<FbTk::Command<void> > execute_xterm(FbTk::CommandParser<void>::instance().parse("exec xterm")); | 1398 | RefCmd restart_fb(parser.parse("restart")); |
1399 | RefCmd exit_fb(parser.parse("exit")); | ||
1396 | m_rootmenu->insert("xterm", execute_xterm); | 1400 | m_rootmenu->insert("xterm", execute_xterm); |
1397 | m_rootmenu->insert(_FB_XTEXT(Menu, Reconfigure, "Reconfigure", | 1401 | m_rootmenu->insert(_FB_XTEXT(Menu, Reconfigure, "Reconfigure", |
1398 | "Reload Configuration command")), | 1402 | "Reload Configuration command"), reconfigure_fb); |
1399 | m_rootmenu->insert(_FB_XTEXT(Menu, Restart, "Restart", "Restart command"), | 1403 | m_rootmenu->insert(_FB_XTEXT(Menu, Restart, "Restart", "Restart command"), |
1400 | restart_fb); | 1404 | restart_fb); |
1401 | m_rootmenu->insert(_FB_XTEXT(Menu, Exit, "Exit", "Exit command"), | 1405 | m_rootmenu->insert(_FB_XTEXT(Menu, Exit, "Exit", "Exit command"), |