TextEditor: Define Color Scheme entry per Theme

The TextEditor settings do not remember a global Color Scheme setting,
anymore, but rather a Color Scheme ber Theme. A .creatortheme can define
a default TextEditor Color Scheme (overridable in the settings). This
makes switching of schemes more pleasant.

Taks-number: QTCREATORBUG-15229
Change-Id: I3bd36a4dfa23feea2254be2df50fce064e8fe2af
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Alessandro Portale
2015-12-09 18:16:37 +01:00
parent ff7b8ffcbb
commit 2ff75813b2
6 changed files with 36 additions and 12 deletions

View File

@@ -32,6 +32,7 @@
#include <utils/fileutils.h>
#include <utils/stringutils.h>
#include <utils/qtcassert.h>
#include <utils/theme/theme.h>
#include <QFileDialog>
#include <QFontDatabase>
@@ -346,6 +347,9 @@ QWidget *FontSettingsPage::widget()
d_ptr->m_widget = new QWidget;
d_ptr->m_ui = new Ui::FontSettingsPage;
d_ptr->m_ui->setupUi(d_ptr->m_widget);
d_ptr->m_ui->colorSchemeGroupBox->setTitle(
tr("Color Scheme for Qt Creator Theme \"%1\"")
.arg(Utils::creatorTheme()->displayName()));
d_ptr->m_ui->schemeComboBox->setModel(d_ptr->m_schemeListModel);
d_ptr->m_ui->fontComboBox->setCurrentFont(d_ptr->m_value.family());