summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Slit.cc1
-rw-r--r--src/Toolbar.cc10
2 files changed, 7 insertions, 4 deletions
diff --git a/src/Slit.cc b/src/Slit.cc
index e6ceb57..f12991e 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -59,6 +59,7 @@
59#include "SlitClient.hh" 59#include "SlitClient.hh"
60#include "Xutil.hh" 60#include "Xutil.hh"
61#include "FbAtoms.hh" 61#include "FbAtoms.hh"
62#include "FbTk/App.hh"
62#include "FbTk/MenuSeparator.hh" 63#include "FbTk/MenuSeparator.hh"
63#include "FbTk/StringUtil.hh" 64#include "FbTk/StringUtil.hh"
64#include "FbTk/I18n.hh" 65#include "FbTk/I18n.hh"
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 1b14855..2a9eb8b 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -32,7 +32,7 @@
32// themes 32// themes
33#include "ToolbarTheme.hh" 33#include "ToolbarTheme.hh"
34 34
35#include "FbTk/I18n.hh" 35#include "fluxbox.hh"
36#include "Screen.hh" 36#include "Screen.hh"
37#include "IntResMenuItem.hh" 37#include "IntResMenuItem.hh"
38#include "BoolMenuItem.hh" 38#include "BoolMenuItem.hh"
@@ -45,6 +45,7 @@
45#include "CommandParser.hh" 45#include "CommandParser.hh"
46#include "Layer.hh" 46#include "Layer.hh"
47 47
48#include "FbTk/I18n.hh"
48#include "FbTk/ImageControl.hh" 49#include "FbTk/ImageControl.hh"
49#include "FbTk/MacroCommand.hh" 50#include "FbTk/MacroCommand.hh"
50#include "FbTk/EventManager.hh" 51#include "FbTk/EventManager.hh"
@@ -819,17 +820,17 @@ void Toolbar::setupMenus() {
819 m_rc_width_percent, 820 m_rc_width_percent,
820 0, 100, menu()); // min/max value 821 0, 100, menu()); // min/max value
821 822
822 823
823 toolbar_menuitem->setCommand(reconfig_toolbar_and_save_resource); 824 toolbar_menuitem->setCommand(reconfig_toolbar_and_save_resource);
824 menu().insert(toolbar_menuitem); 825 menu().insert(toolbar_menuitem);
825 826
826 menu().insert(new BoolMenuItem(_FBTEXT(Common, MaximizeOver, 827 menu().insert(new BoolMenuItem(_FBTEXT(Common, MaximizeOver,
827 "Maximize Over", 828 "Maximize Over",
828 "Maximize over this thing when maximizing"), 829 "Maximize over this thing when maximizing"),
829 *m_rc_maximize_over, 830 *m_rc_maximize_over,
830 reconfig_toolbar_and_save_resource)); 831 reconfig_toolbar_and_save_resource));
831 menu().insert(_FBTEXT(Menu, Layer, "Layer...", "Title of Layer menu"), &layerMenu()); 832 menu().insert(_FBTEXT(Menu, Layer, "Layer...", "Title of Layer menu"), &layerMenu());
832 833#ifdef XINERAMA
833 if (screen().hasXinerama()) { 834 if (screen().hasXinerama()) {
834 menu().insert(_FBTEXT(Menu, OnHead, "On Head...", "Title of On Head menu"), 835 menu().insert(_FBTEXT(Menu, OnHead, "On Head...", "Title of On Head menu"),
835 new XineramaHeadMenu<Toolbar>(screen().menuTheme(), 836 new XineramaHeadMenu<Toolbar>(screen().menuTheme(),
@@ -840,6 +841,7 @@ void Toolbar::setupMenus() {
840 _FBTEXT(Toolbar, OnHead, "Toolbar on Head", 841 _FBTEXT(Toolbar, OnHead, "Toolbar on Head",
841 "Title of toolbar on head menu"))); 842 "Title of toolbar on head menu")));
842 } 843 }
844#endif // XINERAMA
843 845
844 typedef pair<const char*, Toolbar::Placement> PlacementP; 846 typedef pair<const char*, Toolbar::Placement> PlacementP;
845 typedef list<PlacementP> Placements; 847 typedef list<PlacementP> Placements;