Bug 145096

Arnd,

This is an easy fix for you. There is just a string to change in camera dialog title and also in Image editor title (if you open this one from camera gui).

Gilles

*** This bug has been marked as a duplicate of 131407 ***

Created attachment 21454 [details]
"Camera" -> "Acquire"

Gilles, the attached patch changes the menu entry from
"Camera" to "Acquire".
However, I did not find the corresponding string you referred to by
"Image editor title (if you open this one from camera gui)."
((Note that personally I don't use these dialogues to 
get my images into digikam, so I am not familar with them at all))

Since there only Camera is treated specially (or I don't know something 
about trunk?) I think there is no sense in applying this patch.

----------------------------------------------------
Raz, dwa, trzy... BUNGEEEE! Zabij nude i skocz z nami na bungee!
Ty wybierasz czas i miejsce, my podpowiadamy jak to zrobi

Under that menu I find:
- the list of cameras one has added so far
- "Browse Media"
  (which gives a list of available partitions)
- "Add camera"

To me this looks like more than just cameras ...

Arnd,

And why not to use "Media" instead "Acquire" ?

About Image Editor, from camera gui, if you start it using view menu option from icon view context menu, you will see this string:

Image Editor - Camera "..." - digiKam 

...in editor window title. 

Gilles

Created attachment 21455 [details]
"Camera" ->"Media"

Media sounds fine to me.
I tried to locate the other place where "Camera" was used.
Someone who uses these parts of the code will have to judge
if the replacement makes sense.

Mik, 

It's not a duplicate...

Gilles

Your patch fix the "Camera" menu name from Album Gui and the "Camera" string from image editor (thrue cameracontroller.cpp)

But this is not enough. If we use "Media" instead "Camera", the Camera setup page need to be fixed too : 

- "Cameras" is used in list of setting tabs from setup dialog.
- "Camera Settings" is used as titile of Camera setup page.

Gilles

Arnd,

And of course, your patch need to be backported to trunk (KDE4)...

Gilles

> It's not a duplicate...

Sorry.

Gilles,

sorry, but I am really running around in the dark -
I don't use those features and have no idea about the code ...
Of course I can just grep for the strings, but
whether a change makes sense or not is out of my judgement.
So someone else who uses this part of code will have
to make the changes ...

Best, Arnd

Arnd,

It's easy to fix. Look files setupcamera.cpp, cameraselection.cpp, and setup.cpp into "utilities/setup" folder.

Gilles

Gilles,

while it might be easy to fix (for you) I would really
be doing stuff here I don't understand because
I don't use this code - so really somehow else has to
take the ball here - I am out on this one.

Best, Arnd

Arnd,

The purpose of the changes is to fix "Camera" to "Media" in strings. That all.

The files in setup folder display the setup dialog with config pages. Just play with some string (i18n), recompile digiKAm and look the result...

Gilles

Gilles, from my limited understanding of the functionality
provided in the above files, I don't think that 
replacing "Camera" by "Media" is correct.
In digikams "Camera" menu, in addition to cameras, also physical drives appear,
so the replacement from "Camera" to "Media" seems reasonable to me.
But in the settings page it is just about cameras, nothing else,
as far as I can see, so why change this to "Media"?

Arnd,

well, to be more universal. I have look in Amarok and "Media is not used, but "Devices".

Gerhard, What do you think about ?

Gilles

I cite Einstein for an entry: "make it as simple as possible, but not simpler"

In amarok it's 'Devices' in the sidebar and 'Media Devices' in the setup page.

I find 'Camera' adequate (as simple as possible) in the digiKam settings page as we deal with cameras only here.

For the menu I would find 'Acquire' most appropriate, as it is in line with using verbs as much as possible. It also could be used later on to home a camera command interface. 

'Devices' seems more abstract (not as simple as possible) as much as Media (which could be confused with exporting to media).

my 5 cents
Gerhard

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>&amp;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>

Virgil,

This change will be only affect the KDE4 version of digiKam, not KDE3. 

With KDE4, we use Solid interface to handle external devices (camera, cards reader, UMS, etc.) This is must universal

Gilles

Great work! can't wait for KDE4 it has got to be great. Thanks for your
consideration and effort.


On 11 Sep 2007 10:40:23 -0000, Gilles Caulier <caulier.gilles@gmail.com>
wrote:
[bugs.kde.org quoted mail]



Great work! can&#39;t wait for KDE4 it has got to be great. Thanks for your consideration and effort.<br><br><br><div><span class="gmail_quote">On 11 Sep 2007 10:40:23 -0000, <b class="gmail_sendername">Gilles Caulier</b> &lt;
<a href="mailto:caulier.gilles@gmail.com">caulier.gilles@gmail.com</a>&gt; wrote:</span><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">------- You are receiving this mail because: -------
<br>You reported the bug, or are watching the reporter.<br><br><a href="http://bugs.kde.org/show_bug.cgi?id=145096">http://bugs.kde.org/show_bug.cgi?id=145096</a><br><br><br><br><br>------- Additional Comments From caulier.gilles
 gmail com&nbsp;&nbsp;2007-09-11 12:40 -------<br>Virgil,<br><br>This change will be only affect the KDE4 version of digiKam, not KDE3.<br><br>With KDE4, we use Solid interface to handle external devices (camera, cards reader, UMS, etc.) This is must universal
<br><br>Gilles<br></blockquote></div><br><br clear="all"><br>-- <br>Catch you later ;&nbsp;&nbsp; Virgil