1 files changed, 2 insertions, 83 deletions

diff --git a/pictureviewer2.cpp b/pictureviewer2.cpp
index 42f77fe..5b0c8b0 100644
--- a/pictureviewer2.cpp
+++ b/pictureviewer2.cpp
@@ -187,7 +187,6 @@ void PictureViewer2::next(){
     }else{
         ++mCurPos;
     }
-    mMarkA->setChecked(mMarkedFiles.contains(mFiles.at(mCurPos)));
     showFile(mFiles.at(mCurPos));
 }
 
@@ -200,7 +199,6 @@ void PictureViewer2::previous(){
     }else{
         --mCurPos;
     }
-    mMarkA->setChecked(mMarkedFiles.contains(mFiles.at(mCurPos)));
     showFile(mFiles.at(mCurPos));
 }
 
@@ -212,7 +210,6 @@ void PictureViewer2::skip(int amount){
     if(next < 0){
         next = mFiles.size() + next;
     }
-    mMarkA->setChecked(mMarkedFiles.contains(mFiles.at(next)));
     showFile(mFiles.at(next));
     mCurPos = next;
 }
@@ -274,49 +271,9 @@ void PictureViewer2::writeSettings(){
     mSlideDlg->mappingEditWidget()->saveMappings("ui/pvmappings");
 }
 
-void PictureViewer2::initActions(){
-    foreach(QAction *a, actions()){
-        //never, ever forget this when casting to int
-        //an invalid QVariant casts to a valid int!
-        if(!a->data().isValid()){
-            continue;
-        }
-        if(a->data().toInt() == HideAction){
-            mHideA = a;
-        }
-        if(a->data().toInt() == MarkAction){
-            mMarkA = a;
-        }
-        if(a->data().toInt() == DeleteAction){
-            mDeleteA = a;
-        }
-    }
-}
-
-void PictureViewer2::copyCurrent(){
-    QString fullPath = mFiles.at(mCurPos).at(PicFilesModel::FullPath).toString();
-    QSettings s;
-    QString lastDir = s.value("ui/pvlastdir", QDir::homePath()).toString();
-    QString destDir = QFileDialog::getExistingDirectory(this, tr("Copy picture"), lastDir);
-    if(!destDir.isEmpty()){
-        QFileInfo fi(fullPath);
-        QString copyTo = QString("%1/%2").arg(destDir).arg(fi.fileName());
-        bool success = QFile::copy(fullPath, copyTo);
-        if(!success){
-            QString msg = QString(tr("File copy %1 -> %2 failed!")).arg(fullPath).arg(copyTo);
-            QMessageBox::critical(this, tr("Error"), msg);
-        }else{
-            s.setValue("ui/pvlastdir", destDir);
-        }
-    }
-}
-
 void PictureViewer2::deleteCurrent(){
     int retval = QMessageBox::question(this, tr("Delete file"), tr("Are you sure?"), QMessageBox::No | QMessageBox::Yes);
     if(retval == QMessageBox::Yes){
-        if(mMarkedFiles.contains(mFiles.at(mCurPos))){
-            mMarkedFiles.removeAll(mFiles.at(mCurPos));
-        }
         QString fullPath = mFiles.at(mCurPos).at(PicFilesModel::FullPath).toString();
         QFile f(fullPath);
         if(f.remove()){
@@ -328,19 +285,8 @@ void PictureViewer2::deleteCurrent(){
 void PictureViewer2::showNewPicsDialog(){
     mNewPicsDlg->clearFiles();
     QStringList fileList;
-    if(mMarkedFiles.isEmpty()){
-        if(!mCurrentDir.isEmpty()){
-            QDir d(mCurrentDir);
-            foreach(QFileInfo fi, d.entryInfoList()){
-                fileList << fi.absoluteFilePath();
-            }
-        }else{
-            return;
-        }
-    }else{
-        foreach(QVariantList v, mMarkedFiles){
-            fileList << v.at(PicFilesModel::FullPath).toString();
-        }
+    foreach(QVariantList v, mMarkedFiles){
+        fileList << v.at(PicFilesModel::FullPath).toString();
     }
     mNewPicsDlg->addFiles(fileList);
     mNewPicsDlg->setFocusToMappings();
@@ -352,18 +298,6 @@ void PictureViewer2::addToNewPics(){
     mNewPicsDlg->show();
 }
 
-void PictureViewer2::markCurrent(){
-    if(!mMarkedFiles.contains(mCurPicData)){
-        mMarkedFiles << mCurPicData;
-        mMarkA->setChecked(true);
-        next();
-    }else{
-        mMarkedFiles.removeAll(mCurPicData);
-        mMarkA->setChecked(false);
-    }
-    constructInfoItem(mCurPicData, QSize());
-}
-
 void PictureViewer2::clearMarks(){
     mMarkedFiles.clear();
     constructInfoItem(mCurPicData, QSize());
@@ -446,7 +380,6 @@ void PictureViewer2::keyPressEvent(QKeyEvent *e){
 
     if(e->key() == Qt::Key_Escape){
         stopSlide();
-        mHideA->toggle();
     }
     if(e->key() == Qt::Key_Space){
         if(mTimer->isActive()){
@@ -455,9 +388,6 @@ void PictureViewer2::keyPressEvent(QKeyEvent *e){
             startSlide();
         }
     }
-    if(e->key() == Qt::Key_M){
-        markCurrent();
-    }
 
     if((e->key() == Qt::Key_N) || (e->key() == Qt::Key_Down) || (e->key() == Qt::Key_Right)){
         next();
@@ -478,17 +408,6 @@ void PictureViewer2::keyPressEvent(QKeyEvent *e){
     e->accept();
 }
 
-void PictureViewer2::showEvent(QShowEvent *e){
-    mHideA->setChecked(true);
-    QGraphicsView::showEvent(e);
-}
-
-void PictureViewer2::hideEvent(QHideEvent *e){
-    stopSlide();
-    mHideA->setChecked(false);
-    QGraphicsView::hideEvent(e);
-}
-
 void PictureViewer2::resizeEvent(QResizeEvent *event){
     QGraphicsView::resizeEvent(event);
     showFile(mCurPicData);