diff options
author | Arno <am@disconnect.de> | 2015-03-21 10:29:09 +0100 |
---|---|---|
committer | Arno <am@disconnect.de> | 2015-03-21 10:29:09 +0100 |
commit | ac814248b52912a366d2eb62e8ff00f2caa7e4d7 (patch) | |
tree | e0f5957dd8fbb2572342fcbab4cf02e8a3a15ee1 /pictureviewer2.cpp | |
parent | 6116312ed547b9fa14e43b9f7a0e3d4d2007d2af (diff) | |
download | SheMov-ac814248b52912a366d2eb62e8ff00f2caa7e4d7.tar.gz SheMov-ac814248b52912a366d2eb62e8ff00f2caa7e4d7.tar.bz2 SheMov-ac814248b52912a366d2eb62e8ff00f2caa7e4d7.zip |
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.
Diffstat (limited to 'pictureviewer2.cpp')
-rw-r--r-- | pictureviewer2.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
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(); } |