summaryrefslogtreecommitdiffstats
path: root/pictureviewer2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'pictureviewer2.cpp')
-rw-r--r--pictureviewer2.cpp19
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();
}