aboutsummaryrefslogtreecommitdiff
path: root/src/Toolbar.cc
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-07-25 10:03:55 (GMT)
committerrathnor <rathnor>2003-07-25 10:03:55 (GMT)
commitac7edef9ad73818435420479a0dfa9c5ed517a79 (patch)
tree4fd531858253a00bd36689153e6c83c65890df39 /src/Toolbar.cc
parent9ca1f367cb9eef78ee1871fe5b96298f8325d987 (diff)
downloadfluxbox_pavel-ac7edef9ad73818435420479a0dfa9c5ed517a79.zip
fluxbox_pavel-ac7edef9ad73818435420479a0dfa9c5ed517a79.tar.bz2
make sure all menus have titles, make -version go to stdout
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r--src/Toolbar.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 251d8dd..409181b 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.102 2003/07/19 11:55:49 rathnor Exp $ 25// $Id: Toolbar.cc,v 1.103 2003/07/25 10:03:55 rathnor Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -284,6 +284,10 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, FbTk::Menu &menu, size_t wi
284 284
285 moveToLayer((*m_rc_layernum).getNum()); 285 moveToLayer((*m_rc_layernum).getNum());
286 286
287 // TODO: nls
288 m_layermenu.setLabel("Toolbar Layer");
289 m_placementmenu.setLabel("Toolbar Placement");
290
287 m_layermenu.setInternalMenu(); 291 m_layermenu.setInternalMenu();
288 m_placementmenu.setInternalMenu(); 292 m_placementmenu.setInternalMenu();
289 setupMenus(); 293 setupMenus();
@@ -1392,12 +1396,14 @@ void Toolbar::setupMenus() {
1392 menu.insert("Layer...", &tbar.layermenu()); 1396 menu.insert("Layer...", &tbar.layermenu());
1393 1397
1394 if (tbar.screen().hasXinerama()) { 1398 if (tbar.screen().hasXinerama()) {
1399 // TODO: nls (main label plus menu heading
1395 menu.insert("On Head...", new XineramaHeadMenu<Toolbar>( 1400 menu.insert("On Head...", new XineramaHeadMenu<Toolbar>(
1396 *tbar.screen().menuTheme(), 1401 *tbar.screen().menuTheme(),
1397 tbar.screen(), 1402 tbar.screen(),
1398 tbar.screen().imageControl(), 1403 tbar.screen().imageControl(),
1399 *tbar.screen().layerManager().getLayer(Fluxbox::instance()->getMenuLayer()), 1404 *tbar.screen().layerManager().getLayer(Fluxbox::instance()->getMenuLayer()),
1400 tbar 1405 tbar,
1406 "Toolbar on Head"
1401 )); 1407 ));
1402 } 1408 }
1403 1409