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

QmlDesigner: Fix typo in settings key

Browse Source 
ALWAYS_SAFE_IN_CRUMBLEBAR -> ALWAYS_SAVE_IN_CRUMBLEBAR
AlwaysSafeInCrumbleBar -> AlwaysSaveInCrumbleBar

Change-Id: I939c5631301ea8edcac6f07bbc08af2994907117
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Miikka Heikkinen
2020-09-07 13:35:55 +03:00
parent f1806621f8
commit b7e660471f
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/components/componentcore/crumblebar.cpp
View File

@@ -135,7 +135,7 @@ Utils::CrumblePath *CrumbleBar::crumblePath()
void CrumbleBar::showSaveDialog() void CrumbleBar::showSaveDialog()
{ {
if (DesignerSettings::getValue(DesignerSettingsKey::ALWAYS_SAFE_IN_CRUMBLEBAR).toBool()) { if (DesignerSettings::getValue(DesignerSettingsKey::ALWAYS_SAVE_IN_CRUMBLEBAR).toBool()) {
Core::DocumentManager::saveModifiedDocumentSilently(currentDesignDocument()->editor()->document()); Core::DocumentManager::saveModifiedDocumentSilently(currentDesignDocument()->editor()->document());
} else { } else {
bool alwaysSave; bool alwaysSave;
@@ -147,7 +147,7 @@ void CrumbleBar::showSaveDialog()
tr("Always save when leaving subcomponent"), tr("Always save when leaving subcomponent"),
&alwaysSave); &alwaysSave);
DesignerSettings::setValue(DesignerSettingsKey::ALWAYS_SAFE_IN_CRUMBLEBAR, alwaysSave); DesignerSettings::setValue(DesignerSettingsKey::ALWAYS_SAVE_IN_CRUMBLEBAR, alwaysSave);
} }
} }

2
src/plugins/qmldesigner/designersettings.cpp
View File

@@ -59,7 +59,7 @@ void DesignerSettings::fromSettings(QSettings *settings)
restoreValue(settings, DesignerSettingsKey::WARNING_FOR_DESIGNER_FEATURES_IN_EDITOR, false); restoreValue(settings, DesignerSettingsKey::WARNING_FOR_DESIGNER_FEATURES_IN_EDITOR, false);
restoreValue(settings, DesignerSettingsKey::SHOW_DEBUGVIEW, false); restoreValue(settings, DesignerSettingsKey::SHOW_DEBUGVIEW, false);
restoreValue(settings, DesignerSettingsKey::ENABLE_DEBUGVIEW, false); restoreValue(settings, DesignerSettingsKey::ENABLE_DEBUGVIEW, false);
restoreValue(settings, DesignerSettingsKey::ALWAYS_SAFE_IN_CRUMBLEBAR, false); restoreValue(settings, DesignerSettingsKey::ALWAYS_SAVE_IN_CRUMBLEBAR, false);
restoreValue(settings, DesignerSettingsKey::USE_DEFAULT_PUPPET, true); restoreValue(settings, DesignerSettingsKey::USE_DEFAULT_PUPPET, true);
restoreValue(settings, DesignerSettingsKey::TYPE_OF_QSTR_FUNCTION, 0); restoreValue(settings, DesignerSettingsKey::TYPE_OF_QSTR_FUNCTION, 0);
restoreValue(settings, DesignerSettingsKey::PUPPET_DEFAULT_DIRECTORY); restoreValue(settings, DesignerSettingsKey::PUPPET_DEFAULT_DIRECTORY);

2
src/plugins/qmldesigner/designersettings.h
View File

@@ -49,7 +49,7 @@ const char WARNING_FOR_QML_FILES_INSTEAD_OF_UIQML_FILES[] = "WarnAboutQmlFilesIn
const char WARNING_FOR_DESIGNER_FEATURES_IN_EDITOR[] = "WarnAboutQtQuickDesignerFeaturesInCodeEditor"; const char WARNING_FOR_DESIGNER_FEATURES_IN_EDITOR[] = "WarnAboutQtQuickDesignerFeaturesInCodeEditor";
const char SHOW_DEBUGVIEW[] = "ShowQtQuickDesignerDebugView"; const char SHOW_DEBUGVIEW[] = "ShowQtQuickDesignerDebugView";
const char ENABLE_DEBUGVIEW[] = "EnableQtQuickDesignerDebugView"; const char ENABLE_DEBUGVIEW[] = "EnableQtQuickDesignerDebugView";
const char ALWAYS_SAFE_IN_CRUMBLEBAR[] = "AlwaysSafeInCrumbleBar"; const char ALWAYS_SAVE_IN_CRUMBLEBAR[] = "AlwaysSaveInCrumbleBar";
const char USE_DEFAULT_PUPPET[] = "UseDefaultPuppet"; const char USE_DEFAULT_PUPPET[] = "UseDefaultPuppet";
const char PUPPET_TOPLEVEL_BUILD_DIRECTORY[] = "PuppetToplevelBuildDirectory"; const char PUPPET_TOPLEVEL_BUILD_DIRECTORY[] = "PuppetToplevelBuildDirectory";
const char PUPPET_DEFAULT_DIRECTORY[] = "PuppetDefaultDirectory"; const char PUPPET_DEFAULT_DIRECTORY[] = "PuppetDefaultDirectory";

4
src/plugins/qmldesigner/settingspage.cpp
View File

@@ -168,7 +168,7 @@ DesignerSettings SettingsPageWidget::settings() const
settings.insert(DesignerSettingsKey::PUPPET_TOPLEVEL_BUILD_DIRECTORY, settings.insert(DesignerSettingsKey::PUPPET_TOPLEVEL_BUILD_DIRECTORY,
m_ui.puppetBuildPathLineEdit->path()); m_ui.puppetBuildPathLineEdit->path());
} }
settings.insert(DesignerSettingsKey::ALWAYS_SAFE_IN_CRUMBLEBAR, settings.insert(DesignerSettingsKey::ALWAYS_SAVE_IN_CRUMBLEBAR,
m_ui.alwaysSaveSubcomponentsCheckBox->isChecked()); m_ui.alwaysSaveSubcomponentsCheckBox->isChecked());
settings.insert(DesignerSettingsKey::SHOW_PROPERTYEDITOR_WARNINGS, settings.insert(DesignerSettingsKey::SHOW_PROPERTYEDITOR_WARNINGS,
m_ui.showPropertyEditorWarningsCheckBox->isChecked()); m_ui.showPropertyEditorWarningsCheckBox->isChecked());
@@ -235,7 +235,7 @@ void SettingsPageWidget::setSettings(const DesignerSettings &settings)
DesignerSettingsKey::DEBUG_PUPPET).toString()); DesignerSettingsKey::DEBUG_PUPPET).toString());
m_ui.alwaysSaveSubcomponentsCheckBox->setChecked(settings.value( m_ui.alwaysSaveSubcomponentsCheckBox->setChecked(settings.value(
DesignerSettingsKey::ALWAYS_SAFE_IN_CRUMBLEBAR).toBool()); DesignerSettingsKey::ALWAYS_SAVE_IN_CRUMBLEBAR).toBool());
m_ui.showPropertyEditorWarningsCheckBox->setChecked(settings.value( m_ui.showPropertyEditorWarningsCheckBox->setChecked(settings.value(
DesignerSettingsKey::SHOW_PROPERTYEDITOR_WARNINGS).toBool()); DesignerSettingsKey::SHOW_PROPERTYEDITOR_WARNINGS).toBool());
m_ui.showWarnExceptionsCheckBox->setChecked(settings.value( m_ui.showWarnExceptionsCheckBox->setChecked(settings.value(