[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesdk/kbabel/catalogmanager
From:       Stanislav Visnovsky <visnovsky () nenya ! ms ! mff ! cuni ! cz>
Date:       2002-12-16 11:24:01
[Download RAW message or body]

CVS commit by nanulo: 

Use standard toolbar toggle menu item


  M +4 -25     catalogmanager.cpp   1.75
  M +0 -6      catalogmanager.h   1.24


--- kdesdk/kbabel/catalogmanager/catalogmanager.cpp  #1.74:1.75
@@ -347,12 +347,10 @@ void CatalogManager::setupActions()
     KStdAction::keyBindings(this, SLOT( optionsKeys() ), actionCollection());
     KStdAction::configureToolbars(this,SLOT(optionsEditToolbars()), \
                actionCollection() );
-    KToggleAction * toggle = KStdAction::showToolbar( this,SLOT( dummySlot() ), \
                actionCollection() );
-    connect( toggle, SIGNAL( toggled(bool) ), this, SLOT( optionsShowToolbar(bool) ) \
                );
-    toggle = new KToggleAction(i18n("Show &Navigationbar"), 0, \
                actionCollection(),"settings_show_navbar");
-    toggle->setChecked(true);
-    connect(toggle,SIGNAL(toggled(bool)), this, \
                SLOT(optionsShowNavigationbar(bool)));
-    toggle = KStdAction::showStatusbar( this,SLOT( dummySlot() ), actionCollection() \
); +
+    KToggleAction* toggle = KStdAction::showStatusbar( this,SLOT( dummySlot() ), \
                actionCollection() );
     connect( toggle, SIGNAL( toggled(bool) ), this, SLOT( optionsShowStatusbar(bool) \
) );  
+    setStandardToolBarMenuEnabled ( true );
+
     // commands menus
     KActionMenu* actionMenu=new KActionMenu(i18n("Commands"), 0,
@@ -1016,20 +1014,4 @@ void CatalogManager::optionsShowStatusba
 }
 
-void CatalogManager::optionsShowToolbar(bool on)
-{
-    if( on )
-        toolBar()->show();
-    else
-        toolBar()->hide();
-}
-
-void CatalogManager::optionsShowNavigationbar(bool on)
-{
-    if( on )
-        toolBar("navigationbar")->show();
-    else
-        toolBar("navigationbar")->hide();
-}
-
 bool CatalogManager::queryClose()
 {
@@ -1053,7 +1035,4 @@ void CatalogManager::restoreView()
         action(KStdAction::stdName(KStdAction::ShowStatusbar));
     toggle->setChecked(!statusBar()->isHidden() );
-    toggle = (KToggleAction*)actionCollection()->
-        action(KStdAction::stdName(KStdAction::ShowToolbar));
-    toggle->setChecked(!toolBar()->isHidden() );
 }
 

--- kdesdk/kbabel/catalogmanager/catalogmanager.h  #1.23:1.24
@@ -24,8 +24,4 @@
 #define CATALOGMANAGER_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <qdict.h>
 #include <qlistview.h>
@@ -92,6 +88,4 @@ public slots:
    virtual void optionsKeys();
    virtual void optionsEditToolbars();
-   virtual void optionsShowToolbar(bool on);
-   virtual void optionsShowNavigationbar(bool on);
    virtual void optionsShowStatusbar(bool on);
    virtual void dummySlot() {}


[prev in list] [next in list] [prev in thread] [next in thread]