X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetFileSelector.cpp;h=6eae3c861174cd9bc943d06178cad69fcab6c36b;hb=97917d3698f5a2f7fc9596e7c755ff8f6751e373;hp=3292d70f228ac8df147ad4f46f07cc449e47e85f;hpb=5352bbb1915f98d1f02b1cb953a2de19b286a28c;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetFileSelector.cpp b/src/ModuleBase/ModuleBase_WidgetFileSelector.cpp index 3292d70f2..6eae3c861 100644 --- a/src/ModuleBase/ModuleBase_WidgetFileSelector.cpp +++ b/src/ModuleBase/ModuleBase_WidgetFileSelector.cpp @@ -1,11 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -/* - * ModuleBase_WidgetFileSelector.cpp - * - * Created on: Aug 28, 2014 - * Author: sbh - */ +// Copyright (C) 2014-2019 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include #include @@ -15,6 +25,7 @@ #include #include +#include #include #include @@ -30,14 +41,22 @@ #include #include + +/// Default path +static QString myDefaultPath; + + ModuleBase_WidgetFileSelector::ModuleBase_WidgetFileSelector(QWidget* theParent, - const Config_WidgetAPI* theData, - const std::string& theParentId) - : ModuleBase_ModelWidget(theParent, theData, theParentId) + const Config_WidgetAPI* theData) +: ModuleBase_ModelWidget(theParent, theData), myFileDialog(0) { - myTitle = QString::fromStdString(theData->getProperty("title")); + myTitle = translate(theData->getProperty("title")); myType = (theData->getProperty("type") == "save") ? WFS_SAVE : WFS_OPEN; - myDefaultPath = QString::fromStdString(theData->getProperty("path")); + if (myDefaultPath.isNull() || myDefaultPath.isEmpty()) + 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); @@ -46,6 +65,7 @@ ModuleBase_WidgetFileSelector::ModuleBase_WidgetFileSelector(QWidget* theParent, aMainLay->addWidget(aTitleLabel, 0, 0); myPathField = new QLineEdit(this); aMainLay->addWidget(myPathField, 1, 0); + QPushButton* aSelectPathBtn = new QPushButton("...", this); aSelectPathBtn->setToolTip(tr("Select file...")); aSelectPathBtn->setMaximumWidth(20); @@ -66,30 +86,34 @@ ModuleBase_WidgetFileSelector::~ModuleBase_WidgetFileSelector() { } -bool ModuleBase_WidgetFileSelector::storeValueCustom() const +bool ModuleBase_WidgetFileSelector::storeValueCustom() { - // A rare case when plugin was not loaded. + // A rare case when plugin was not loaded. if (!myFeature) return false; DataPtr aData = myFeature->data(); AttributeStringPtr aStringAttr = aData->string(attributeID()); QString aWidgetValue = myPathField->text(); - aStringAttr->setValue(aWidgetValue.toStdString()); + aStringAttr->setValue(aWidgetValue.toStdWString()); updateObject(myFeature); return true; } -bool ModuleBase_WidgetFileSelector::restoreValue() +bool ModuleBase_WidgetFileSelector::restoreValueCustom() { - // A rare case when plugin was not loaded. + // A rare case when plugin was not loaded. if (!myFeature) return false; DataPtr aData = myFeature->data(); AttributeStringPtr aStringAttr = aData->string(attributeID()); - bool isBlocked = myPathField->blockSignals(true); - myPathField->setText(QString::fromStdString(aStringAttr->value())); - myPathField->blockSignals(isBlocked); + std::wstring aUtfStr = aStringAttr->valueW(); + QString aNewText = QString::fromStdWString(aUtfStr); + if (myPathField->text() != aNewText) { + bool isBlocked = myPathField->blockSignals(true); + myPathField->setText(aNewText); + myPathField->blockSignals(isBlocked); + } return true; } @@ -97,8 +121,6 @@ bool ModuleBase_WidgetFileSelector::restoreValue() QList ModuleBase_WidgetFileSelector::getControls() const { QList result; - //QPushButton * aButton = this->findChild(); - //result << aButton; result << myPathField; return result; } @@ -109,18 +131,46 @@ 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() ? myDefaultPath : QFileInfo(myPathField->text()).absolutePath(); QString aFilter = filterString(); - QString aFileName = (myType == WFS_SAVE) - ? QFileDialog::getSaveFileName(this, myTitle, aDefaultPath, aFilter, &mySelectedFilter) - : QFileDialog::getOpenFileName(this, myTitle, aDefaultPath, aFilter, &mySelectedFilter); - if (!aFileName.isEmpty()) { - myPathField->setText(aFileName); + + // use Option prohibited native dialog using to have both lower/upper extensions of files + // satisfied to dialog filter on Linux(Calibre) Issue #2055 + 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.toUtf8()); + myDefaultPath = QFileInfo(aFileName).absolutePath(); + emit focusOutWidget(this); + } + } } + myFileDialog = 0; } void ModuleBase_WidgetFileSelector::onPathChanged() @@ -131,7 +181,7 @@ void ModuleBase_WidgetFileSelector::onPathChanged() emit valuesChanged(); } -QString ModuleBase_WidgetFileSelector::formatToFilter( const QString & theFormat ) +QString ModuleBase_WidgetFileSelector::formatToFilter(const QString & theFormat) { if (theFormat.isEmpty() && !theFormat.contains(":")) return QString(); @@ -142,17 +192,31 @@ QString ModuleBase_WidgetFileSelector::formatToFilter( const QString & theFormat .arg(QStringList(aExtesionList).replaceInStrings(QRegExp("^(.*)$"), "*.\\1").join(" ")); } +QString ModuleBase_WidgetFileSelector::filterToShortFormat(const QString & theFilter) +{ + // Simplified implementation. + // It relies on theFilter was made by formatToFilter() function. + return theFilter.section(' ', 0, 0); +} + +QStringList ModuleBase_WidgetFileSelector::filterToExtensions(const QString & theFilter) +{ + // Simplified implementation. + // It relies on theFilter was made by formatToFilter() function. + QStringList anExtensions = theFilter.section("(", 1, 1).section(")", 0, 0).split(" "); + return anExtensions; +} + QStringList ModuleBase_WidgetFileSelector::getValidatorFormats() const { SessionPtr aMgr = ModelAPI_Session::get(); ModelAPI_ValidatorsFactory* aFactory = aMgr->validators(); - std::list allValidators; - std::list > allArguments; - aFactory->validators(myFeature->getKind(), myAttributeID, allValidators, allArguments); + ModelAPI_ValidatorsFactory::Validators allValidators; + aFactory->validators(myFeature->getKind(), myAttributeID, allValidators); QStringList aResult; - std::list anArgumentList = allArguments.front(); + std::list anArgumentList = allValidators.front().second; std::list::const_iterator it = anArgumentList.begin(); for (; it != anArgumentList.end(); ++it) { QString aFormat = QString::fromStdString(*it); @@ -174,3 +238,20 @@ QString ModuleBase_WidgetFileSelector::filterString() const aResult << QString("All files (*.*)"); return aResult.join(";;"); } + +QString ModuleBase_WidgetFileSelector::applyExtension(const QString& theFileName, + const QString& theFilter) +{ + QString aResult = theFileName; + bool hasExtension = false; + QStringList anExtensions = filterToExtensions(theFilter); + foreach(const QString& anExtension, anExtensions) { + if (theFileName.endsWith(anExtension.section(".", 1, 1), Qt::CaseInsensitive)) { + hasExtension = true; + break; + } + } + if (!hasExtension && !anExtensions.isEmpty()) + aResult = QString("%1.%2").arg(theFileName).arg(anExtensions[0].section(".", 1, 1)); + return aResult; +}