aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Screen.cc4
-rw-r--r--src/Slit.cc5
-rw-r--r--src/Toolbar.cc6
-rw-r--r--src/ToolbarHandler.cc5
4 files changed, 11 insertions, 9 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index c1bb3db..1182dba 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.cc,v 1.177 2003/05/24 05:49:31 rathnor Exp $ 25// $Id: Screen.cc,v 1.178 2003/05/24 13:13:22 rathnor Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -520,7 +520,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
520 resource(rm, screenname, altscreenname), 520 resource(rm, screenname, altscreenname),
521 m_toolbarhandler(0) { 521 m_toolbarhandler(0) {
522 522
523
524 Display *disp = FbTk::App::instance()->display(); 523 Display *disp = FbTk::App::instance()->display();
525 524
526 initXinerama(); 525 initXinerama();
@@ -626,6 +625,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
626 } 625 }
627 626
628 workspacemenu.reset(createMenuFromScreen(*this)); 627 workspacemenu.reset(createMenuFromScreen(*this));
628 workspacemenu->setInternalMenu();
629 629
630 if (*resource.workspaces != 0) { 630 if (*resource.workspaces != 0) {
631 for (int i = 0; i < *resource.workspaces; ++i) { 631 for (int i = 0; i < *resource.workspaces; ++i) {
diff --git a/src/Slit.cc b/src/Slit.cc
index 8830cb8..79ebb62 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Slit.cc,v 1.57 2003/05/19 15:32:47 rathnor Exp $ 25// $Id: Slit.cc,v 1.58 2003/05/24 13:13:22 rathnor Exp $
26 26
27#include "Slit.hh" 27#include "Slit.hh"
28 28
@@ -1253,7 +1253,8 @@ void Slit::setupMenu() {
1253 SlitSet, SlitSlitPlacement, 1253 SlitSet, SlitSlitPlacement,
1254 "Slit Placement")); 1254 "Slit Placement"));
1255 m_placement_menu.setMinimumSublevels(3); 1255 m_placement_menu.setMinimumSublevels(3);
1256 m_placement_menu.setInternalMenu(); 1256 m_layermenu->setInternalMenu();
1257 m_clientlist_menu.setInternalMenu();
1257 1258
1258 1259
1259 // setup items in sub menu 1260 // setup items in sub menu
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index e5b5a5a..4c954c4 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Toolbar.cc,v 1.87 2003/05/24 05:49:31 rathnor Exp $ 25// $Id: Toolbar.cc,v 1.88 2003/05/24 13:13:22 rathnor Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -132,8 +132,6 @@ void setupMenus(Toolbar &tbar) {
132 tbar.screen().doToolbarAutoHide(), 132 tbar.screen().doToolbarAutoHide(),
133 reconfig_toolbar_and_save_resource)); 133 reconfig_toolbar_and_save_resource));
134 134
135 menu.setInternalMenu();
136
137 menu.insert("Layer...", &tbar.layermenu()); 135 menu.insert("Layer...", &tbar.layermenu());
138 136
139 if (tbar.screen().hasXinerama()) { 137 if (tbar.screen().hasXinerama()) {
@@ -286,6 +284,8 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, FbTk::Menu &menu, size_t wi
286 // we need to get notified when the theme is reloaded 284 // we need to get notified when the theme is reloaded
287 m_theme.addListener(m_themelistener); 285 m_theme.addListener(m_themelistener);
288 286
287 m_layermenu.setInternalMenu();
288 m_placementmenu.setInternalMenu();
289 setupMenus(*this); 289 setupMenus(*this);
290 290
291 // geometry settings 291 // geometry settings
diff --git a/src/ToolbarHandler.cc b/src/ToolbarHandler.cc
index a60a050..eda54c9 100644
--- a/src/ToolbarHandler.cc
+++ b/src/ToolbarHandler.cc
@@ -20,7 +20,7 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: ToolbarHandler.cc,v 1.13 2003/05/15 23:30:05 fluxgen Exp $ 23// $Id: ToolbarHandler.cc,v 1.14 2003/05/24 13:13:22 rathnor Exp $
24 24
25/** 25/**
26 * The ToolbarHandler class acts as a rough interface to the toolbar. 26 * The ToolbarHandler class acts as a rough interface to the toolbar.
@@ -96,6 +96,7 @@ ToolbarHandler::ToolbarHandler(BScreen &screen, ToolbarMode mode)
96 screen.screenNumber(), screen.imageControl()) 96 screen.screenNumber(), screen.imageControl())
97{ 97{
98 m_modemenu.setInternalMenu(); 98 m_modemenu.setInternalMenu();
99 m_toolbarmenu.setInternalMenu();
99 setupModeMenu(m_modemenu, *this); 100 setupModeMenu(m_modemenu, *this);
100 setMode(mode, false); // the atomhandler part will initialise it shortly 101 setMode(mode, false); // the atomhandler part will initialise it shortly
101} 102}
@@ -116,9 +117,9 @@ void ToolbarHandler::setMode(ToolbarMode mode, bool initialise) {
116 return; 117 return;
117 } else if (!m_toolbar.get()) { 118 } else if (!m_toolbar.get()) {
118 m_toolbarmenu.removeAll(); 119 m_toolbarmenu.removeAll();
119
120 m_toolbar.reset(new Toolbar(m_screen, 120 m_toolbar.reset(new Toolbar(m_screen,
121 *m_screen.layerManager().getLayer(m_screen.getToolbarLayerNum()), m_toolbarmenu)); 121 *m_screen.layerManager().getLayer(m_screen.getToolbarLayerNum()), m_toolbarmenu));
122
122 m_toolbarmenu.insert("Mode...", &m_modemenu); 123 m_toolbarmenu.insert("Mode...", &m_modemenu);
123 m_toolbarmenu.update(); 124 m_toolbarmenu.update();
124 } 125 }