[Uml-devel] kdesdk/umbrello/umbrello

[Benjamin Meyer]

CVS commit by bmeyer: 

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


  M +3 -33     uml.cpp   1.24
  M +0 -12     uml.h   1.11


--- kdesdk/umbrello/umbrello/uml.cpp  #1.23:1.24
@@ -120,6 +120,7 @@ void UMLApp::initActions() {
         editCopy = KStdAction::copy(this, SLOT(slotEditCopy()), actionCollection());
         editPaste = KStdAction::paste(this, SLOT(slotEditPaste()), actionCollection());
-        viewToolBar = KStdAction::showToolbar(this, SLOT(slotViewToolBar()), actionCollection());
-        viewStatusBar = KStdAction::showStatusbar(this, SLOT(slotViewStatusBar()), actionCollection());
+        createStandardStatusBarAction();
+        setStandardToolBarMenuEnabled(true);
+        
         selectAll = KStdAction::selectAll(this,  SLOT( slotSelectAll() ), actionCollection());
 
@@ -155,6 +156,4 @@ void UMLApp::initActions() {
         editCopy->setStatusText(i18n("Copies the selected section to the clipboard"));
         editPaste->setStatusText(i18n("Pastes the clipboard contents to actual position"));
-        viewToolBar->setStatusText(i18n("Enables/disables the toolbar"));
-        viewStatusBar->setStatusText(i18n("Enables/disables the statusbar"));
         preferences->setStatusText( i18n( "Set the default program preferences") );
 
@@ -706,33 +705,4 @@ void UMLApp::slotEditPaste() {
         doc -> setModified( true );
 }
-////////////////////////////////////////////////////////////////////////////////////////////////////
-void UMLApp::slotViewToolBar() {
-        slotStatusMsg(i18n("Toggling toolbar..."));
-
-        ///////////////////////////////////////////////////////////////////
-        // turn Toolbar on or off
-
-        if(!viewToolBar->isChecked()) {
-                toolBar("mainToolBar")->hide();
-        } else {
-                toolBar("mainToolBar")->show();
-        }
-
-        slotStatusMsg(i18n("Ready."));
-}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-void UMLApp::slotViewStatusBar() {
-        slotStatusMsg(i18n("Toggle the statusbar..."));
-        ///////////////////////////////////////////////////////////////////
-        //turn Statusbar on or off
-        if(!viewStatusBar->isChecked()) {
-                statusBar()->hide();
-        } else {
-                statusBar()->show();
-        }
-
-        slotStatusMsg(i18n("Ready."));
-}
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 void UMLApp::slotStatusMsg(const QString &text) {

--- kdesdk/umbrello/umbrello/uml.h  #1.10:1.11
@@ -351,14 +351,4 @@ public slots:
 
         /**
-         * toggles the toolbar
-         */
-        void slotViewToolBar();
-
-        /**
-         * toggles the statusbar
-         */
-        void slotViewStatusBar();
-
-        /**
          * changes the statusbar contents for the standard label
          * permanently, used to indicate current actions.
@@ -688,6 +678,4 @@ private:
         KAction* deleteSelectedWidget;
         KAction* deleteDiagram;
-        KToggleAction* viewToolBar;
-        KToggleAction* viewStatusBar;
         WorkToolBar* toolsbar;
         QTimer* m_clipTimer;