diff options
| author | Jarek Kobus <jkobus@trolltech.com> | 2011-08-16 10:45:23 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@nokia.com> | 2011-09-23 10:23:15 +0200 |
| commit | 224491182666840def3a551a840c8fa840bfe5c2 (patch) | |
| tree | 0c75ae3cc76819f373c1642ffd598e57568dac54 /src/plugins/projectexplorer/editorsettingspropertiespage.cpp | |
| parent | 3955df7855c9d27d8d470f509578bd9004b72ea1 (diff) | |
| download | qt-creator-224491182666840def3a551a840c8fa840bfe5c2.tar.gz | |
Implement Code Style schemes
Task-number: QTCREATORBUG-5092
Change-Id: I218cef02f7c242e4dfae59b1b8021ea618e60d07
Reviewed-on: http://codereview.qt-project.org/5160
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Diffstat (limited to 'src/plugins/projectexplorer/editorsettingspropertiespage.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/editorsettingspropertiespage.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp index 5753ee1ac1..bb5449c65e 100644 --- a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp @@ -33,7 +33,6 @@ #include "editorsettingspropertiespage.h" #include "editorconfiguration.h" #include "project.h" -#include <texteditor/tabpreferences.h> #include <QtCore/QTextCodec> @@ -77,6 +76,8 @@ EditorSettingsWidget::EditorSettingsWidget(Project *project) : QWidget(), m_proj connect(m_ui.globalSelector, SIGNAL(activated(int)), this, SLOT(globalSettingsActivated(int))); connect(m_ui.restoreButton, SIGNAL(clicked()), this, SLOT(restoreDefaultValues())); + connect(m_ui.behaviorSettingsWidget, SIGNAL(typingSettingsChanged(TextEditor::TypingSettings)), + config, SLOT(setTypingSettings(TextEditor::TypingSettings))); connect(m_ui.behaviorSettingsWidget, SIGNAL(storageSettingsChanged(TextEditor::StorageSettings)), config, SLOT(setStorageSettings(TextEditor::StorageSettings))); connect(m_ui.behaviorSettingsWidget, SIGNAL(behaviorSettingsChanged(TextEditor::BehaviorSettings)), @@ -85,15 +86,14 @@ EditorSettingsWidget::EditorSettingsWidget(Project *project) : QWidget(), m_proj config, SLOT(setExtraEncodingSettings(TextEditor::ExtraEncodingSettings))); connect(m_ui.behaviorSettingsWidget, SIGNAL(textCodecChanged(QTextCodec*)), config, SLOT(setTextCodec(QTextCodec*))); - - m_ui.behaviorSettingsWidget->setFallbacksVisible(false); } void EditorSettingsWidget::settingsToUi(const EditorConfiguration *config) { - m_ui.behaviorSettingsWidget->setTabPreferences(config->tabPreferences()); + m_ui.behaviorSettingsWidget->setCodeStyle(config->codeStyle()); m_ui.globalSelector->setCurrentIndex(config->useGlobalSettings() ? 0 : 1); m_ui.behaviorSettingsWidget->setAssignedCodec(config->textCodec()); + m_ui.behaviorSettingsWidget->setAssignedTypingSettings(config->typingSettings()); m_ui.behaviorSettingsWidget->setAssignedStorageSettings(config->storageSettings()); m_ui.behaviorSettingsWidget->setAssignedBehaviorSettings(config->behaviorSettings()); m_ui.behaviorSettingsWidget->setAssignedExtraEncodingSettings(config->extraEncodingSettings()); |