Issue #2309 Possibility to hide faces : redisplay objects by transparency check box...

[modules/shaper.git] / src / ModuleBase / ModuleBase_WidgetFileSelector.cpp

diff --git a/src/ModuleBase/ModuleBase_WidgetFileSelector.cpp b/src/ModuleBase/ModuleBase_WidgetFileSelector.cpp
index 57db592c3cf6fe3cf48906ac00119df2a133bcd2..ca7ee5de1a7f29e16f59b81e3aa547fa9183d16e 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetFileSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetFileSelector.cpp
@@ -26,6 +26,7 @@
 #include <ModuleBase_WidgetFileSelector.h>
 #include <ModuleBase_Tools.h>
 
+#include <Config_PropManager.h>
 #include <Config_WidgetAPI.h>
 
 #include <QFileDialog>
@@ -43,12 +44,15 @@
 
 ModuleBase_WidgetFileSelector::ModuleBase_WidgetFileSelector(QWidget* theParent,
                                                              const Config_WidgetAPI* theData)
-: ModuleBase_ModelWidget(theParent, theData)
+: ModuleBase_ModelWidget(theParent, theData), myFileDialog(0)
 {
   myTitle = translate(theData->getProperty("title"));
   myType = (theData->getProperty("type") == "save") ? WFS_SAVE : WFS_OPEN;
   myDefaultPath = QString::fromStdString(theData->getProperty("path"));
 
+  if (myDefaultPath.isEmpty())
+    myDefaultPath = Config_PropManager::string("Plugins", "import_initial_path").c_str();
+
   QGridLayout* aMainLay = new QGridLayout(this);
   ModuleBase_Tools::adjustMargins(aMainLay);
   QLabel* aTitleLabel = new QLabel(myTitle, this);
@@ -119,6 +123,16 @@ bool ModuleBase_WidgetFileSelector::isCurrentPathValid()
   return aFile.exists();
 }
 
+bool ModuleBase_WidgetFileSelector::processEscape()
+{
+  if (myFileDialog) {
+    myFileDialog->reject();
+    return true;
+  }
+  return ModuleBase_ModelWidget::processEscape();
+}
+
+
 void ModuleBase_WidgetFileSelector::onPathSelectionBtn()
 {
   QString aDefaultPath = myPathField->text().isEmpty()
@@ -127,17 +141,26 @@ void ModuleBase_WidgetFileSelector::onPathSelectionBtn()
   QString aFilter = filterString();
   // use Option prohibited native dialog using to have both lower/upper extensions of files
   // satisfied to dialog filter on Linux(Calibre) Issue #2055
-  QString aFileName = (myType == WFS_SAVE)
-      ? QFileDialog::getSaveFileName(this, myTitle, aDefaultPath, aFilter, &mySelectedFilter,
-                                     QFileDialog::DontUseNativeDialog)
-      : QFileDialog::getOpenFileName(this, myTitle, aDefaultPath, aFilter, &mySelectedFilter,
-                                     QFileDialog::DontUseNativeDialog);
-  if (!aFileName.isEmpty()) {
-    if (myType == WFS_SAVE)
-      aFileName = applyExtension(aFileName, mySelectedFilter);
-    myPathField->setText(aFileName);
-    emit focusOutWidget(this);
+  myFileDialog = new QFileDialog(this, myTitle, aDefaultPath, aFilter);
+  myFileDialog->setNameFilter(aFilter);
+  myFileDialog->setOptions(QFileDialog::DontUseNativeDialog);
+  myFileDialog->setAcceptMode(myType == WFS_SAVE ? QFileDialog::AcceptSave
+                                                 : QFileDialog::AcceptOpen);
+  if (myFileDialog->exec() == QDialog::Accepted)
+  {
+    mySelectedFilter = myFileDialog->selectedNameFilter();
+    QStringList aFileNames = myFileDialog->selectedFiles();
+    if (!aFileNames.empty()) {
+      QString aFileName = aFileNames.first();
+      if (!aFileName.isEmpty()) {
+        if (myType == WFS_SAVE)
+          aFileName = applyExtension(aFileName, mySelectedFilter);
+        myPathField->setText(aFileName);
+        emit focusOutWidget(this);
+      }
+    }
   }
+  myFileDialog = 0;
 }
 
 void ModuleBase_WidgetFileSelector::onPathChanged()