From 2fad22c0306974ce1b4a21e9fbc3c5e8840aeff1 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 8 Jun 2011 10:45:26 +0200 Subject: 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 Reviewed-by: Christian Kamm --- src/plugins/cpptools/cppcodestylesettingspage.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/plugins/cpptools/cppcodestylesettingspage.cpp') 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(); } -- cgit v1.2.1