[Digikam-devel] [Bug 145096] request: acquire mass storage from printer as from camera. Change menu " Camera " to " Acquire "

[Gilles Caulier]

------- 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=145096         
caulier.gilles gmail com changed:

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



------- Additional Comments From caulier.gilles gmail com  2007-09-11 12:36 -------
SVN commit 711071 by cgilles:

digiKam from trunk (KDE4): following tips from Gerhard, only change "Camera" to main Album Gui to "Acquire"
BUG: 145096


 M  +7 -9      digikam/digikamapp.cpp  
 M  +4 -4      digikam/digikamappprivate.h  
 M  +2 -2      digikam/digikamui.rc  
 M  +12 -0     project/project.kdevelop  


--- trunk/extragear/graphics/digikam/digikam/digikamapp.cpp #711070:711071
 @ -453,12 +453,10  @
 
 void DigikamApp::setupActions()
 {
-    // -----------------------------------------------------------------
+    d->acquireMenuAction = new KActionMenu(i18n("&Acquire"), this);
+    d->acquireMenuAction->setDelayed(false);
+    actionCollection()->addAction("acquire_menu", d->acquireMenuAction);
 
-    d->cameraMenuAction = new KActionMenu(i18n("&Camera"), this);
-    d->cameraMenuAction->setDelayed(false);
-    actionCollection()->addAction("camera_menu", d->cameraMenuAction);
-
     d->solidCameraActionGroup = new QActionGroup(this);
     connect(d->solidCameraActionGroup, SIGNAL(triggered(QAction*)), this, SLOT(slotOpenSolidCamera(QAction*)));
 
 @ -1235,19 +1233,19  @
 
 void DigikamApp::loadCameras()
 {
-    d->cameraMenuAction->menu()->addMenu(d->cameraSolidMenu);
+    d->acquireMenuAction->menu()->addMenu(d->cameraSolidMenu);
     d->cameraSolidMenu->menuAction()->setText(i18n("Digital Cameras"));
     d->cameraSolidMenu->menuAction()->setIcon(KIcon("camera"));
 
-    d->cameraMenuAction->menu()->addMenu(d->usbMediaMenu);
+    d->acquireMenuAction->menu()->addMenu(d->usbMediaMenu);
     d->usbMediaMenu->menuAction()->setText(i18n("USB Storage Devices"));
     d->usbMediaMenu->menuAction()->setIcon(KIcon("drive-removable-media-usb"));
 
-    d->cameraMenuAction->menu()->addMenu(d->cardReaderMenu);
+    d->acquireMenuAction->menu()->addMenu(d->cardReaderMenu);
     d->cardReaderMenu->menuAction()->setText(i18n("Card Readers"));
     d->cardReaderMenu->menuAction()->setIcon(KIcon("media-flash-smart-media"));
 
-    d->cameraMenuAction->menu()->addMenu(d->manuallyAddedCamerasMenu);
+    d->acquireMenuAction->menu()->addMenu(d->manuallyAddedCamerasMenu);
     d->manuallyAddedCamerasMenu->menuAction()->setText(i18n("Cameras Added Manually"));
     d->manuallyAddedCamerasMenu->menuAction()->setIcon(KIcon("camera-test"));
 
--- trunk/extragear/graphics/digikam/digikam/digikamappprivate.h #711070:711071
 @ -131,7 +131,7  @
         tipAction                            = 0;
         kipiHelpAction                       = 0;
         donateMoneyAction                    = 0;
-        cameraMenuAction                     = 0;
+        acquireMenuAction                    = 0;
         addCameraSeparatorAction             = 0;
         themeMenuAction                      = 0;
         forwardSignalMapper                  = 0;
 @ -240,13 +240,13  @
     KAction               *rating5Star;
 
     // Application Actions
-    QAction               *quitAction;
-    QAction               *tipAction;
     KAction               *kipiHelpAction;
     KAction               *donateMoneyAction;
-    KActionMenu           *cameraMenuAction;
+    KActionMenu           *acquireMenuAction;
     KSelectAction         *themeMenuAction;
     QAction               *addCameraSeparatorAction;
+    QAction               *quitAction;
+    QAction               *tipAction;
 
     QSignalMapper         *backwardSignalMapper;
     QSignalMapper         *forwardSignalMapper;
--- trunk/extragear/graphics/digikam/digikam/digikamui.rc #711070:711071
 @ -1,5 +1,5  @
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<gui version="33" name="digikam" >
+<gui version="34" name="digikam" >
 
  <MenuBar>
 
 @ -91,7 +91,7  @
       </Menu>
   </Menu>
 
-  <Action name="camera_menu" />
+  <Action name="acquire_menu" />
 
   <Menu name="settings" noMerge="1"><Text>&Settings</Text>
      <Action name="options_show_toolbar"/>
--- trunk/extragear/graphics/digikam/project/project.kdevelop #711070:711071
 @ -160,6 +160,18  @
     <projectname>project</projectname>
     <projectname>project</projectname>
     <projectname>project</projectname>
+    <projectname>project</projectname>
+    <projectname>project</projectname>
+    <projectname>project</projectname>
+    <projectname>project</projectname>
+    <projectname>project</projectname>
+    <projectname>project</projectname>
+    <projectname>project</projectname>
+    <projectname>project</projectname>
+    <projectname>project</projectname>
+    <projectname>project</projectname>
+    <projectname>project</projectname>
+    <projectname>project</projectname>
   </general>
   <kdevfileview>
     <groups>