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

TextEditor: Remove obsolete "customized.xml" feature

Browse Source 
In case the qtcreator.ini has a TextEditor section without a defined
ColorScheme value, Qt Creator decides to create a new "styles/customized
%i.xml" and select that as scheme.
I assume that this was implemented way back then, as migration code when
selectable Color Schemes were introduced. These days, it makes
maintenance (and implementation of QTCREATORBUG-15229) more difficult.
Let's remove it.

Task-number: QTCREATORBUG-15649
Change-Id: I49102d02fa8e582a92f6e39faa8c7d3b58f531b3
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Alessandro Portale
2016-01-21 17:44:09 +01:00
parent 6ddd0e579f
commit 126d1b0811
2 changed files with 3 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,26 +114,6 @@ bool FontSettings::fromSettings(const QString &category,
if (scheme.isEmpty() || !QFile::exists(scheme))
scheme = defaultSchemeFileName(Utils::FileName::fromString(scheme).fileName());
loadColorScheme(scheme, descriptions);
} else {
// Load color scheme from ini file
foreach (const FormatDescription &desc, descriptions) {
const TextStyle id = desc.id();
const QString fmt = s->value(group + QLatin1String(Constants::nameForStyle(id)), 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());
format.setUnderlineColor(desc.format().underlineColor());
format.setUnderlineStyle(desc.format().underlineStyle());
} else {
format.fromString(fmt);
}
m_scheme.setFormatFor(id, format);
}
m_scheme.setDisplayName(QCoreApplication::translate("TextEditor::Internal::FontSettings", "Customized"));
}
return true;