From 26530f47ff13e20d46472c12abc7567a61c14e57 Mon Sep 17 00:00:00 2001
From: Arno <am@disconnect.de>
Date: Sat, 25 Feb 2012 19:11:59 +0100
Subject: Make NewPicsDialog archive pictures

Finally NewPicsDialog actually does something. Added another parameter
to Helper::moveToArchive. If set to true, files will only be copied
instead of moved. Default is false, not changing the expected behavior.
---
 newpicsdialog.h | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'newpicsdialog.h')

diff --git a/newpicsdialog.h b/newpicsdialog.h
index 9a11675..ea9a0bc 100644
--- a/newpicsdialog.h
+++ b/newpicsdialog.h
@@ -8,7 +8,7 @@
 #ifndef NEWPICSDIALOG_H
 #define NEWPICSDIALOG_H
 
-#include <QWidget>
+#include <QDialog>
 #include <QSqlDatabase>
 #include <QTreeView>
 
@@ -27,16 +27,17 @@ class MappingTreeResultModel;
 
 struct FileData;
 
-class NewPicsDialog : public QWidget {
+class NewPicsDialog : public QDialog {
     Q_OBJECT
     public:
-        explicit NewPicsDialog(QWidget *parent = 0);
+        explicit NewPicsDialog(QWidget *parent = 0, Qt::WindowFlags f = 0);
 
     public slots:
         void addFiles();
         void removeFiles();
         void addMapping();
         void removeMapping();
+        void accept();
 
     private:
         QTabWidget *mTab;
@@ -52,6 +53,11 @@ class NewPicsDialog : public QWidget {
         QPushButton *mRemoveMapping;
         MappingTreeResultView *mResultView;
         MappingTreeResultModel *mResultModel;
+        QPushButton *mOk;
+        QPushButton *mCancel;
+        QSqlDatabase mDb;
+        QSqlQuery *mAddFileQ;
+        QSqlQuery *mAddMappingQ;
 };
 
 class MappingTreeResultView : public QTreeView {
@@ -63,9 +69,9 @@ class MappingTreeResultView : public QTreeView {
 class NewPicFilesModel : public SmTreeModel {
     Q_OBJECT
     public:
-        enum Roles { FileNameRole = Qt::UserRole + 1, ValidRole = Qt::UserRole + 2, Md5SumRole = Qt::UserRole + 3, MimeTypeRole = Qt::UserRole + 4, FullPathRole = Qt::UserRole + 5 };
-        enum Fields { FileName = 0, Valid = 1, Md5Sum = 2, MimeType = 3, FullPath = 4 };
-        enum { NumFields = 5 };
+        enum Roles { FileNameRole = Qt::UserRole + 1, SizeRole = Qt::UserRole + 2, ValidRole = Qt::UserRole + 3, Md5SumRole = Qt::UserRole + 4, MimeTypeRole = Qt::UserRole + 5, FullPathRole = Qt::UserRole + 6 };
+        enum Fields { FileName = 0, Size = 1, Valid = 2, Md5Sum = 3, MimeType = 4, FullPath = 5 };
+        enum { NumFields = 6 };
         explicit NewPicFilesModel(const QStringList &header, QObject *parent = 0);
         ~NewPicFilesModel();
 
@@ -86,6 +92,7 @@ class NewPicFilesModel : public SmTreeModel {
 
 struct FileData {
     QString fileName;
+    int size;
     bool valid;
     QString md5sum;
     QString mimeType;
-- 
cgit v1.2.3-70-g09d2