alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

if a name is passed in the ctor, never change

Browse Source 
BUG:335005
This commit is contained in:
Marco Martin 2014-05-20 18:24:26 +02:00
parent db8da9ff8d
commit 409d340fba
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plasma/private/theme_p.cpp
View File

@ -63,6 +63,7 @@ ThemePrivate::ThemePrivate(QObject *parent)
isDefault(true), isDefault(true),
useGlobal(true), useGlobal(true),
hasWallpapers(false), hasWallpapers(false),
fixedName(false),
backgroundContrastEnabled(true) backgroundContrastEnabled(true)
{ {
ThemeConfig config; ThemeConfig config;
@ -456,6 +457,9 @@ void ThemePrivate::settingsFileChanged(const QString &file)
void ThemePrivate::settingsChanged() void ThemePrivate::settingsChanged()
{ {
if (fixedName) {
return;
}
//qDebug() << "Settings Changed!"; //qDebug() << "Settings Changed!";
KConfigGroup cg = config(); KConfigGroup cg = config();
setThemeName(cg.readEntry("name", ThemePrivate::defaultTheme), false); setThemeName(cg.readEntry("name", ThemePrivate::defaultTheme), false);
@ -575,7 +579,8 @@ void ThemePrivate::setThemeName(const QString &tempThemeName, bool writeSettings
// the system colors. // the system colors.
bool realTheme = theme != systemColorsTheme; bool realTheme = theme != systemColorsTheme;
if (realTheme) { if (realTheme) {
QString themePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1Literal(PLASMA_RELATIVE_DATA_INSTALL_DIR "/desktoptheme/") % theme % QLatin1Char('/')); QString themePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1Literal(PLASMA_RELATIVE_DATA_INSTALL_DIR "/desktoptheme/") % theme % "/metadata.desktop");
if (themePath.isEmpty() && themeName.isEmpty()) { if (themePath.isEmpty() && themeName.isEmpty()) {
themePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral(PLASMA_RELATIVE_DATA_INSTALL_DIR "/desktoptheme/default"), QStandardPaths::LocateDirectory); themePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral(PLASMA_RELATIVE_DATA_INSTALL_DIR "/desktoptheme/default"), QStandardPaths::LocateDirectory);

1
src/plasma/private/theme_p.h
View File

@ -148,6 +148,7 @@ public:
bool useGlobal : 1; bool useGlobal : 1;
bool hasWallpapers : 1; bool hasWallpapers : 1;
bool cacheTheme : 1; bool cacheTheme : 1;
bool fixedName : 1;
qreal backgroundContrast; qreal backgroundContrast;
qreal backgroundIntensity; qreal backgroundIntensity;

1
src/plasma/theme.cpp
View File

@ -81,6 +81,7 @@ Theme::Theme(const QString &themeName, QObject *parent)
d->cacheTheme = false; d->cacheTheme = false;
d->setThemeName(themeName, false); d->setThemeName(themeName, false);
d->cacheTheme = useCache; d->cacheTheme = useCache;
d->fixedName = true;
if (QCoreApplication::instance()) { if (QCoreApplication::instance()) {
connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()),
d, SLOT(onAppExitCleanup())); d, SLOT(onAppExitCleanup()));