Skip to content
Snippets Groups Projects
Commit 8c6a47cc authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

GUI: always use Qt file dialog instead of native one

parent 4638142f
No related branches found
No related tags found
1 merge request!36GUI: always use Qt file dialog instead of native one
Pipeline #35178 passed
......@@ -218,8 +218,9 @@ void RealDataSelectorWidget::importData1D()
QString selectedFilter = AppSvc::projectManager()->recentlyUsedImportFilter1D();
const QString dirname = AppSvc::projectManager()->userImportDir();
const QStringList fileNames = QFileDialog::getOpenFileNames(Q_NULLPTR, "Open Intensity Files",
dirname, filters, &selectedFilter);
const QStringList fileNames =
QFileDialog::getOpenFileNames(Q_NULLPTR, "Open Intensity Files", dirname, filters,
&selectedFilter, QFileDialog::DontUseNativeDialog);
if (fileNames.isEmpty())
return;
......@@ -268,8 +269,9 @@ void RealDataSelectorWidget::importData2D()
QString selectedFilter = AppSvc::projectManager()->recentlyUsedImportFilter2D();
const QString dirname = AppSvc::projectManager()->userImportDir();
const QStringList fileNames = QFileDialog::getOpenFileNames(Q_NULLPTR, "Open Intensity Files",
dirname, filters, &selectedFilter);
const QStringList fileNames =
QFileDialog::getOpenFileNames(Q_NULLPTR, "Open Intensity Files", dirname, filters,
&selectedFilter, QFileDialog::DontUseNativeDialog);
if (fileNames.isEmpty())
return;
......
......@@ -56,8 +56,9 @@ void SavePlotAssistant::savePlot(const QString& dirname, QCustomPlot* plot,
{
QString selectedFilter("*.png");
QString defaultName = dirname + "/untitled";
QString fileName = QFileDialog::getSaveFileName(0, "Save Plot", defaultName, getFilterString(),
&selectedFilter);
QString fileName =
QFileDialog::getSaveFileName(0, "Save Plot", defaultName, getFilterString(),
&selectedFilter, QFileDialog::DontUseNativeDialog);
QString nameToSave = composeFileName(fileName, selectedFilter);
......
......@@ -51,7 +51,8 @@ void SaveProjectionsAssistant::saveProjections(QWidget* parent, IntensityDataIte
ASSERT(intensityItem);
QString defaultName = ProjectUtils::userExportDir() + "/untitled.txt";
QString fileName = QFileDialog::getSaveFileName(parent, "Save projections data", defaultName);
QString fileName = QFileDialog::getSaveFileName(parent, "Save projections data", defaultName,
"", nullptr, QFileDialog::DontUseNativeDialog);
if (fileName.isEmpty())
return;
......
......@@ -149,8 +149,9 @@ void RealSpaceCanvas::savePicture(const QPixmap& pixmap)
QString defaultExtension = ".png";
QString selectedFilter("*" + defaultExtension);
QString defaultName = dirname + "/untitled";
QString fileName = QFileDialog::getSaveFileName(nullptr, "Save 3D real space view", defaultName,
selectedFilter);
QString fileName =
QFileDialog::getSaveFileName(nullptr, "Save 3D real space view", defaultName,
selectedFilter, nullptr, QFileDialog::DontUseNativeDialog);
QString nameToSave =
fileName.endsWith(defaultExtension) ? fileName : fileName + defaultExtension;
......
......@@ -118,7 +118,8 @@ void PythonScriptWidget::onExportToFileButton()
QString defaultName = dirname + "/untitled";
QString fileName =
QFileDialog::getSaveFileName(nullptr, "Save file", defaultName, filters, &defaultFilter);
QFileDialog::getSaveFileName(nullptr, "Save file", defaultName, filters, &defaultFilter,
QFileDialog::DontUseNativeDialog);
if (fileName.isEmpty())
return;
......
......@@ -95,7 +95,8 @@ QString PyImportAssistant::fileNameToOpen()
QString dirname = AppSvc::projectManager()->userImportDir();
QString result = QFileDialog::getOpenFileName(m_mainWindow, "Open python script", dirname,
"Python scripts (*.py)");
"Python scripts (*.py)", nullptr,
QFileDialog::DontUseNativeDialog);
saveImportDir(result);
......
......@@ -108,8 +108,7 @@ QString NewProjectDialog::getProjectFileName() const
{
QString projectDir = getWorkingDirectory() + QString("/") + getProjectName();
QString projectFile = getProjectName() + ProjectDocument::projectFileExtension();
QString result = projectDir + QString("/") + projectFile;
return result;
return projectDir + QString("/") + projectFile;
}
//! calls directory selection dialog
......@@ -117,12 +116,14 @@ void NewProjectDialog::onBrowseDirectory()
{
QString dirname = QFileDialog::getExistingDirectory(
this, "Select directory", getWorkingDirectory(),
QFileDialog::DontResolveSymlinks | QFileDialog::ShowDirsOnly);
QFileDialog::DontResolveSymlinks | QFileDialog::ShowDirsOnly
| QFileDialog::DontUseNativeDialog);
if (!dirname.isEmpty()) {
checkIfProjectPathIsValid(dirname);
checkIfProjectNameIsValid(getProjectName());
}
if (dirname.isEmpty())
return;
checkIfProjectPathIsValid(dirname);
checkIfProjectNameIsValid(getProjectName());
}
//! Checks whether ProjectPath is valid and sets warning state accordingly. Corresponding directory
......@@ -153,11 +154,7 @@ void NewProjectDialog::setValidProjectName(bool status)
{
m_valid_projectName = status;
QPalette palette;
if (m_valid_projectName) {
palette.setColor(QPalette::Text, Qt::black);
} else {
palette.setColor(QPalette::Text, Qt::darkRed);
}
palette.setColor(QPalette::Text, m_valid_projectPath ? Qt::black : Qt::darkRed);
m_projectNameEdit->setPalette(palette);
}
......@@ -167,11 +164,7 @@ void NewProjectDialog::setValidProjectPath(bool status)
{
m_valid_projectPath = status;
QPalette palette;
if (m_valid_projectPath) {
palette.setColor(QPalette::Text, Qt::black);
} else {
palette.setColor(QPalette::Text, Qt::darkRed);
}
palette.setColor(QPalette::Text, m_valid_projectPath ? Qt::black : Qt::darkRed);
m_workDirEdit->setPalette(palette);
}
......
......@@ -324,7 +324,8 @@ void ProjectManager::openProject(QString fileName)
if (fileName.isEmpty()) {
fileName =
QFileDialog::getOpenFileName(m_mainWindow, "Open project file", workingDirectory(),
"BornAgain project Files (*.pro)");
"BornAgain project Files (*.pro)",
nullptr, QFileDialog::DontUseNativeDialog);
if (fileName.isEmpty())
return;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment