public/gpui
1
0
Fork 0
mirror of https://github.com/august-alt/gpui.git synced 2025-03-12 04:58:37 +03:00
Code Issues Projects Releases Wiki Activity

fix: fix issue #47727

Browse Source
This commit is contained in:
august-alt 2024-03-25 00:32:16 +04:00
parent 7a667924d6
commit b0b170a9c4
9 changed files with 71 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/filedialogutils.cpp
View File

@ -26,7 +26,7 @@
namespace gpui
{
QString FileDialogUtils::getOpenFileName(QWidget *parent, const QString &filter)
bool FileDialogUtils::getOpenFileName(QString& fileName, QWidget *parent, const QString &filter)
{
std::unique_ptr<QFileDialog> fileDialog = std::make_unique<QFileDialog>(parent);
@ -45,15 +45,17 @@ QString FileDialogUtils::getOpenFileName(QWidget *parent, const QString &filter)
fileDialog->setWindowTitle(QObject::tr("Open File"));
if (fileDialog->exec() == QDialog::Accepted)
bool dialogState = fileDialog->exec() == QDialog::Accepted;
if (dialogState)
{
return fileDialog->selectedUrls()[0].toLocalFile();
fileName = fileDialog->selectedUrls()[0].toLocalFile();
}
return QString();
return dialogState;
}
QString FileDialogUtils::getOpenDirectoryName(QWidget *parent, const QString &filter)
bool FileDialogUtils::getOpenDirectoryName(QString& directoryName, QWidget *parent, const QString &filter)
{
std::unique_ptr<QFileDialog> fileDialog = std::make_unique<QFileDialog>(parent);
@ -73,12 +75,14 @@ QString FileDialogUtils::getOpenDirectoryName(QWidget *parent, const QString &fi
fileDialog->setWindowTitle(QObject::tr("Open Directory"));
if (fileDialog->exec() == QDialog::Accepted)
bool dialogState = fileDialog->exec() == QDialog::Accepted;
if (dialogState)
{
return fileDialog->selectedUrls()[0].toLocalFile();
directoryName = fileDialog->selectedUrls()[0].toLocalFile();
}
return QString();
return dialogState;
}
} // namespace gpui

4
src/gui/filedialogutils.h
View File

@ -30,9 +30,9 @@ namespace gpui
class GPUI_GUI_EXPORT FileDialogUtils
{
public:
static QString getOpenFileName(QWidget *parent = nullptr, const QString &filter = QString());
static bool getOpenFileName(QString &fileName, QWidget *parent = nullptr, const QString &filter = QString());
static QString getOpenDirectoryName(QWidget *parent = nullptr, const QString &filter = QString());
static bool getOpenDirectoryName(QString &directoryName, QWidget *parent = nullptr, const QString &filter = QString());
};
} // namespace gpui

6
src/plugins/preferences/drives/driveswidgetslots.cpp
View File

@ -75,7 +75,11 @@ void DrivesWidget::on_pathToolButton_clicked()
{
using namespace gpui;
ui->pathLineEdit->setText(FileDialogUtils::getOpenDirectoryName(this, QObject::tr("All files (*.*)")));
QString newText;
if (FileDialogUtils::getOpenDirectoryName(newText, this, QObject::tr("All files (*.*)")))
{
ui->pathLineEdit->setText(newText);
}
}
void DrivesWidget::setDriveRadioButtonText(DrivesWidgetMode mode)

18
src/plugins/preferences/files/fileswidgetslots.cpp
View File

@ -76,18 +76,30 @@ void FilesWidget::on_actionComboBox_currentIndexChanged(int index)
void FilesWidget::on_sourceToolButton_clicked()
{
ui->sourceLineEdit->setText(FileDialogUtils::getOpenFileName(this, QObject::tr("All files (*)")));
QString newText;
if (FileDialogUtils::getOpenFileName(newText, this, QObject::tr("All files (*)")))
{
ui->sourceLineEdit->setText(newText);
}
}
void FilesWidget::on_destinationToolButton_clicked()
{
if (fileMode)
{
ui->destinationLineEdit->setText(FileDialogUtils::getOpenFileName(this, QObject::tr("All files (*)")));
QString newText;
if (FileDialogUtils::getOpenFileName(newText, this, QObject::tr("All files (*)")))
{
ui->destinationLineEdit->setText(newText);
}
}
else
{
ui->destinationLineEdit->setText(FileDialogUtils::getOpenDirectoryName(this, QObject::tr("All files (*.*)")));
QString newText;
if (FileDialogUtils::getOpenDirectoryName(newText, this, QObject::tr("All files (*.*)")))
{
ui->destinationLineEdit->setText(newText);
}
}
}

6
src/plugins/preferences/folders/folderviewslots.cpp
View File

@ -56,7 +56,11 @@ void FolderWidget::on_pathToolButton_clicked()
{
using namespace gpui;
ui->pathLineEdit->setText(FileDialogUtils::getOpenDirectoryName(this, QObject::tr("All files (*.*)")));
QString newText;
if (FileDialogUtils::getOpenDirectoryName(newText, this, QObject::tr("All files (*.*)")))
{
ui->pathLineEdit->setText(newText);
}
}
} // namespace preferences

6
src/plugins/preferences/ini/iniwidgetslots.cpp
View File

@ -60,7 +60,11 @@ void IniWidget::on_pathToolButton_clicked()
{
using namespace gpui;
ui->pathLineEdit->setText(FileDialogUtils::getOpenFileName(this, QObject::tr("Ini files (*.ini)")));
QString newText;
if (FileDialogUtils::getOpenFileName(newText, this, QObject::tr("Ini files (*.ini)")))
{
ui->pathLineEdit->setText(newText);
}
}
void IniWidget::on_pathLineEdit_textChanged(const QString &text)

6
src/plugins/preferences/shares/shareswidgetslots.cpp
View File

@ -161,7 +161,11 @@ void SharesWidget::on_folderToolButton_clicked()
{
using namespace gpui;
ui->folderPathLineEdit->setText(FileDialogUtils::getOpenDirectoryName(this, QObject::tr("All files (*.*)")));
QString newText;
if (FileDialogUtils::getOpenDirectoryName(newText, this, QObject::tr("All files (*.*)")))
{
ui->folderPathLineEdit->setText(newText);
}
}
}

24
src/plugins/preferences/shortcuts/shortcutswidgetslots.cpp
View File

@ -56,22 +56,38 @@ void ShortcutsWidget::on_locationComboBox_currentIndexChanged(int index)
void ShortcutsWidget::on_nameToolButton_clicked()
{
ui->nameLineEdit->setText(openFileOrFolder(true));
QString newText = openFileOrFolder(true);
if (!newText.isEmpty())
{
ui->nameLineEdit->setText(newText);
}
}
void ShortcutsWidget::on_targetPathToolButton_clicked()
{
ui->targetPathLineEdit->setText(openFileOrFolder(true));
QString newText = openFileOrFolder(true);
if (!newText.isEmpty())
{
ui->targetPathLineEdit->setText(newText);
}
}
void ShortcutsWidget::on_iconFilePathToolButton_clicked()
{
ui->iconFilePathLineEdit->setText(openFileOrFolder(false));
QString newText = openFileOrFolder(false);
if (!newText.isEmpty())
{
ui->iconFilePathLineEdit->setText(newText);
}
}
void ShortcutsWidget::on_startInToolButton_clicked()
{
ui->startInLineEdit->setText(openFileOrFolder(true));
QString newText = openFileOrFolder(true);
if (!newText.isEmpty())
{
ui->startInLineEdit->setText(newText);
}
}
void ShortcutsWidget::on_targetTypeComboBox_currentIndexChanged(int index)

4
src/plugins/scripts/addscriptwidget.cpp
View File

@ -100,9 +100,9 @@ void AddScriptWidget::on_cancelPushButton_clicked()
void AddScriptWidget::on_browsePushButton_clicked()
{
auto dialog = std::make_unique<gpui::FileDialogUtils>();
QString file = dialog->getOpenFileName();
QString file;
if (!file.isEmpty())
if (dialog->getOpenFileName(file))
{
ui->nameLineEdit->setText(file);
}