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

QmlDesigner: Simplify reading a setting

Browse Source 
Change-Id: I754b3ac1635699e5d9ceab376ae70752a966082f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2017-01-19 13:46:37 +01:00
parent 7eda9ecb56
commit f23c0db1a2
9 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,9 +137,7 @@ Utils::CrumblePath *CrumbleBar::crumblePath()
void CrumbleBar::showSaveDialog()
{
DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
if (settings.value(DesignerSettingsKey::ALWAYS_SAFE_IN_CRUMBLEBAR).toBool()) {
if (DesignerSettings::getValue(DesignerSettingsKey::ALWAYS_SAFE_IN_CRUMBLEBAR).toBool()) {
Core::DocumentManager::saveModifiedDocumentSilently(currentDesignDocument()->editor()->document());
} else {
bool alwaysSave;
@@ -151,6 +149,7 @@ void CrumbleBar::showSaveDialog()
tr("Always save when leaving subcomponent"),
&alwaysSave);
DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
settings.insert(DesignerSettingsKey::ALWAYS_SAFE_IN_CRUMBLEBAR, alwaysSave);
QmlDesignerPlugin::instance()->setSettings(settings);
}

4
src/plugins/qmldesigner/components/debugview/debugview.cpp
View File

@@ -40,13 +40,13 @@ const QString lineBreak = QStringLiteral("<br>");
bool isDebugViewEnabled()
{
return QmlDesigner::QmlDesignerPlugin::instance()->settings().value(
return QmlDesigner::DesignerSettings::getValue(
QmlDesigner::DesignerSettingsKey::ENABLE_DEBUGVIEW).toBool();
}
bool isDebugViewShown()
{
return QmlDesigner::QmlDesignerPlugin::instance()->settings().value(
return QmlDesigner::DesignerSettings::getValue(
QmlDesigner::DesignerSettingsKey::SHOW_DEBUGVIEW).toBool();
}

6
src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp
View File

@@ -91,14 +91,12 @@ FormEditorItem* FormEditorScene::itemForQmlItemNode(const QmlItemNode &qmlItemNo
double FormEditorScene::canvasWidth() const
{
DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
return settings.value(DesignerSettingsKey::CANVASWIDTH).toDouble();
return DesignerSettings::getValue(DesignerSettingsKey::CANVASWIDTH).toDouble();
}
double FormEditorScene::canvasHeight() const
{
DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
return settings.value(DesignerSettingsKey::CANVASHEIGHT).toDouble();
return DesignerSettings::getValue(DesignerSettingsKey::CANVASHEIGHT).toDouble();
}
QList<FormEditorItem*> FormEditorScene::itemsForQmlItemNodes(const QList<QmlItemNode> &nodeList) const

6
src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
View File

@@ -331,14 +331,12 @@ ToolBox *FormEditorWidget::toolBox() const
double FormEditorWidget::spacing() const
{
DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
return settings.value(DesignerSettingsKey::ITEMSPACING).toDouble();
return DesignerSettings::getValue(DesignerSettingsKey::ITEMSPACING).toDouble();
}
double FormEditorWidget::containerPadding() const
{
DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
return settings.value(DesignerSettingsKey::CONTAINERPADDING).toDouble();
return DesignerSettings::getValue(DesignerSettingsKey::CONTAINERPADDING).toDouble();
}

4
src/plugins/qmldesigner/components/texteditor/texteditorview.cpp
View File

@@ -210,15 +210,13 @@ void TextEditorView::reformatFile()
QByteArray editorState = m_widget->textEditor()->saveState();
DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
auto document =
qobject_cast<QmlJSEditor::QmlJSEditorDocument *>(Core::EditorManager::instance()->currentDocument());
/* Reformat document if we have a .ui.qml file */
if (document
&& document->filePath().toString().endsWith(".ui.qml")
&& settings.value(DesignerSettingsKey::REFORMAT_UI_QML_FILES).toBool()) {
&& DesignerSettings::getValue(DesignerSettingsKey::REFORMAT_UI_QML_FILES).toBool()) {
const QString &newText = QmlJS::reformat(document->semanticInfo().document);
QTextCursor tc(document->document());

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

@@ -25,6 +25,8 @@
#include "designersettings.h"
#include <qmldesignerplugin.h>
#include <QSettings>
namespace QmlDesigner {
@@ -96,4 +98,10 @@ void DesignerSettings::toSettings(QSettings *settings) const
settings->endGroup();
}
QVariant DesignerSettings::getValue(const QByteArray &key)
{
DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
return settings.value(key);
}
} // namespace QmlDesigner

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

@@ -70,6 +70,7 @@ public:
void fromSettings(QSettings *);
void toSettings(QSettings *) const;
static QVariant getValue(const QByteArray &key);
private:
void restoreValue(QSettings *settings, const QByteArray &key,
const QVariant &defaultValue = QVariant());

3
src/plugins/qmldesigner/documentwarningwidget.cpp
View File

@@ -198,8 +198,7 @@ void DocumentWarningWidget::emitGotoCodeClicked(const DocumentMessage &message)
bool DocumentWarningWidget::warningsEnabled() const
{
DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
return settings.value(DesignerSettingsKey::WARNING_FOR_FEATURES_IN_DESIGNER).toBool();
return DesignerSettings::getValue(DesignerSettingsKey::WARNING_FOR_FEATURES_IN_DESIGNER).toBool();
}
void DocumentWarningWidget::ignoreCheckBoxToggled(bool b)

6
src/plugins/qmldesigner/qmldesignerplugin.cpp
View File

@@ -138,14 +138,12 @@ static bool useTextEditInDesignMode()
static bool warningsForQmlFilesInsteadOfUiQmlEnabled()
{
DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
return settings.value(DesignerSettingsKey::WARNING_FOR_QML_FILES_INSTEAD_OF_UIQML_FILES).toBool();
return DesignerSettings::getValue(DesignerSettingsKey::WARNING_FOR_QML_FILES_INSTEAD_OF_UIQML_FILES).toBool();
}
static bool showWarningsForFeaturesInDesigner()
{
DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
return settings.value(DesignerSettingsKey::WARNING_FOR_FEATURES_IN_DESIGNER).toBool();
return DesignerSettings::getValue(DesignerSettingsKey::WARNING_FOR_FEATURES_IN_DESIGNER).toBool();
}
QmlDesignerPlugin::QmlDesignerPlugin()