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

Made selecting the color scheme functional

Browse Source 
Also, defaults formats are now applied to any format that hasn't been
defined in the color scheme file. This allows a color scheme to fall
back on the default selection color, for example.
This commit is contained in:
Thorbjørn Lindeijer
2009-07-07 18:35:42 +02:00
parent 065689478c
commit 947b719e69
6 changed files with 80 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,18 +92,7 @@ void FontSettings::toSettings(const QString &category,
if (m_schemeFileName != defaultSchemeFileName() || s->contains(QLatin1String(schemeFileNameKey)))
s->setValue(QLatin1String(schemeFileNameKey), m_schemeFileName);
#if 0
const Format defaultFormat;
foreach (const FormatDescription &desc, descriptions) {
const QString name = desc.name();
if (m_scheme.contains(name)) {
const Format &f = m_scheme.formatFor(name);
if (f != defaultFormat || s->contains(name))
s->setValue(name, f.toString());
}
}
#endif
s->endGroup();
}
@@ -122,25 +111,9 @@ bool FontSettings::fromSettings(const QString &category,
m_family = s->value(group + QLatin1String(fontFamilyKey), defaultFixedFontFamily()).toString();
m_fontSize = s->value(group + QLatin1String(fontSizeKey), m_fontSize).toInt();
m_antialias = s->value(group + QLatin1String(antialiasKey), DEFAULT_ANTIALIAS).toBool();
m_schemeFileName = s->value(group + QLatin1String(schemeFileNameKey), defaultSchemeFileName()).toString();
loadColorScheme(s->value(group + QLatin1String(schemeFileNameKey), defaultSchemeFileName()).toString(),
descriptions);
m_scheme.load(m_schemeFileName);
#if 0
foreach (const FormatDescription &desc, descriptions) {
const QString name = desc.name();
const QString fmt = s->value(group + name, QString()).toString();
Format format;
if (fmt.isEmpty()) {
format.setForeground(desc.foreground());
format.setBackground(desc.background());
format.setBold(desc.format().bold());
format.setItalic(desc.format().italic());
} else {
format.fromString(fmt);
}
m_scheme.setFormatFor(name, format);
}
#endif
return true;
}
@@ -247,9 +220,24 @@ QString FontSettings::colorSchemeFileName() const
return m_schemeFileName;
}
void FontSettings::setColorSchemeFileName(const QString &fileName)
void FontSettings::loadColorScheme(const QString &fileName,
const FormatDescriptions &descriptions)
{
m_schemeFileName = fileName;
m_scheme.load(m_schemeFileName);
// Apply default formats to undefined categories
foreach (const FormatDescription &desc, descriptions) {
const QString name = desc.name();
if (!m_scheme.contains(name)) {
Format format;
format.setForeground(desc.foreground());
format.setBackground(desc.background());
format.setBold(desc.format().bold());
format.setItalic(desc.format().italic());
m_scheme.setFormatFor(name, format);
}
}
}
/**