[Digikam-devel] branches/extragear/kde3/graphics/digikam

[Gilles Caulier]

SVN commit 680434 by cgilles:

digikam from KDE3 branch : since digiKam and DigikamImagePlugins project have been merged, Help/ImagePlugins Handbook menu action is obsolet
CCMAIL: digikam-devel at kde.org


 M  +1 -3      showfoto/showfotoui.rc  
 M  +1 -3      utilities/imageeditor/editor/digikamimagewindowui.rc  
 M  +0 -11     utilities/imageeditor/editor/editorwindow.cpp  
 M  +0 -1      utilities/imageeditor/editor/editorwindow.h  
 M  +2 -4      utilities/imageeditor/editor/editorwindowprivate.h  


--- branches/extragear/kde3/graphics/digikam/showfoto/showfotoui.rc #680433:680434
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<gui version="23" name="showfoto" >
+<gui version="24" name="showfoto" >
 
 <MenuBar>
 
@@ -76,8 +76,6 @@
     </Menu>
 
     <Menu name="help" ><text>&Help</text>
-        <Action name="editorwindow_imagepluginshelp" />
-        <Separator/>
         <Action name="editorwindow_donatemoney" />
     </Menu>
  
--- branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/digikamimagewindowui.rc #680433:680434
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<gui version="18" name="digikamimagewindow" >
+<gui version="19" name="digikamimagewindow" >
 
 <MenuBar>
 
@@ -70,8 +70,6 @@
     </Menu>
 
     <Menu name="help" ><text>&Help</text>
-        <Action name="editorwindow_imagepluginshelp" />
-        <Separator/>
         <Action name="editorwindow_donatemoney" />
     </Menu>
   
--- branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp #680433:680434
@@ -470,12 +470,6 @@
 
     // -- Standard 'Help' menu actions ---------------------------------------------
 
-    d->imagePluginsHelpAction = new KAction(i18n("Image Plugins Handbooks"),
-                                            "digikamimageplugins", 0,
-                                            this, SLOT(slotImagePluginsHelp()),
-                                            actionCollection(), 
-                                            "editorwindow_imagepluginshelp");
-
     d->donateMoneyAction = new KAction(i18n("Donate Money..."),
                                        0, 0, 
                                        this, SLOT(slotDonateMoney()),
@@ -611,11 +605,6 @@
     }
 }
 
-void EditorWindow::slotImagePluginsHelp()
-{
-    KApplication::kApplication()->invokeHelp( QString(), "digikamimageplugins" );
-}
-
 void EditorWindow::slotEditKeys()
 {
     KKeyDialog dialog(true, this);
--- branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/editorwindow.h #680433:680434
@@ -161,7 +161,6 @@
     void slotSave();
     void slotSaveAs() { saveAs(); };
 
-    void slotImagePluginsHelp();
     void slotEditKeys();
     void slotResize();
 
--- branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/editorwindowprivate.h #680433:680434
@@ -53,7 +53,6 @@
         fullScreenHideToolBar  = false;
 
         selectLabel            = 0;
-        imagePluginsHelpAction = 0;
         donateMoneyAction      = 0;
         accelerators           = 0;
         viewCMViewAction       = 0;
@@ -91,15 +90,12 @@
     bool                       removeFullScreenButton;
     bool                       fullScreenHideToolBar;
 
-    KComboBox                 *zoomCombo;
-
     QLabel                    *selectLabel;
 
     QToolButton               *cmViewIndicator;
     QToolButton               *underExposureIndicator; 
     QToolButton               *overExposureIndicator; 
 
-    KAction                   *imagePluginsHelpAction;
     KAction                   *donateMoneyAction;
     KAction                   *filePrintAction;
     KAction                   *copyAction;
@@ -124,6 +120,8 @@
 
     KWidgetAction             *zoomComboAction;
 
+    KComboBox                 *zoomCombo;
+
     KAccel                    *accelerators;
 
     ICCSettingsContainer      *ICCSettings;