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

List:       kde-commits
Subject:    kdesdk/kbabel/catalogmanager
From:       Anne-Marie Mahfouf <annma () kde ! org>
Date:       2004-07-10 17:53:17
Message-ID: 20040710175317.A706F16B18 () office ! kde ! org
[Download RAW message or body]

CVS commit by annma: 

while committing a patch for fixing a bug earlier on I found that Configure Toolbars \
was not working thus I fixed that by using setupGUI() Hope it's OK


  M +5 -23     catalogmanager.cpp   1.109
  M +0 -2      catalogmanager.h   1.39


--- kdesdk/kbabel/catalogmanager/catalogmanager.cpp  #1.108:1.109
@@ -46,5 +46,5 @@
 #include <kdatatool.h>
 #include <kdialogbase.h>
-#include <kedittoolbar.h>
+//#include <kedittoolbar.h>
 #include <kfiledialog.h>
 #include <kglobal.h>
@@ -175,6 +175,7 @@ void CatalogManager::init()
    resize( 600,300);
 
-   setupActions();
    setupStatusBar();
+   setupActions();
+
 
    QPopupMenu* popup;
@@ -442,6 +443,4 @@ void CatalogManager::setupActions()
     // settings menu
     // FIXME: KStdAction::preferences(this, SLOT( optionsPreferences()), \
                actionCollection());
-    KStdAction::keyBindings(guiFactory(), SLOT ( configureShortcuts() ), \
                actionCollection());
-    KStdAction::configureToolbars(this,SLOT(optionsEditToolbars()), \
actionCollection() );  
     createStandardStatusBarAction();
@@ -461,5 +460,5 @@ void CatalogManager::setupActions()
     action->setEnabled(false);
 
-    createGUI();
+    setupGUI();
 }
 
@@ -1044,21 +1043,4 @@ void CatalogManager::optionsPreferences(
 }
 
-void CatalogManager::optionsKeys()
-{
-    // Remove for KDE 4.0.  KMainWindow includes a slot configureShortcuts()
-    // that serves the purpose of this function.  This function must remain
-    // for BC purposes.
-    //KKeyDialog::configure(actionCollection());
-}
-
-
-void CatalogManager::optionsEditToolbars()
-{
-    saveView();
-    KEditToolbar dlg(actionCollection());
-    connect(&dlg,SIGNAL(newToolbarConfig()),this,SLOT(slotNewToolbarConfig()));
-    dlg.exec();
-}
-
 void CatalogManager::newToolbarConfig()
 {

--- kdesdk/kbabel/catalogmanager/catalogmanager.h  #1.38:1.39
@@ -93,6 +93,4 @@ public slots:
    virtual void stopSearching();
    virtual void optionsPreferences();
-   virtual void optionsKeys(); // BC: Remove for KDE 4.0.
-   virtual void optionsEditToolbars();
    virtual void optionsShowStatusbar(bool on);
    virtual void dummySlot() {}


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