[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam] core: add Time Adjust to lighttable
From:       Maik Qualmann <null () kde ! org>
Date:       2018-09-19 19:37:16
Message-ID: E1g2iHk-0006L0-EV () code ! kde ! org
[Download RAW message or body]

Git commit 28ad8deb6dc00999b2d07c38ad50fb4d1d5db2d2 by Maik Qualmann.
Committed on 19/09/2018 at 19:36.
Pushed by mqualmann into branch 'master'.

add Time Adjust to lighttable

M  +2    -2    core/app/main/digikamapp.h
M  +1    -1    core/app/main/digikamapp_setup.cpp
M  +22   -22   core/app/main/digikamapp_tools.cpp
M  +2    -1    core/utilities/lighttable/lighttablewindow.h
M  +1    -0    core/utilities/lighttable/lighttablewindow_p.h
M  +1    -0    core/utilities/lighttable/lighttablewindow_setup.cpp
M  +21   -0    core/utilities/lighttable/lighttablewindow_tools.cpp
M  +2    -1    core/utilities/lighttable/lighttablewindowui5.rc

https://commits.kde.org/digikam/28ad8deb6dc00999b2d07c38ad50fb4d1d5db2d2

diff --git a/core/app/main/digikamapp.h b/core/app/main/digikamapp.h
index 368820c29b..3e2cddffd9 100644
--- a/core/app/main/digikamapp.h
+++ b/core/app/main/digikamapp.h
@@ -179,11 +179,11 @@ private Q_SLOTS:
     void slotMaintenance();
     void slotMaintenanceDone();
     void slotDatabaseMigration();
+    void slotTimeAdjust();
     void slotEditMetadata();
     void slotEditGeolocation();
     void slotPresentation();
     void slotPrintCreator();
-    void slotTimeAdjust();
 
 // -- Configure methods implemented in digikamapp_config.cpp \
----------------------------------------  
@@ -198,7 +198,7 @@ private Q_SLOTS:
     void slotSetupChanged();
     void slotEditKeys();
     void slotThemeChanged();
-    
+
 // -- Export tools methods implemented in digikamapp_export.cpp \
-------------------------------------  
 private Q_SLOTS:
diff --git a/core/app/main/digikamapp_setup.cpp b/core/app/main/digikamapp_setup.cpp
index cea60db78e..dfd1ab6b90 100644
--- a/core/app/main/digikamapp_setup.cpp
+++ b/core/app/main/digikamapp_setup.cpp
@@ -628,8 +628,8 @@ void DigikamApp::setupActions()
 
     setupImageTransformActions();
     setupExifOrientationActions();
-    createMetadataEditAction();
     createTimeAdjustAction();
+    createMetadataEditAction();
     createGeolocationEditAction();
     createExportActions();
     createImportActions();
diff --git a/core/app/main/digikamapp_tools.cpp b/core/app/main/digikamapp_tools.cpp
index bd6efa9b45..d6447f5b40 100644
--- a/core/app/main/digikamapp_tools.cpp
+++ b/core/app/main/digikamapp_tools.cpp
@@ -139,6 +139,28 @@ void DigikamApp::slotDatabaseMigration()
     dlg.exec();
 }
 
+void DigikamApp::slotTimeAdjust()
+{
+    QList<QUrl> urls = view()->selectedUrls(ApplicationSettings::Metadata);
+
+    if (urls.isEmpty())
+        return;
+
+    QPointer<TimeAdjustDialog> dialog = new TimeAdjustDialog(this, new \
DBInfoIface(this, urls, ApplicationSettings::Metadata)); +    dialog->exec();
+
+    delete dialog;
+
+    // Refresh Database with new metadata from files.
+    CollectionScanner scanner;
+
+    foreach(const QUrl& url, urls)
+    {
+        scanner.scanFile(url.toLocalFile(), CollectionScanner::Rescan);
+        ImageAttributesWatch::instance()->fileMetadataChanged(url);
+    }
+}
+
 void DigikamApp::slotEditMetadata()
 {
     QList<QUrl> urls = view()->selectedUrls(ApplicationSettings::Metadata);
@@ -202,26 +224,4 @@ void DigikamApp::slotPrintCreator()
     delete w;
 }
 
-void DigikamApp::slotTimeAdjust()
-{
-    QList<QUrl> urls = view()->selectedUrls(ApplicationSettings::Metadata);
-
-    if (urls.isEmpty())
-        return;
-
-    QPointer<TimeAdjustDialog> dialog = new TimeAdjustDialog(this, new \
                DBInfoIface(this, urls, ApplicationSettings::Metadata));
-    dialog->exec();
-
-    delete dialog;
-
-    // Refresh Database with new metadata from files.
-    CollectionScanner scanner;
-
-    foreach(const QUrl& url, urls)
-    {
-        scanner.scanFile(url.toLocalFile(), CollectionScanner::Rescan);
-        ImageAttributesWatch::instance()->fileMetadataChanged(url);
-    }
-}
-
 } // namespace Digikam
diff --git a/core/utilities/lighttable/lighttablewindow.h \
b/core/utilities/lighttable/lighttablewindow.h index 8246c1f3f3..00501782da 100644
--- a/core/utilities/lighttable/lighttablewindow.h
+++ b/core/utilities/lighttable/lighttablewindow.h
@@ -182,7 +182,8 @@ private Q_SLOTS:
 
     void slotEditItem();
     void slotEditItem(const ImageInfo&);
-    
+
+    void slotTimeAdjust();
     void slotEditMetadata();
     void slotEditGeolocation();
     void slotPrintCreator();
diff --git a/core/utilities/lighttable/lighttablewindow_p.h \
b/core/utilities/lighttable/lighttablewindow_p.h index a7a2125cbb..55172c3fde 100644
--- a/core/utilities/lighttable/lighttablewindow_p.h
+++ b/core/utilities/lighttable/lighttablewindow_p.h
@@ -90,6 +90,7 @@
 #include "mailwizard.h"
 #include "advprintwizard.h"
 #include "dmediaserverdlg.h"
+#include "timeadjustdialog.h"
 #include "wsstarter.h"
 
 #ifdef HAVE_MARBLE
diff --git a/core/utilities/lighttable/lighttablewindow_setup.cpp \
b/core/utilities/lighttable/lighttablewindow_setup.cpp index f4894dc7e6..71144db7df \
                100644
--- a/core/utilities/lighttable/lighttablewindow_setup.cpp
+++ b/core/utilities/lighttable/lighttablewindow_setup.cpp
@@ -149,6 +149,7 @@ void LightTableWindow::setupActions()
 
     // -- Standard 'Tools' menu actions ------------------------
 
+    createTimeAdjustAction();
     createMetadataEditAction();
     createGeolocationEditAction();
     createHtmlGalleryAction();
diff --git a/core/utilities/lighttable/lighttablewindow_tools.cpp \
b/core/utilities/lighttable/lighttablewindow_tools.cpp index 4afb881323..b184d34311 \
                100644
--- a/core/utilities/lighttable/lighttablewindow_tools.cpp
+++ b/core/utilities/lighttable/lighttablewindow_tools.cpp
@@ -54,6 +54,27 @@ void LightTableWindow::slotEditItem(const ImageInfo& info)
     im->setFocus();
 }
 
+void LightTableWindow::slotTimeAdjust()
+{
+    QList<QUrl> urls = d->thumbView->allUrls();
+
+    if (urls.isEmpty())
+        return;
+
+    QPointer<TimeAdjustDialog> dialog = new TimeAdjustDialog(this, new \
DBInfoIface(this, urls, ApplicationSettings::Metadata)); +    dialog->exec();
+
+    delete dialog;
+
+    // Refresh Database with new metadata from files.
+    CollectionScanner scanner;
+
+    foreach(const QUrl& url, urls)
+    {
+        scanner.scanFile(url.toLocalFile(), CollectionScanner::Rescan);
+    }
+}
+
 void LightTableWindow::slotEditMetadata()
 {
     if (d->thumbView->currentInfo().isNull())
diff --git a/core/utilities/lighttable/lighttablewindowui5.rc \
b/core/utilities/lighttable/lighttablewindowui5.rc index dc2eb990c9..0754cf6b71 \
                100644
--- a/core/utilities/lighttable/lighttablewindowui5.rc
+++ b/core/utilities/lighttable/lighttablewindowui5.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<gui version="604" name="lighttablewindow" translationDomain="digikam" >
+<gui version="605" name="lighttablewindow" translationDomain="digikam" >
 
 <MenuBar>
 
@@ -48,6 +48,7 @@
     </Menu>
 
     <Menu name="Tools"><text>&amp;Tools</text>
+        <Action name="timeadjust_edit" />
         <Action name="metadata_edit" />
         <Action name="geolocation_edit" />
         <Separator/>


[prev in list] [next in list] [prev in thread] [next in thread]