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

TextEditor: Fix enabling of CodeStylePreferences for QmlJs

Browse Source 
Change-Id: I00aa297ab96b71ebd4e49096f60d2f0dee5af587
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Alessandro Portale
2022-09-02 12:18:32 +02:00
parent d72ecd0b18
commit 4198a54b1f
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmljstools/qmljscodestylepreferenceswidget.cpp
View File

@@ -19,7 +19,6 @@ QmlJSCodeStylePreferencesWidget::QmlJSCodeStylePreferencesWidget(QWidget *parent
auto layout = new QVBoxLayout(this); auto layout = new QVBoxLayout(this);
layout->addWidget(m_codeStyleSettingsWidget); layout->addWidget(m_codeStyleSettingsWidget);
layout->setContentsMargins(QMargins()); layout->setContentsMargins(QMargins());
m_codeStyleSettingsWidget->setEnabled(false);
} }
void QmlJSCodeStylePreferencesWidget::setPreferences(QmlJSCodeStylePreferences *preferences) void QmlJSCodeStylePreferencesWidget::setPreferences(QmlJSCodeStylePreferences *preferences)
@@ -27,6 +26,8 @@ void QmlJSCodeStylePreferencesWidget::setPreferences(QmlJSCodeStylePreferences *
if (m_preferences == preferences) if (m_preferences == preferences)
return; // nothing changes return; // nothing changes
slotCurrentPreferencesChanged(preferences);
// cleanup old // cleanup old
if (m_preferences) { if (m_preferences) {
disconnect(m_preferences, &QmlJSCodeStylePreferences::currentCodeStyleSettingsChanged, disconnect(m_preferences, &QmlJSCodeStylePreferences::currentCodeStyleSettingsChanged,
@@ -39,8 +40,6 @@ void QmlJSCodeStylePreferencesWidget::setPreferences(QmlJSCodeStylePreferences *
m_preferences = preferences; m_preferences = preferences;
// fillup new // fillup new
if (m_preferences) { if (m_preferences) {
slotCurrentPreferencesChanged(m_preferences->currentPreferences());
m_codeStyleSettingsWidget->setCodeStyleSettings(m_preferences->currentCodeStyleSettings()); m_codeStyleSettingsWidget->setCodeStyleSettings(m_preferences->currentCodeStyleSettings());
connect(m_preferences, &QmlJSCodeStylePreferences::currentCodeStyleSettingsChanged, connect(m_preferences, &QmlJSCodeStylePreferences::currentCodeStyleSettingsChanged,
@@ -50,12 +49,12 @@ void QmlJSCodeStylePreferencesWidget::setPreferences(QmlJSCodeStylePreferences *
connect(m_codeStyleSettingsWidget, &QmlJSCodeStyleSettingsWidget::settingsChanged, connect(m_codeStyleSettingsWidget, &QmlJSCodeStyleSettingsWidget::settingsChanged,
this, &QmlJSCodeStylePreferencesWidget::slotSettingsChanged); this, &QmlJSCodeStylePreferencesWidget::slotSettingsChanged);
} }
m_codeStyleSettingsWidget->setEnabled(m_preferences);
} }
void QmlJSCodeStylePreferencesWidget::slotCurrentPreferencesChanged(TextEditor::ICodeStylePreferences *preferences) void QmlJSCodeStylePreferencesWidget::slotCurrentPreferencesChanged(TextEditor::ICodeStylePreferences *preferences)
{ {
m_codeStyleSettingsWidget->setEnabled(!preferences->isReadOnly() && !m_preferences->currentDelegate()); m_codeStyleSettingsWidget->setEnabled(preferences && preferences->currentPreferences() &&
!preferences->currentPreferences()->isReadOnly());
} }
void QmlJSCodeStylePreferencesWidget::slotSettingsChanged(const QmlJSCodeStyleSettings &settings) void QmlJSCodeStylePreferencesWidget::slotSettingsChanged(const QmlJSCodeStyleSettings &settings)

8
src/plugins/texteditor/simplecodestylepreferenceswidget.cpp
View File

@@ -17,7 +17,6 @@ SimpleCodeStylePreferencesWidget::SimpleCodeStylePreferencesWidget(QWidget *pare
auto layout = new QVBoxLayout(this); auto layout = new QVBoxLayout(this);
layout->addWidget(m_tabSettingsWidget); layout->addWidget(m_tabSettingsWidget);
layout->setContentsMargins(QMargins()); layout->setContentsMargins(QMargins());
m_tabSettingsWidget->setEnabled(false);
} }
void SimpleCodeStylePreferencesWidget::setPreferences(ICodeStylePreferences *preferences) void SimpleCodeStylePreferencesWidget::setPreferences(ICodeStylePreferences *preferences)
@@ -25,6 +24,8 @@ void SimpleCodeStylePreferencesWidget::setPreferences(ICodeStylePreferences *pre
if (m_preferences == preferences) if (m_preferences == preferences)
return; // nothing changes return; // nothing changes
slotCurrentPreferencesChanged(preferences);
// cleanup old // cleanup old
if (m_preferences) { if (m_preferences) {
disconnect(m_preferences, &ICodeStylePreferences::currentTabSettingsChanged, disconnect(m_preferences, &ICodeStylePreferences::currentTabSettingsChanged,
@@ -37,7 +38,6 @@ void SimpleCodeStylePreferencesWidget::setPreferences(ICodeStylePreferences *pre
m_preferences = preferences; m_preferences = preferences;
// fillup new // fillup new
if (m_preferences) { if (m_preferences) {
slotCurrentPreferencesChanged(m_preferences->currentPreferences());
m_tabSettingsWidget->setTabSettings(m_preferences->currentTabSettings()); m_tabSettingsWidget->setTabSettings(m_preferences->currentTabSettings());
connect(m_preferences, &ICodeStylePreferences::currentTabSettingsChanged, connect(m_preferences, &ICodeStylePreferences::currentTabSettingsChanged,
@@ -47,12 +47,12 @@ void SimpleCodeStylePreferencesWidget::setPreferences(ICodeStylePreferences *pre
connect(m_tabSettingsWidget, &TabSettingsWidget::settingsChanged, connect(m_tabSettingsWidget, &TabSettingsWidget::settingsChanged,
this, &SimpleCodeStylePreferencesWidget::slotTabSettingsChanged); this, &SimpleCodeStylePreferencesWidget::slotTabSettingsChanged);
} }
m_tabSettingsWidget->setEnabled(m_preferences);
} }
void SimpleCodeStylePreferencesWidget::slotCurrentPreferencesChanged(TextEditor::ICodeStylePreferences *preferences) void SimpleCodeStylePreferencesWidget::slotCurrentPreferencesChanged(TextEditor::ICodeStylePreferences *preferences)
{ {
m_tabSettingsWidget->setEnabled(!preferences->isReadOnly() && !m_preferences->currentDelegate()); m_tabSettingsWidget->setEnabled(preferences && preferences->currentPreferences() &&
!preferences->currentPreferences()->isReadOnly());
} }
void SimpleCodeStylePreferencesWidget::slotTabSettingsChanged(const TextEditor::TabSettings &settings) void SimpleCodeStylePreferencesWidget::slotTabSettingsChanged(const TextEditor::TabSettings &settings)