feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core: Use IOptionPage convenience for SystemSettings page

Browse Source 
Change-Id: Iaaafa9ad9d6b6644baea70722c50d1e18a7c0984
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-01-08 19:06:42 +01:00
parent 5f719f8740
commit dae9cb13cf
2 changed files with 103 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

205
src/plugins/coreplugin/systemsettings.cpp
View File

@@ -50,86 +50,77 @@ using namespace Utils;
namespace Core { namespace Core {
namespace Internal { namespace Internal {
SystemSettings::SystemSettings() class SystemSettingsWidget : public IOptionsPageWidget
: m_page(nullptr), m_dialog(nullptr)
{ {
setId(Constants::SETTINGS_ID_SYSTEM); QT_DECLARE_DEPRECATED_TR_FUNCTIONS(Core::Internal::SystemSettingsWidget)
setDisplayName(tr("System"));
setCategory(Constants::SETTINGS_CATEGORY_CORE);
connect(VcsManager::instance(), &VcsManager::configurationChanged, public:
this, &SystemSettings::updatePath); SystemSettingsWidget()
} {
m_ui.setupUi(this);
QWidget *SystemSettings::widget() m_ui.terminalOpenArgs->setToolTip(
{
if (!m_widget) {
m_page = new Ui::SystemSettings();
m_widget = new QWidget;
m_page->setupUi(m_widget);
m_page->terminalOpenArgs->setToolTip(
tr("Command line arguments used for \"%1\".").arg(FileUtils::msgTerminalHereAction())); tr("Command line arguments used for \"%1\".").arg(FileUtils::msgTerminalHereAction()));
m_page->reloadBehavior->setCurrentIndex(EditorManager::reloadSetting()); m_ui.reloadBehavior->setCurrentIndex(EditorManager::reloadSetting());
if (HostOsInfo::isAnyUnixHost()) { if (HostOsInfo::isAnyUnixHost()) {
const QVector<TerminalCommand> availableTerminals = ConsoleProcess::availableTerminalEmulators(); const QVector<TerminalCommand> availableTerminals = ConsoleProcess::availableTerminalEmulators();
for (const TerminalCommand &term : availableTerminals) for (const TerminalCommand &term : availableTerminals)
m_page->terminalComboBox->addItem(term.command, QVariant::fromValue(term)); m_ui.terminalComboBox->addItem(term.command, QVariant::fromValue(term));
updateTerminalUi(ConsoleProcess::terminalEmulator(ICore::settings())); updateTerminalUi(ConsoleProcess::terminalEmulator(ICore::settings()));
connect(m_page->terminalComboBox, connect(m_ui.terminalComboBox,
QOverload<int>::of(&QComboBox::currentIndexChanged), QOverload<int>::of(&QComboBox::currentIndexChanged),
this, this,
[this](int index) { [this](int index) {
updateTerminalUi( updateTerminalUi(
m_page->terminalComboBox->itemData(index).value<TerminalCommand>()); m_ui.terminalComboBox->itemData(index).value<TerminalCommand>());
}); });
} else { } else {
m_page->terminalLabel->hide(); m_ui.terminalLabel->hide();
m_page->terminalComboBox->hide(); m_ui.terminalComboBox->hide();
m_page->terminalOpenArgs->hide(); m_ui.terminalOpenArgs->hide();
m_page->terminalExecuteArgs->hide(); m_ui.terminalExecuteArgs->hide();
m_page->resetTerminalButton->hide(); m_ui.resetTerminalButton->hide();
} }
if (HostOsInfo::isAnyUnixHost() && !HostOsInfo::isMacHost()) { if (HostOsInfo::isAnyUnixHost() && !HostOsInfo::isMacHost()) {
m_page->externalFileBrowserEdit->setText(UnixUtils::fileBrowser(ICore::settings())); m_ui.externalFileBrowserEdit->setText(UnixUtils::fileBrowser(ICore::settings()));
} else { } else {
m_page->externalFileBrowserLabel->hide(); m_ui.externalFileBrowserLabel->hide();
m_page->externalFileBrowserEdit->hide(); m_ui.externalFileBrowserEdit->hide();
m_page->resetFileBrowserButton->hide(); m_ui.resetFileBrowserButton->hide();
m_page->helpExternalFileBrowserButton->hide(); m_ui.helpExternalFileBrowserButton->hide();
} }
const QString patchToolTip = tr("Command used for reverting diff chunks."); const QString patchToolTip = tr("Command used for reverting diff chunks.");
m_page->patchCommandLabel->setToolTip(patchToolTip); m_ui.patchCommandLabel->setToolTip(patchToolTip);
m_page->patchChooser->setToolTip(patchToolTip); m_ui.patchChooser->setToolTip(patchToolTip);
m_page->patchChooser->setExpectedKind(PathChooser::ExistingCommand); m_ui.patchChooser->setExpectedKind(PathChooser::ExistingCommand);
m_page->patchChooser->setHistoryCompleter(QLatin1String("General.PatchCommand.History")); m_ui.patchChooser->setHistoryCompleter(QLatin1String("General.PatchCommand.History"));
m_page->patchChooser->setPath(PatchTool::patchCommand()); m_ui.patchChooser->setPath(PatchTool::patchCommand());
m_page->autoSaveCheckBox->setChecked(EditorManagerPrivate::autoSaveEnabled()); m_ui.autoSaveCheckBox->setChecked(EditorManagerPrivate::autoSaveEnabled());
m_page->autoSaveCheckBox->setToolTip(tr("Automatically creates temporary copies of " m_ui.autoSaveCheckBox->setToolTip(tr("Automatically creates temporary copies of "
"modified files. If %1 is restarted after " "modified files. If %1 is restarted after "
"a crash or power failure, it asks whether to " "a crash or power failure, it asks whether to "
"recover the auto-saved content.") "recover the auto-saved content.")
.arg(Constants::IDE_DISPLAY_NAME)); .arg(Constants::IDE_DISPLAY_NAME));
m_page->autoSaveInterval->setValue(EditorManagerPrivate::autoSaveInterval()); m_ui.autoSaveInterval->setValue(EditorManagerPrivate::autoSaveInterval());
m_page->autoSuspendCheckBox->setChecked(EditorManagerPrivate::autoSuspendEnabled()); m_ui.autoSuspendCheckBox->setChecked(EditorManagerPrivate::autoSuspendEnabled());
m_page->autoSuspendMinDocumentCount->setValue(EditorManagerPrivate::autoSuspendMinDocumentCount()); m_ui.autoSuspendMinDocumentCount->setValue(EditorManagerPrivate::autoSuspendMinDocumentCount());
m_page->warnBeforeOpeningBigFiles->setChecked( m_ui.warnBeforeOpeningBigFiles->setChecked(
EditorManagerPrivate::warnBeforeOpeningBigFilesEnabled()); EditorManagerPrivate::warnBeforeOpeningBigFilesEnabled());
m_page->bigFilesLimitSpinBox->setValue(EditorManagerPrivate::bigFileSizeLimit()); m_ui.bigFilesLimitSpinBox->setValue(EditorManagerPrivate::bigFileSizeLimit());
m_page->maxRecentFilesSpinBox->setMinimum(1); m_ui.maxRecentFilesSpinBox->setMinimum(1);
m_page->maxRecentFilesSpinBox->setMaximum(99); m_ui.maxRecentFilesSpinBox->setMaximum(99);
m_page->maxRecentFilesSpinBox->setValue(EditorManagerPrivate::maxRecentFiles()); m_ui.maxRecentFilesSpinBox->setValue(EditorManagerPrivate::maxRecentFiles());
if (HostOsInfo::isAnyUnixHost()) { if (HostOsInfo::isAnyUnixHost()) {
connect(m_page->resetTerminalButton, &QAbstractButton::clicked, connect(m_ui.resetTerminalButton, &QAbstractButton::clicked,
this, &SystemSettings::resetTerminal); this, &SystemSettingsWidget::resetTerminal);
if (!HostOsInfo::isMacHost()) { if (!HostOsInfo::isMacHost()) {
connect(m_page->resetFileBrowserButton, &QAbstractButton::clicked, connect(m_ui.resetFileBrowserButton, &QAbstractButton::clicked,
this, &SystemSettings::resetFileBrowser); this, &SystemSettingsWidget::resetFileBrowser);
connect(m_page->helpExternalFileBrowserButton, &QAbstractButton::clicked, connect(m_ui.helpExternalFileBrowserButton, &QAbstractButton::clicked,
this, &SystemSettings::showHelpForFileBrowser); this, &SystemSettingsWidget::showHelpForFileBrowser);
} }
} }
@@ -137,62 +128,76 @@ QWidget *SystemSettings::widget()
Qt::CaseSensitivity defaultSensitivity Qt::CaseSensitivity defaultSensitivity
= OsSpecificAspects::fileNameCaseSensitivity(HostOsInfo::hostOs()); = OsSpecificAspects::fileNameCaseSensitivity(HostOsInfo::hostOs());
if (defaultSensitivity == Qt::CaseSensitive) { if (defaultSensitivity == Qt::CaseSensitive) {
m_page->fileSystemCaseSensitivityChooser->addItem(tr("Case Sensitive (Default)"), m_ui.fileSystemCaseSensitivityChooser->addItem(tr("Case Sensitive (Default)"),
Qt::CaseSensitive); Qt::CaseSensitive);
} else { } else {
m_page->fileSystemCaseSensitivityChooser->addItem(tr("Case Sensitive"), m_ui.fileSystemCaseSensitivityChooser->addItem(tr("Case Sensitive"),
Qt::CaseSensitive); Qt::CaseSensitive);
} }
if (defaultSensitivity == Qt::CaseInsensitive) { if (defaultSensitivity == Qt::CaseInsensitive) {
m_page->fileSystemCaseSensitivityChooser->addItem(tr("Case Insensitive (Default)"), m_ui.fileSystemCaseSensitivityChooser->addItem(tr("Case Insensitive (Default)"),
Qt::CaseInsensitive); Qt::CaseInsensitive);
} else { } else {
m_page->fileSystemCaseSensitivityChooser->addItem(tr("Case Insensitive"), m_ui.fileSystemCaseSensitivityChooser->addItem(tr("Case Insensitive"),
Qt::CaseInsensitive); Qt::CaseInsensitive);
} }
if (HostOsInfo::fileNameCaseSensitivity() == Qt::CaseSensitive) if (HostOsInfo::fileNameCaseSensitivity() == Qt::CaseSensitive)
m_page->fileSystemCaseSensitivityChooser->setCurrentIndex(0); m_ui.fileSystemCaseSensitivityChooser->setCurrentIndex(0);
else else
m_page->fileSystemCaseSensitivityChooser->setCurrentIndex(1); m_ui.fileSystemCaseSensitivityChooser->setCurrentIndex(1);
} else { } else {
m_page->fileSystemCaseSensitivityWidget->hide(); m_ui.fileSystemCaseSensitivityWidget->hide();
} }
updatePath(); updatePath();
}
return m_widget;
}
void SystemSettings::apply() connect(VcsManager::instance(), &VcsManager::configurationChanged,
this, &SystemSettingsWidget::updatePath);
}
private:
void apply() final;
void finish() final {}
void showHelpForFileBrowser();
void resetFileBrowser();
void resetTerminal();
void updateTerminalUi(const Utils::TerminalCommand &term);
void updatePath();
void variableHelpDialogCreator(const QString &helpText);
Ui::SystemSettings m_ui;
QPointer<QMessageBox> m_dialog;
};
void SystemSettingsWidget::apply()
{ {
if (!m_page) // wasn't shown, can't be changed EditorManager::setReloadSetting(IDocument::ReloadSetting(m_ui.reloadBehavior->currentIndex()));
return;
EditorManager::setReloadSetting(IDocument::ReloadSetting(m_page->reloadBehavior->currentIndex()));
if (HostOsInfo::isAnyUnixHost()) { if (HostOsInfo::isAnyUnixHost()) {
ConsoleProcess::setTerminalEmulator(ICore::settings(), ConsoleProcess::setTerminalEmulator(ICore::settings(),
{m_page->terminalComboBox->lineEdit()->text(), {m_ui.terminalComboBox->lineEdit()->text(),
m_page->terminalOpenArgs->text(), m_ui.terminalOpenArgs->text(),
m_page->terminalExecuteArgs->text()}); m_ui.terminalExecuteArgs->text()});
if (!HostOsInfo::isMacHost()) { if (!HostOsInfo::isMacHost()) {
UnixUtils::setFileBrowser(ICore::settings(), UnixUtils::setFileBrowser(ICore::settings(),
m_page->externalFileBrowserEdit->text()); m_ui.externalFileBrowserEdit->text());
} }
} }
PatchTool::setPatchCommand(m_page->patchChooser->path()); PatchTool::setPatchCommand(m_ui.patchChooser->path());
EditorManagerPrivate::setAutoSaveEnabled(m_page->autoSaveCheckBox->isChecked()); EditorManagerPrivate::setAutoSaveEnabled(m_ui.autoSaveCheckBox->isChecked());
EditorManagerPrivate::setAutoSaveInterval(m_page->autoSaveInterval->value()); EditorManagerPrivate::setAutoSaveInterval(m_ui.autoSaveInterval->value());
EditorManagerPrivate::setAutoSuspendEnabled(m_page->autoSuspendCheckBox->isChecked()); EditorManagerPrivate::setAutoSuspendEnabled(m_ui.autoSuspendCheckBox->isChecked());
EditorManagerPrivate::setAutoSuspendMinDocumentCount(m_page->autoSuspendMinDocumentCount->value()); EditorManagerPrivate::setAutoSuspendMinDocumentCount(m_ui.autoSuspendMinDocumentCount->value());
EditorManagerPrivate::setWarnBeforeOpeningBigFilesEnabled( EditorManagerPrivate::setWarnBeforeOpeningBigFilesEnabled(
m_page->warnBeforeOpeningBigFiles->isChecked()); m_ui.warnBeforeOpeningBigFiles->isChecked());
EditorManagerPrivate::setBigFileSizeLimit(m_page->bigFilesLimitSpinBox->value()); EditorManagerPrivate::setBigFileSizeLimit(m_ui.bigFilesLimitSpinBox->value());
EditorManagerPrivate::setMaxRecentFiles(m_page->maxRecentFilesSpinBox->value()); EditorManagerPrivate::setMaxRecentFiles(m_ui.maxRecentFilesSpinBox->value());
if (HostOsInfo::isMacHost()) { if (HostOsInfo::isMacHost()) {
Qt::CaseSensitivity defaultSensitivity Qt::CaseSensitivity defaultSensitivity
= OsSpecificAspects::fileNameCaseSensitivity(HostOsInfo::hostOs()); = OsSpecificAspects::fileNameCaseSensitivity(HostOsInfo::hostOs());
Qt::CaseSensitivity selectedSensitivity = Qt::CaseSensitivity( Qt::CaseSensitivity selectedSensitivity = Qt::CaseSensitivity(
m_page->fileSystemCaseSensitivityChooser->currentData().toInt()); m_ui.fileSystemCaseSensitivityChooser->currentData().toInt());
if (defaultSensitivity == selectedSensitivity) if (defaultSensitivity == selectedSensitivity)
HostOsInfo::unsetOverrideFileNameCaseSensitivity(); HostOsInfo::unsetOverrideFileNameCaseSensitivity();
else else
@@ -200,44 +205,34 @@ void SystemSettings::apply()
} }
} }
void SystemSettings::finish() void SystemSettingsWidget::resetTerminal()
{
delete m_widget;
delete m_page;
m_page = nullptr;
}
void SystemSettings::resetTerminal()
{ {
if (HostOsInfo::isAnyUnixHost()) if (HostOsInfo::isAnyUnixHost())
m_page->terminalComboBox->setCurrentIndex(0); m_ui.terminalComboBox->setCurrentIndex(0);
} }
void SystemSettings::updateTerminalUi(const TerminalCommand &term) void SystemSettingsWidget::updateTerminalUi(const TerminalCommand &term)
{ {
m_page->terminalComboBox->lineEdit()->setText(term.command); m_ui.terminalComboBox->lineEdit()->setText(term.command);
m_page->terminalOpenArgs->setText(term.openArgs); m_ui.terminalOpenArgs->setText(term.openArgs);
m_page->terminalExecuteArgs->setText(term.executeArgs); m_ui.terminalExecuteArgs->setText(term.executeArgs);
} }
void SystemSettings::resetFileBrowser() void SystemSettingsWidget::resetFileBrowser()
{ {
if (HostOsInfo::isAnyUnixHost() && !HostOsInfo::isMacHost()) if (HostOsInfo::isAnyUnixHost() && !HostOsInfo::isMacHost())
m_page->externalFileBrowserEdit->setText(UnixUtils::defaultFileBrowser()); m_ui.externalFileBrowserEdit->setText(UnixUtils::defaultFileBrowser());
} }
void SystemSettings::updatePath() void SystemSettingsWidget::updatePath()
{ {
if (!m_page)
return;
Environment env = Environment::systemEnvironment(); Environment env = Environment::systemEnvironment();
QStringList toAdd = VcsManager::additionalToolsPath(); QStringList toAdd = VcsManager::additionalToolsPath();
env.appendOrSetPath(toAdd.join(HostOsInfo::pathListSeparator())); env.appendOrSetPath(toAdd.join(HostOsInfo::pathListSeparator()));
m_page->patchChooser->setEnvironment(env); m_ui.patchChooser->setEnvironment(env);
} }
void SystemSettings::variableHelpDialogCreator(const QString &helpText) void SystemSettingsWidget::variableHelpDialogCreator(const QString &helpText)
{ {
if (m_dialog) { if (m_dialog) {
if (m_dialog->text() != helpText) if (m_dialog->text() != helpText)
@@ -251,18 +246,24 @@ void SystemSettings::variableHelpDialogCreator(const QString &helpText)
tr("Variables"), tr("Variables"),
helpText, helpText,
QMessageBox::Close, QMessageBox::Close,
m_widget); this);
mb->setWindowModality(Qt::NonModal); mb->setWindowModality(Qt::NonModal);
m_dialog = mb; m_dialog = mb;
mb->show(); mb->show();
} }
void SystemSettingsWidget::showHelpForFileBrowser()
void SystemSettings::showHelpForFileBrowser()
{ {
if (HostOsInfo::isAnyUnixHost() && !HostOsInfo::isMacHost()) if (HostOsInfo::isAnyUnixHost() && !HostOsInfo::isMacHost())
variableHelpDialogCreator(UnixUtils::fileBrowserHelpText()); variableHelpDialogCreator(UnixUtils::fileBrowserHelpText());
} }
SystemSettings::SystemSettings()
{
setId(Constants::SETTINGS_ID_SYSTEM);
setDisplayName(tr("System"));
setCategory(Constants::SETTINGS_CATEGORY_CORE);
}
} // namespace Internal } // namespace Internal
} // namespace Core } // namespace Core

25
src/plugins/coreplugin/systemsettings.h
View File

@@ -26,41 +26,16 @@
#pragma once #pragma once
#include <coreplugin/dialogs/ioptionspage.h> #include <coreplugin/dialogs/ioptionspage.h>
#include <QPointer>
QT_BEGIN_NAMESPACE
class QMessageBox;
QT_END_NAMESPACE
namespace Utils { class TerminalCommand; }
namespace Core { namespace Core {
namespace Internal { namespace Internal {
namespace Ui { class SystemSettings; }
class SystemSettings : public IOptionsPage class SystemSettings : public IOptionsPage
{ {
Q_OBJECT Q_OBJECT
public: public:
SystemSettings(); SystemSettings();
QWidget *widget() override;
void apply() override;
void finish() override;
private:
void showHelpForFileBrowser();
void resetFileBrowser();
void resetTerminal();
void updateTerminalUi(const Utils::TerminalCommand &term);
void updatePath();
void variableHelpDialogCreator(const QString &helpText);
Ui::SystemSettings *m_page;
QPointer<QMessageBox> m_dialog;
QPointer<QWidget> m_widget;
}; };
} // namespace Internal } // namespace Internal