make sure all menus have titles, make -version go to stdout

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 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Toolbar.cc,v 1.102 2003/07/19 11:55:49 rathnor Exp $
+// $Id: Toolbar.cc,v 1.103 2003/07/25 10:03:55 rathnor Exp $
 
 #include "Toolbar.hh"
 
@@ -284,6 +284,10 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, FbTk::Menu &menu, size_t wi
 
     moveToLayer((*m_rc_layernum).getNum());
 
+    // TODO: nls
+    m_layermenu.setLabel("Toolbar Layer");
+    m_placementmenu.setLabel("Toolbar Placement");
+
     m_layermenu.setInternalMenu();
     m_placementmenu.setInternalMenu();
     setupMenus();
@@ -1392,12 +1396,14 @@ void Toolbar::setupMenus() {
     menu.insert("Layer...", &tbar.layermenu());
 
     if (tbar.screen().hasXinerama()) {
+        // TODO: nls (main label plus menu heading
         menu.insert("On Head...", new XineramaHeadMenu<Toolbar>(
                         *tbar.screen().menuTheme(),
                         tbar.screen(),
                         tbar.screen().imageControl(),
                         *tbar.screen().layerManager().getLayer(Fluxbox::instance()->getMenuLayer()),
-                        tbar
+                        tbar,
+                        "Toolbar on Head"
                         ));
     }