[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

Don't use deprecated toolbar action


  M +1 -19     kst.cpp   1.304
  M +0 -7      kst.h   1.129
  M +2 -1      kstui.rc   1.40


--- kdeextragear-2/kst/kst/kst.cpp  #1.303:1.304
@@ -116,4 +116,5 @@ KstApp::KstApp(QWidget *parent, const ch
   config = kapp->config();
   initStatusBar();
+  setStandardToolBarMenuEnabled(true);
 
   initDocument();
@@ -327,5 +328,4 @@ void KstApp::customEvent(QCustomEvent *p
 void KstApp::updateActions() {
   // Hack
-  ToolBarAction->setChecked(toolBar("mainToolBar")->isShown());
   StatusBarAction->setChecked(statusBar()->isShown());
 }
@@ -371,10 +371,4 @@ void KstApp::initActions() {
 
   /************/
-  ToolBarAction = KStdAction::showToolbar(this, SLOT(slotViewToolBar()),
-                                          actionCollection());
-  ToolBarAction->setWhatsThis(i18n("Toggle Toolbar"));
-  connect(ToolBarAction, SIGNAL(activated()), this, SLOT(setSettingsDirty()));
-
-  /************/
   StatusBarAction = KStdAction::showStatusbar(this, SLOT(slotViewStatusBar()),
                                               actionCollection());
@@ -1319,16 +1313,4 @@ void KstApp::slotFileQuit() {
 }
 
-void KstApp::slotViewToolBar() {
-  slotUpdateStatusMsg(i18n("Toggling toolbar..."));
-  // turn Toolbar on or off
-  if (ToolBarAction->isChecked()) {
-    toolBar("mainToolBar")->show();
-  } else {
-    toolBar("mainToolBar")->hide();
-  }
-
-  slotUpdateStatusMsg(i18n("Ready."));
-}
-
 void KstApp::slotViewStatusBar() {
   if (StatusBarAction->isChecked()) {

--- kdeextragear-2/kst/kst/kst.h  #1.128:1.129
@@ -246,7 +246,4 @@ class KstApp : public KMdiMainFrm {
     void immediatePrintActiveWindowToPng(const QString& filename, const QString& format = "PNG", int iWidth=640, int iHeight=480, int display=0);
 
-    /** toggles the toolbar */
-    void slotViewToolBar();
-
     //void slotCut() {}
     void slotCopy();
@@ -392,5 +389,4 @@ class KstApp : public KMdiMainFrm {
 
     KToggleAction *StatusBarAction;
-    KToggleAction *ToolBarAction;
 
     /** The Pause Button */
@@ -482,7 +478,4 @@ class KstApp : public KMdiMainFrm {
     KAction *filePaste;
 
-    KToggleAction *viewToolBar;
-    KToggleAction *viewStatusBar;
-
     QLabel *_readyBar;
     KProgress *_progressBar;

--- kdeextragear-2/kst/kst/kstui.rc  #1.39:1.40
@@ -1,4 +1,4 @@
 <!DOCTYPE kpartgui>
-<kpartgui version="11" name="kst">
+<kpartgui version="12" name="kst">
 <MenuBar>
   <Menu name="file"><text>&amp;File</text>
@@ -57,4 +57,5 @@
   </Menu>
   <Menu name="settings"><text>&amp;Settings</text>
+    <Merge name="StandardToolBarMenuHandler"/>
     <Separator/>
     <Action name="pluginmanager_action"/>