Add Delete to NewPicsDialog

Also fix handling of next picture.

2 files changed, 15 insertions, 1 deletions

diff --git a/newpicsdialog.cpp b/newpicsdialog.cpp
index a161d8d..d904142 100644
--- a/newpicsdialog.cpp
+++ b/newpicsdialog.cpp
@@ -72,10 +72,13 @@ void NewPicsDialog::setupDlg(){
     connect(mCancel, SIGNAL(clicked()), this, SLOT(reject()));
     mNext = new QPushButton(tr("Next >"));
     connect(mNext, SIGNAL(clicked()), this, SLOT(next()));
+    mDelete = new QPushButton(tr("Delete"));
+    connect(mDelete, SIGNAL(clicked()), this, SLOT(deleteCurrent()));
     QHBoxLayout *dlgButtonLayout = new QHBoxLayout;
     dlgButtonLayout->addStretch();
     dlgButtonLayout->addWidget(mCancel);
     dlgButtonLayout->addWidget(mNext);
+    dlgButtonLayout->addWidget(mDelete);
     dlgButtonLayout->addWidget(mOk);
 
     //put it together
@@ -163,7 +166,6 @@ void NewPicsDialog::setNextPic(){
         QString fp = mFiles.at(mFilesCtr);
         setFile(fp);
         SmGlobals::instance()->pictureViewer()->setFile(fp);
-        ++mFilesCtr;
     }
 }
 
@@ -235,8 +237,18 @@ void NewPicsDialog::archive(){
     }
 }
 
+void NewPicsDialog::deleteCurrent(){
+    if(mFilesCtr < mFiles.count()){
+        QString fp = mFiles.at(mFilesCtr);
+        QFile::remove(fp);
+        ++mFilesCtr;
+        setNextPic();
+    }
+}
+
 void NewPicsDialog::next(){
     archive();
+    ++mFilesCtr;
     setNextPic();
 }
 
diff --git a/newpicsdialog.h b/newpicsdialog.h
index 79a6acb..5033c79 100644
--- a/newpicsdialog.h
+++ b/newpicsdialog.h
@@ -45,6 +45,7 @@ class NewPicsDialog : public QDialog {
 
     private slots:
         void archive();
+        void deleteCurrent();
         void writeSettings();
         void readSettings();
 
@@ -61,6 +62,7 @@ class NewPicsDialog : public QDialog {
         QPushButton *mOk;
         QPushButton *mCancel;
         QPushButton *mNext;
+        QPushButton *mDelete;
         QSqlDatabase mDb;
         QPoint mPos;
         QStringList mFiles;