… as suggested by Willem.
From bb0a4539cfa4d2c05229b741b99fa4797bc077da Mon Sep 17 00:00:00 2001
From: "Robert C. Helling" <[email protected]>
Date: Wed, 29 Apr 2015 22:17:59 +0200
Subject: [PATCH 1/2] Display a notification while image hashing is ongoing.
Signed-off-by: Robert C. Helling <[email protected]>
---
qt-ui/mainwindow.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index e22f340..23f9551 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -330,6 +330,7 @@ void learnImageDirs(QStringList dirnames)
void MainWindow::on_actionHash_images_triggered()
{
+ QFuture<void> future;
QFileDialog dialog(this, tr("Traverse image directories"),
lastUsedDir(), filter());
dialog.setFileMode(QFileDialog::Directory);
dialog.setViewMode(QFileDialog::Detail);
@@ -340,7 +341,10 @@ void MainWindow::on_actionHash_images_triggered()
dirnames = dialog.selectedFiles();
if (dirnames.isEmpty())
return;
- QtConcurrent::run(learnImageDirs,dirnames);
+ future = QtConcurrent::run(learnImageDirs,dirnames);
+
MainWindow::instance()->getNotificationWidget()->showNotification(tr("Scanning
images...(this can take a while)"), KMessageWidget::Information);
+ MainWindow::instance()->getNotificationWidget()->setFuture(future);
+
}
ProfileWidget2 *MainWindow::graphics() const
--
1.9.5 (Apple Git-50.3)
From eb12c914c62a3f3b6b925574ecee5c4ae0dca84f Mon Sep 17 00:00:00 2001
From: "Robert C. Helling" <[email protected]>
Date: Wed, 29 Apr 2015 22:53:32 +0200
Subject: [PATCH 2/2] Rename menu entry for image hashing
Signed-off-by: Robert C. Helling <[email protected]>
---
qt-ui/mainwindow.ui | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui
index 1494706..b5456f2 100644
--- a/qt-ui/mainwindow.ui
+++ b/qt-ui/mainwindow.ui
@@ -699,7 +699,7 @@
</action>
<action name="actionHash_images">
<property name="text">
- <string>Hash images</string>
+ <string>Find moved images</string>
</property>
</action>
</widget>
--
1.9.5 (Apple Git-50.3)
Best
Robert
_______________________________________________
subsurface mailing list
[email protected]
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
