KDE/kdevplatform/shell

[Andreas Pakulat]

SVN commit 962709 by apaku:

Re-Disable the hack to remove kate actions from the toolbar.
The actions still show up in the "Configure Toolbar" dialog, so having
them there and being able to put them onto toolbars is highly irritating
if they don't show up then on the actual toolbar.

If anybody wants to have those actions removed from the toolbar, he is
_required_ to also remove the from that toolbar-config dialog.

BUG:191311
CCMAIL:kdevelop-devel at kdevelop.org

 M  +2 -2      mainwindow.cpp  
 M  +6 -2      mainwindow_p.cpp  
 M  +1 -1      mainwindow_p.h  


--- trunk/KDE/kdevplatform/shell/mainwindow.cpp #962708:962709
@@ -79,8 +79,8 @@
         setXMLFile( ShellExtension::getInstance() ->xmlFile() );
     }
 
-    connect(this->guiFactory(), SIGNAL(clientAdded(KXMLGUIClient*)),
-            d, SLOT(fixToolbar()));
+//    connect(this->guiFactory(), SIGNAL(clientAdded(KXMLGUIClient*)),
+//            d, SLOT(fixToolbar()));
 }
 
 MainWindow::~ MainWindow()
--- trunk/KDE/kdevplatform/shell/mainwindow_p.cpp #962708:962709
@@ -325,7 +325,11 @@
    and not from anywhere else.  Presently, when new XMLGUI client is added,
    it's actions are always merged, and there's no clear way to stop this.
    So, we execute the below code whenever a new client is added.  */
-void MainWindowPrivate::fixToolbar()
+/*
+ * Only re-enable if you manage to also remove the relevant actions from the 
+ * configure toolbar dialog. If not, we stay with the actions, as anything else
+ * confuses users.
+ * void MainWindowPrivate::fixToolbar()
 {
     QWidget* w = m_mainWindow->guiFactory()->container(
         "mainToolBar", m_mainWindow);
@@ -335,7 +339,7 @@
             if ( !a->isSeparator() && (a != m_mainWindow->actionCollection()->action(a->objectName())) )
                 w->removeAction(a);
         }
-}
+}*/
 
 bool MainWindowPrivate::applicationQuitRequested() const
 {
--- trunk/KDE/kdevplatform/shell/mainwindow_p.h #962708:962709
@@ -94,7 +94,7 @@
 
     void quitAll();
 
-    void fixToolbar();
+//    void fixToolbar();
 
     bool applicationQuitRequested() const;