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

List:       kde-commits
Subject:    kdegraphics/kooka
From:       Benjamin Meyer <benjamin () csh ! rit ! edu>
Date:       2003-03-17 1:56:46
[Download RAW message or body]

CVS commit by bmeyer: 

KMainWindow can now handle the statusbar and toolbar, removed unnecessary
functionality.


  M +3 -25     kooka.cpp   1.45
  M +0 -2      kooka.h   1.21


--- kdegraphics/kooka/kooka.cpp  #1.44:1.45
@@ -130,8 +129,7 @@ void Kooka::setupActions()
     KStdAction::quit(this , SLOT(close()), actionCollection());
 
-    m_toolbarAction = KStdAction::showToolbar(this, SLOT(optionsShowToolbar()),
-                                              actionCollection());
-    m_statusbarAction = KStdAction::showStatusbar(this, SLOT(optionsShowStatusbar()),
-                                                  actionCollection());
+    createStandardStatusBarAction();
+    setStandardToolBarMenuEnabled(true);
+
     m_scanParamsAction = new KToggleAction(i18n("Show Scan &Parameters"),
                                            KShortcut(), this,
@@ -387,24 +385,4 @@ void Kooka::filePrint()
        p.end();
     }
-}
-
-void Kooka::optionsShowToolbar()
-{
-    // this is all very cut and paste code for showing/hiding the
-    // toolbar
-    if (m_toolbarAction->isChecked())
-        toolBar("mainToolBar")->show();
-    else
-        toolBar("mainToolBar")->hide();
-}
-
-void Kooka::optionsShowStatusbar()
-{
-    // this is all very cut and paste code for showing/hiding the
-    // statusbar
-    if (m_statusbarAction->isChecked())
-        statusBar()->show();
-    else
-        statusBar()->hide();
 }
 

--- kdegraphics/kooka/kooka.h  #1.20:1.21
@@ -134,6 +134,4 @@ private:
 
    KPrinter   *m_printer;
-   KToggleAction *m_toolbarAction;
-   KToggleAction *m_statusbarAction;
    KToggleAction *m_scanParamsAction;
    KToggleAction *m_previewerAction;


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