From ac814248b52912a366d2eb62e8ff00f2caa7e4d7 Mon Sep 17 00:00:00 2001
From: Arno <am@disconnect.de>
Date: Sat, 21 Mar 2015 10:29:09 +0100
Subject: Move NewPicsDialog to topLeft + selectAll

When calling NewPicsDialog from PictureViewer, move it to the top left
corner to not cover the pic itself. Also, select all pics from current
directory when no files are marked.
---
 pictureviewer2.cpp | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'pictureviewer2.cpp')

diff --git a/pictureviewer2.cpp b/pictureviewer2.cpp
index dbb1763..7a8e2b2 100644
--- a/pictureviewer2.cpp
+++ b/pictureviewer2.cpp
@@ -317,15 +317,24 @@ void PictureViewer2::deleteCurrent(){
 }
 
 void PictureViewer2::showNewPicsDialog(){
-    if(mMarkedFiles.isEmpty()){
-        return;
-    }
     mNewPicsDlg->clearFiles();
     QStringList fileList;
-    foreach(QVariantList v, mMarkedFiles){
-        fileList << v.at(PicFilesModel::FullPath).toString();;
+    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();
+        }
     }
     mNewPicsDlg->addFiles(fileList);
+    mNewPicsDlg->move(0, 20);
     mNewPicsDlg->exec();
 }
 
-- 
cgit v1.2.3-70-g09d2