diff options
| author | Jarek Kobus <jkobus@trolltech.com> | 2011-06-08 10:45:26 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@nokia.com> | 2011-06-08 13:27:52 +0200 |
| commit | 2fad22c0306974ce1b4a21e9fbc3c5e8840aeff1 (patch) | |
| tree | c1f156df1a80547391659ea28e20a8ac3a1d6e52 /src/plugins/cpptools/cppcodestylesettingspage.cpp | |
| parent | e436768127798d456f8dee8aa4187d8c293e8b1a (diff) | |
| download | qt-creator-2fad22c0306974ce1b4a21e9fbc3c5e8840aeff1.tar.gz | |
Add restore fallback functionality, make better tr()
Task-number: QTCREATORBUG-5025
Change-Id: Ia3f6fa2380dd1a93f120873f584662a267ca4d50
Reviewed-on: http://codereview.qt.nokia.com/360
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Diffstat (limited to 'src/plugins/cpptools/cppcodestylesettingspage.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppcodestylesettingspage.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/plugins/cpptools/cppcodestylesettingspage.cpp b/src/plugins/cpptools/cppcodestylesettingspage.cpp index 09e365251e..80875451c9 100644 --- a/src/plugins/cpptools/cppcodestylesettingspage.cpp +++ b/src/plugins/cpptools/cppcodestylesettingspage.cpp @@ -234,6 +234,7 @@ CppCodeStylePreferencesWidget::CppCodeStylePreferencesWidget(QWidget *parent) m_ui->categoryTab->setCurrentIndex(0); m_ui->tabPreferencesWidget->setFlat(true); + m_ui->fallbackWidget->setLabelText(tr("Code style settings:")); } CppCodeStylePreferencesWidget::~CppCodeStylePreferencesWidget() @@ -321,15 +322,11 @@ void CppCodeStylePreferencesWidget::setCppCodeStyleSettings(const CppCodeStyleSe void CppCodeStylePreferencesWidget::slotCurrentFallbackChanged(TextEditor::IFallbackPreferences *fallback) { - m_ui->tabPreferencesWidget->setEnabled(!fallback); m_ui->contentGroupBox->setEnabled(!fallback); m_ui->bracesGroupBox->setEnabled(!fallback); m_ui->switchGroupBox->setEnabled(!fallback); m_ui->alignmentGroupBox->setEnabled(!fallback); - // if C++ global is used for style, use it for tab settings as well - if (fallback && m_tabPreferences && m_cppCodeStylePreferences->currentFallback()) - m_tabPreferences->setCurrentFallback(m_cppCodeStylePreferences->currentFallback()->id()); updatePreview(); } |