fixed FileDialogMemory::getOpenFileName() not using given directory

disable all widgets when there's no selection
now saves application icon
browse working directory uses current value in file dialog

1 files changed, 19 insertions, 9 deletions

diff --git a/src/filedialogmemory.cpp b/src/filedialogmemory.cpp
index 6b440d0f..9607beb9 100644
--- a/src/filedialogmemory.cpp
+++ b/src/filedialogmemory.cpp
@@ -56,10 +56,10 @@ void FileDialogMemory::restore(QSettings &settings)
 }

 

 

-QString FileDialogMemory::getOpenFileName(const QString &dirID, QWidget *parent,

-                 const QString &caption, const QString &dir,

-                 const QString &filter, QString *selectedFilter,

-                 QFileDialog::Options options)

+QString FileDialogMemory::getOpenFileName(

+  const QString &dirID, QWidget *parent, const QString &caption,

+  const QString &dir, const QString &filter, QString *selectedFilter,

+  QFileDialog::Options options)

 {

   std::pair<std::map<QString, QString>::iterator, bool> currentDir =

       instance().m_Cache.insert(std::make_pair(dirID, dir));

@@ -73,16 +73,26 @@ QString FileDialogMemory::getOpenFileName(const QString &dirID, QWidget *parent,
 }

 

 

-QString FileDialogMemory::getExistingDirectory(const QString &dirID, QWidget *parent,

-                 const QString &caption, const QString &dir, QFileDialog::Options options)

+QString FileDialogMemory::getExistingDirectory(

+  const QString &dirID, QWidget *parent, const QString &caption,

+  const QString &dir, QFileDialog::Options options)

 {

-  std::pair<std::map<QString, QString>::iterator, bool> currentDir =

-      instance().m_Cache.insert(std::make_pair(dirID, dir));

+  QString currentDir = dir;

+

+  if (currentDir.isEmpty()) {

+    auto itor = instance().m_Cache.find(dirID);

+    if (itor != instance().m_Cache.end()) {

+      currentDir = itor->first;

+    }

+  }

+

+  QString result = QFileDialog::getExistingDirectory(

+    parent, caption, currentDir, options);

 

-  QString result = QFileDialog::getExistingDirectory(parent, caption, currentDir.first->second, options);

   if (!result.isNull()) {

     instance().m_Cache[dirID] = QFileInfo(result).path();

   }

+

   return result;

 }