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

texteditor: use an enum instead of QString as color ids

Browse Source 
Change-Id: I658412c18d5ccfe978ec444451c6417ffb18d71c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
hjk
2012-04-26 14:17:42 +02:00
committed by hjk
parent a872c91c64
commit d006ca80a6
29 changed files with 381 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/texteditor/fontsettings.cpp
View File

@@ -32,6 +32,7 @@
#include "fontsettings.h"
#include "fontsettingspage.h"
#include "texteditorconstants.h"
#include <utils/qtcassert.h>
#include <coreplugin/icore.h>
@@ -136,8 +137,8 @@ bool FontSettings::fromSettings(const QString &category,
} else {
// Load color scheme from ini file
foreach (const FormatDescription &desc, descriptions) {
const QString id = desc.id();
const QString fmt = s->value(group + id, QString()).toString();
const TextStyle id = desc.id();
const QString fmt = s->value(group + Constants::nameForStyle(id), QString()).toString();
Format format;
if (fmt.isEmpty()) {
format.setForeground(desc.foreground());
@@ -169,14 +170,13 @@ bool FontSettings::equals(const FontSettings &f) const
/**
* Returns the QTextCharFormat of the given format category.
*/
QTextCharFormat FontSettings::toTextCharFormat(const QString &category) const
QTextCharFormat FontSettings::toTextCharFormat(TextStyle category) const
{
const Format &f = m_scheme.formatFor(category);
const QLatin1String textCategory("Text");
QTextCharFormat tf;
if (category == textCategory) {
if (category == C_TEXT) {
tf.setFontFamily(m_family);
tf.setFontPointSize(m_fontSize * m_fontZoom / 100.);
tf.setFontStyleStrategy(m_antialias ? QFont::PreferAntialias : QFont::NoAntialias);
@@ -184,7 +184,7 @@ QTextCharFormat FontSettings::toTextCharFormat(const QString &category) const
if (f.foreground().isValid())
tf.setForeground(f.foreground());
if (f.background().isValid() && (category == textCategory || f.background() != m_scheme.formatFor(textCategory).background()))
if (f.background().isValid() && (category == C_TEXT || f.background() != m_scheme.formatFor(C_TEXT).background()))
tf.setBackground(f.background());
tf.setFontWeight(f.bold() ? QFont::Bold : QFont::Normal);
tf.setFontItalic(f.italic());
@@ -195,7 +195,7 @@ QTextCharFormat FontSettings::toTextCharFormat(const QString &category) const
* Returns the list of QTextCharFormats that corresponds to the list of
* requested format categories.
*/
QVector<QTextCharFormat> FontSettings::toTextCharFormats(const QVector<QString> &categories) const
QVector<QTextCharFormat> FontSettings::toTextCharFormats(const QVector<TextStyle> &categories) const
{
QVector<QTextCharFormat> rc;
const int size = categories.size();
@@ -265,7 +265,7 @@ void FontSettings::setAntialias(bool antialias)
/**
* Returns the format for the given font category.
*/
Format &FontSettings::formatFor(const QString &category)
Format &FontSettings::formatFor(TextStyle category)
{
return m_scheme.formatFor(category);
}
@@ -301,7 +301,7 @@ bool FontSettings::loadColorScheme(const QString &fileName,
// Apply default formats to undefined categories
foreach (const FormatDescription &desc, descriptions) {
const QString id = desc.id();
const TextStyle id = desc.id();
if (!m_scheme.contains(id)) {
Format format;
format.setForeground(desc.foreground());