[Digikam-devel] extragear/graphics/digikam

[Gilles Caulier]

SVN commit 509352 by cgilles:

digikam from trunk : bugfix : displaying properlly image editor caption depending of context :

- Album "current_album_name" if image editor is started from main interface
- Camera "current_camera_model"  if image editor is started from camera interface

CCMAIL: digikam-devel at kde.org

 M  +6 -4      digikam/albumiconview.cpp  
 M  +9 -11     utilities/cameragui/cameracontroller.cpp  
 M  +1 -1      utilities/imageeditor/editor/imagewindow.cpp  


--- trunk/extragear/graphics/digikam/digikam/albumiconview.cpp #509351:509352
@@ -896,15 +896,17 @@
     imview->disconnect(this);
 
     connect(imview, SIGNAL(signalFileAdded(const KURL&)),
-            SLOT(slotFilesModified()));
+            this, SLOT(slotFilesModified()));
+            
     connect(imview, SIGNAL(signalFileModified(const KURL&)),
-            SLOT(slotFilesModified(const KURL&)));
+            this, SLOT(slotFilesModified(const KURL&)));
+            
     connect(imview, SIGNAL(signalFileDeleted(const KURL&)),
-            SLOT(slotFilesModified()));
+            this, SLOT(slotFilesModified()));
 
     imview->loadURL(urlList,
                     item->imageInfo()->kurl(),
-                    d->currentAlbum ? d->currentAlbum->title():QString(),
+                    d->currentAlbum ? i18n("Album \"%1\"").arg(d->currentAlbum->title()) : QString(),
                     true,
                     this);  // Allow to use image properties and comments/tags dialogs
 
--- trunk/extragear/graphics/digikam/utilities/cameragui/cameracontroller.cpp #509351:509352
@@ -19,7 +19,7 @@
  * 
  * ============================================================ */
 
-// C Ansi
+// C Ansi includes.
 
 extern "C"
 {
@@ -163,7 +163,7 @@
 };
 
 CameraThread::CameraThread(CameraController* controller)
-    : d(controller->d), parent(controller)
+            : d(controller->d), parent(controller)
 {
 }
 
@@ -178,7 +178,6 @@
 
     sendBusy(true);
 
-
     CameraCommand* cmd = d->cmdQueue.dequeue();
     if (cmd)
     {
@@ -352,7 +351,6 @@
                 }
             }
 
-            
             if (result)
             {
                 CameraEvent* event = new CameraEvent(CameraEvent::gp_downloaded);
@@ -457,7 +455,6 @@
         }    
 
         delete cmd;
-
     }
 
     sendBusy(false);
@@ -647,8 +644,7 @@
     {
         /* TODO: ugly hack since qt <= 3.1.2 does not define
            QStringList with QDeepCopy as a friend. */
-        QValueList<QVariant> flist =
-            QDeepCopy< QValueList<QVariant> >(event->map["folders"].toList());
+        QValueList<QVariant> flist = QDeepCopy< QValueList<QVariant> >(event->map["folders"].toList());
 
         QStringList folderList;
         QValueList<QVariant>::Iterator it;
@@ -753,19 +749,21 @@
     }
     case (CameraEvent::gp_opened) :
     {
-        QString file   = QDeepCopy<QString>(event->map["file"].asString());
-        QString dest   = QDeepCopy<QString>(event->map["dest"].asString());
+        QString file = QDeepCopy<QString>(event->map["file"].asString());
+        QString dest = QDeepCopy<QString>(event->map["dest"].asString());
 
         KURL url(dest);
         KURL::List urlList;
         urlList << url;
 
-        Digikam::ImageWindow *im = Digikam::ImageWindow::imagewindow();
-        im->loadURL(urlList, url, file, false);
+        ImageWindow *im = ImageWindow::imagewindow();
+        im->loadURL(urlList, url, i18n("Camera \"%1\"").arg(d->camera->model()), false);
+
         if (im->isHidden())
             im->show();
         else
             im->raise();
+            
         im->setFocus();
         break;
     }
--- trunk/extragear/graphics/digikam/utilities/imageeditor/editor/imagewindow.cpp #509351:509352
@@ -249,7 +249,7 @@
     if (!promptUserSave(m_urlCurrent))
         return;
     
-    setCaption(i18n("digiKam Image Editor - Album \"%1\"").arg(caption));
+    setCaption(i18n("digiKam Image Editor - %1").arg(caption));
 
     m_view        = view;
     m_urlList     = urlList;