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

Removing the ThemeEditor

Browse Source 
The Theme editor is a feature which was present but disabled since the
introduction of Themes. It is still unfinished and unlikely to be
finished.

An alternative, cheaper approch could be installing a file watcher
on a theme file, and reloading it on any change. But for that we
would still need proper theme switching during runtime.

Change-Id: Ifd44e8c25c924a8f021618d20ce126648a3558a3
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
This commit is contained in:
Alessandro Portale
2016-01-11 17:53:18 +01:00
parent 4255493881
commit 9573ead443
26 changed files with 20 additions and 2087 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/coreplugin/themesettings.cpp
View File

@@ -45,10 +45,9 @@ static const char themeNameKey[] = "ThemeName";
namespace Core {
namespace Internal {
ThemeEntry::ThemeEntry(Id id, const QString &filePath, bool readOnly)
: m_id(id),
m_filePath(filePath),
m_readOnly(readOnly)
ThemeEntry::ThemeEntry(Id id, const QString &filePath)
: m_id(id)
, m_filePath(filePath)
{
}
@@ -63,8 +62,6 @@ QString ThemeEntry::displayName() const
QSettings settings(m_filePath, QSettings::IniFormat);
m_displayName = settings.value(QLatin1String(themeNameKey),
QCoreApplication::tr("unnamed")).toString();
if (false) // TODO: Revert to m_readOnly
m_displayName = QCoreApplication::tr("%1 (built-in)").arg(m_displayName);
}
return m_displayName;
}
@@ -74,11 +71,6 @@ QString ThemeEntry::filePath() const
return m_filePath;
}
bool ThemeEntry::readOnly() const
{
return m_readOnly;
}
ThemeSettings::ThemeSettings()
{
setId(Constants::SETTINGS_ID_INTERFACE);
@@ -112,16 +104,16 @@ void ThemeSettings::finish()
m_widget = 0;
}
static void addThemesFromPath(const QString &path, bool readOnly, QList<ThemeEntry> *themes)
static void addThemesFromPath(const QString &path, QList<ThemeEntry> *themes)
{
static const QLatin1String extension(".creatortheme");
static const QLatin1String extension("*.creatortheme");
QDir themeDir(path);
themeDir.setNameFilters(QStringList() << QLatin1String("*.creatortheme"));
themeDir.setNameFilters(QStringList() << extension);
themeDir.setFilter(QDir::Files);
const QStringList themeList = themeDir.entryList();
foreach (const QString &fileName, themeList) {
QString id = QFileInfo(fileName).completeBaseName();
themes->append(ThemeEntry(Id::fromString(id), themeDir.absoluteFilePath(fileName), readOnly));
themes->append(ThemeEntry(Id::fromString(id), themeDir.absoluteFilePath(fileName)));
}
}
@@ -131,7 +123,7 @@ QList<ThemeEntry> ThemeSettings::availableThemes()
static const QString installThemeDir = ICore::resourcePath() + QLatin1String("/themes");
static const QString userThemeDir = ICore::userResourcePath() + QLatin1String("/themes");
addThemesFromPath(installThemeDir, /*readOnly=*/true, &themes);
addThemesFromPath(installThemeDir, &themes);
if (themes.isEmpty())
qWarning() << "Warning: No themes found in installation: "
<< QDir::toNativeSeparators(installThemeDir);
@@ -141,7 +133,7 @@ QList<ThemeEntry> ThemeSettings::availableThemes()
ThemeEntry defaultEntry = themes.takeAt(defaultIndex);
themes.prepend(defaultEntry);
}
addThemesFromPath(userThemeDir, /*readOnly=*/false, &themes);
addThemesFromPath(userThemeDir, &themes);
return themes;
}