[Digikam-devel] [Bug 135048] easy comparing similar pictures using a lighttable

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

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



------- Additional Comments From caulier.gilles gmail com  2007-05-07 16:06 -------
SVN commit 662113 by cgilles:

digikam from trunk : added Insert to Light Table action on album gui Image menu... Now the new Light Table tool is officially available on digiKam.
BUG: 135048 


 M  +0 -6      albumiconview.cpp  
 M  +11 -0     digikamapp.cpp  
 M  +2 -0      digikamappprivate.h  
 M  +1 -0      digikamui.rc  
 M  +8 -0      digikamview.cpp  
 M  +1 -0      digikamview.h  


--- trunk/extragear/graphics/digikam/digikam/albumiconview.cpp #662112:662113
 @ -23,9 +23,6  @
  * 
  * ============================================================ */
 
-// Uncomment this line to enable Light Table tool.
-#define ENABLE_LIGHTTABLE 1
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 @ -531,10 +528,7  @
     popmenu.insertItem(SmallIcon("viewimage"), i18n("View..."), 18);
     popmenu.insertItem(SmallIcon("editimage"), i18n("Edit..."), 10);
     popmenu.insertItem(i18n("Open With"), &openWithMenu, 11);
-
-#ifdef ENABLE_LIGHTTABLE
     popmenu.insertItem(SmallIcon("idea"), i18n("Insert to Light Table"), 19);
-#endif
 
     // Merge in the KIPI plugins actions ----------------------------
 
--- trunk/extragear/graphics/digikam/digikam/digikamapp.cpp #662112:662113
 @ -618,6 +618,15  @
                                     "image_edit");
     d->imageViewAction->setWhatsThis(i18n("This will open the selected item in the image editor."));
 
+    d->imageLightTableAction = new KAction(i18n("Insert to Light Table"),
+                                    "idea",
+                                    Key_F6,
+                                    d->view,
+                                    SLOT(slotImageLightTable()),
+                                    actionCollection(),
+                                    "image_lighttable");
+    d->imageLightTableAction->setWhatsThis(i18n("This will insert the selected items to light table."));
+
     d->imageRenameAction = new KAction(i18n("Rename..."),
                                     "pencil",
                                     Key_F2,
 @ -940,6 +949,7  @
 
     d->imageViewAction->setEnabled(false);
     d->imagePreviewAction->setEnabled(false);
+    d->imageLightTableAction->setEnabled(false);
     d->imageRenameAction->setEnabled(false);
     d->imageDeleteAction->setEnabled(false);
     d->imageExifOrientationActionMenu->setEnabled(false);
 @ -1154,6 +1164,7  @
     bool val = selection.isEmpty() ? false : true;
     d->imageViewAction->setEnabled(val);
     d->imagePreviewAction->setEnabled(val);
+    d->imageLightTableAction->setEnabled(val);
     d->imageRenameAction->setEnabled(val);
     d->imageDeleteAction->setEnabled(val);
     d->imageExifOrientationActionMenu->setEnabled(val);
--- trunk/extragear/graphics/digikam/digikam/digikamappprivate.h #662112:662113
 @ -87,6 +87,7  @
         editTagAction                        = 0;
         imagePreviewAction                   = 0;
         imageViewAction                      = 0;
+        imageLightTableAction                = 0;
         imageSetExifOrientation1Action       = 0;
         imageSetExifOrientation2Action       = 0;
         imageSetExifOrientation3Action       = 0;
 @ -181,6 +182,7  @
     
     // Image Actions
     KToggleAction         *imagePreviewAction;
+    KAction               *imageLightTableAction;
     KAction               *imageViewAction;
     KAction               *imageSetExifOrientation1Action;
     KAction               *imageSetExifOrientation2Action;
--- trunk/extragear/graphics/digikam/digikam/digikamui.rc #662112:662113
 @ -42,6 +42,7  @
    <text>&Image</text>
      <Action name="image_view" />
      <Action name="image_edit" />
+     <Action name="image_lighttable" />
      <Action name="image_set_exif_orientation"/>
    <Separator />
      <ActionList name="image_actions"/>
--- trunk/extragear/graphics/digikam/digikam/digikamview.cpp #662112:662113
 @ -1032,6 +1032,14  @
     d->iconView->slotSetExifOrientation(orientation);
 }
 
+void DigikamView::slotImageLightTable()
+{
+    AlbumIconItem *item = d->iconView->firstSelectedItem();
+    if (!item) return;
+
+    d->iconView->slotInsertToLightTable(item);
+}
+
 void DigikamView::slotImageRename(AlbumIconItem *iconItem)
 {
     AlbumIconItem *item;
--- trunk/extragear/graphics/digikam/digikam/digikamview.h #662112:662113
 @ -117,6 +117,7  @
     void slotNewAdvancedSearch();
 
     // Image action slots
+    void slotImageLightTable();
     void slotImagePreview();
     void slotImageEdit();
     void slotImageExifOrientation(int orientation);