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

List:       kde-commits
Subject:    make_it_cool: kdeedu/kig/kig
From:       Dominique Devriese <devriese () kde ! org>
Date:       2003-03-17 16:43:00
[Download RAW message or body]

CVS commit by domi: 

forward porting Benjamin Meyer's patch for using KMainWindow's functionality for \
toolbar showing and hiding.  I'll write some ifdef's next, so i have a patch which i \
can easily backport..


  M +2 -18     kig.cpp   1.23.2.2
  M +0 -5      kig.h   1.14.2.1


--- kdeedu/kig/kig/kig.cpp  #1.23.2.1:1.23.2.2
@@ -96,6 +96,6 @@ void Kig::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);
 
   // FIXME: this (recent files) should be app-wide, not specific to each window...
@@ -159,20 +159,4 @@ void Kig::openURL(const KURL& url)
     widget->show();
   };
-}
-
-void Kig::optionsShowToolbar()
-{
-  if (m_toolbarAction->isChecked())
-    toolBar()->show();
-  else
-    toolBar()->hide();
-}
-
-void Kig::optionsShowStatusbar()
-{
-  if (m_statusbarAction->isChecked())
-    statusBar()->show();
-  else
-    statusBar()->hide();
 }
 

--- kdeedu/kig/kig/kig.h  #1.14:1.14.2.1
@@ -31,5 +31,4 @@
 #include <dcopclient.h>
 
-class KToggleAction;
 class KRecentFilesAction;
 
@@ -110,6 +109,4 @@ class Kig : public KParts::MainWindow
   void fileNew();
   void fileOpen();
-  void optionsShowToolbar();
-  void optionsShowStatusbar();
   void optionsConfigureKeys();
   void optionsConfigureToolbars();
@@ -122,6 +119,4 @@ class Kig : public KParts::MainWindow
   KParts::ReadWritePart *m_part;
 
-  KToggleAction *m_toolbarAction;
-  KToggleAction *m_statusbarAction;
   KRecentFilesAction *m_recentFilesAction;
 


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