From 2b6a35559cc330fe0356a961e3283a11abc3442f Mon Sep 17 00:00:00 2001
From: Arno <arno@disconnect.de>
Date: Sat, 6 Jun 2015 08:39:13 +0200
Subject: Fixes for NewPicsDialog

* Make sure that we don't add pictures without mapping
* Let the windowmanager position the progress dialog
---
 newpicsdialog.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'newpicsdialog.cpp')

diff --git a/newpicsdialog.cpp b/newpicsdialog.cpp
index fbadb53..2325f42 100644
--- a/newpicsdialog.cpp
+++ b/newpicsdialog.cpp
@@ -18,6 +18,7 @@
 #include <QLabel>
 #include <QMenu>
 #include <QAction>
+#include <QMessageBox>
 
 #include "newpicsdialog.h"
 #include "smtreeitem.h"
@@ -181,14 +182,16 @@ void NewPicsDialog::accept(){
         return QDialog::accept();
     }
     QList<QVariant> mappingParentsIds = mMappingEditWidget->model()->getMappings(mMappingEditWidget->model()->root());
+    if(mappingParentsIds.isEmpty()){
+        QMessageBox::critical(this, tr("No mappings"), tr("Cannot continue without mappings!"));
+        return;
+    }
     QSqlQuery addFileQ(mDb);
     addFileQ.prepare("INSERT INTO pics (tfilename, cmd5sum, isize, tformat, cpicsize) VALUES(:fn, :md5, :size, :format, :picsize)");
     QSqlQuery addMappingQ(mDb);
     addMappingQ.prepare("INSERT INTO pics_mappings(ipics_id, imappings_parents_id) VALUES((SELECT ipicsid FROM pics where cmd5sum = :md5), :mapid)");
     QProgressDialog progress(tr("Processing..."), QString(), 0, files.size(), this);
     progress.show();
-    progress.setWindowModality(Qt::WindowModal);
-    Helper::centerWidget(&progress);
     int pgctr = 0;
     foreach(FileData d, files){
         ++pgctr;
-- 
cgit v1.2.3-70-g09d2