[Digikam-devel] [Bug 114507] After modifying the DigiKam main toolbar, all the KIPI menu have disappeared.

[Joern Ahrens]

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
         
http://bugs.kde.org/show_bug.cgi?id=114507         
joern.ahrens kdemail net changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From joern.ahrens kdemail net  2005-10-17 00:04 -------
SVN commit 471231 by jahrens:

Thanks for reporting!

BUG: 114507


 M  +11 -17    digikamapp.cpp  
 M  +0 -1      digikamapp.h  


--- trunk/extragear/graphics/digikam/digikam/digikamapp.cpp #471230:471231
 @ -578,7 +578,6  @
         mSplash->message(i18n("Loading cameras"), AlignLeft, white);
     loadCameras();
 
-    
     createGUI(QString::fromLatin1( "digikamui.rc" ), false);
 
     // Initialize Actions ---------------------------------------
 @ -617,18 +616,6  @
     }
 }
 
-void DigikamApp::recreateGUI()
-{
-    createGUI("digikamui.rc");
-    applyMainWindowSettings(KGlobal::config());
-    plugActionList( QString::fromLatin1("file_actions_import"), m_kipiFileActionsImport );
-    plugActionList( QString::fromLatin1("image_actions"), m_kipiImageActions );
-    plugActionList( QString::fromLatin1("tool_actions"), m_kipiToolsActions );
-    plugActionList( QString::fromLatin1("batch_actions"), m_kipiBatchActions );
-    plugActionList( QString::fromLatin1("album_actions"), m_kipiAlbumActions );
-    plugActionList( QString::fromLatin1("file_actions_export"), m_kipiFileActionsExport );
-}
-
 void DigikamApp::enableThumbSizePlusAction(bool val)
 {
     mThumbSizePlusAction->setEnabled(val);
 @ -879,7 +866,6  @
                                    actionCollection(),
                                    ctype->title().utf8());
     mCameraMenuAction->insert(cAction, 0);
-//    recreateGUI();    
     ctype->setAction(cAction);
 }
 
 @ -983,9 +969,17  @
     saveMainWindowSettings(KGlobal::config());
     KEditToolbar *dlg = new KEditToolbar(actionCollection(), "digikamui.rc");
 
-    if (dlg->exec())
-        recreateGUI();
-
+    if(dlg->exec());
+    {
+        createGUI(QString::fromLatin1( "digikamui.rc" ), false);
+        applyMainWindowSettings(KGlobal::config());
+        plugActionList( QString::fromLatin1("file_actions_import"), m_kipiFileActionsImport );
+        plugActionList( QString::fromLatin1("image_actions"), m_kipiImageActions );
+        plugActionList( QString::fromLatin1("tool_actions"), m_kipiToolsActions );
+        plugActionList( QString::fromLatin1("batch_actions"), m_kipiBatchActions );
+        plugActionList( QString::fromLatin1("album_actions"), m_kipiAlbumActions );
+        plugActionList( QString::fromLatin1("file_actions_export"), m_kipiFileActionsExport );
+    }
     delete dlg;
 }
 
--- trunk/extragear/graphics/digikam/digikam/digikamapp.h #471230:471231
 @ -94,7 +94,6  @
     void loadCameras();
     void populateThemes();
     void updateDeleteTrashMenu();
-    void recreateGUI();
 
 protected: