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

noise--

Browse Source
This commit is contained in:
Sebastian Kügler 2014-01-31 03:39:10 +01:00
parent 0f3c51e859
commit 91a861e3ef
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,11 +117,9 @@ KConfigGroup &ThemePrivate::config()
#ifndef NDEBUG
// qDebug() << "using theme for app" << app;
#endif
qDebug() << "using theme for app" << app;
groupName.append("-").append(app);
}
}
qDebug() << "Opening " << themeRcFile << groupName;
cfg = KConfigGroup(KSharedConfig::openConfig(themeRcFile), groupName);
}
@ -476,11 +474,9 @@ void ThemePrivate::setThemeName(const QString &tempThemeName, bool writeSettings
{
QString theme = tempThemeName;
if (theme.isEmpty() || theme == themeName) {
//qDebug() << "eeuh";
// let's try and get the default theme at least
if (themeName.isEmpty()) {
theme = ThemePrivate::defaultTheme;
qDebug() << "eeuh" << theme;
} else {
return;
}
@ -570,7 +566,6 @@ void ThemePrivate::setThemeName(const QString &tempThemeName, bool writeSettings
const QString wallpaperPath = QLatin1Literal("desktoptheme/") % theme % QLatin1Literal("/wallpapers/");
hasWallpapers = !QStandardPaths::locate(QStandardPaths::GenericDataLocation, wallpaperPath, QStandardPaths::LocateDirectory).isEmpty();
qDebug() << "Writing Settings " << themeName << realTheme << isDefault << writeSettings;
if (realTheme && isDefault && writeSettings) {
// we're the default theme, let's save our state
KConfigGroup &cg = config();

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

@ -37,8 +37,6 @@
#include "libplasma-theme-global.h"
class KDirWatch;
namespace Plasma
{

3
src/plasma/theme.cpp
View File

@ -125,7 +125,6 @@ void Theme::setThemeName(const QString &themeName)
if (d->themeName == themeName) {
return;
}
qDebug() << "Set themeName: " << d->themeName << " to " << themeName;
if (d != ThemePrivate::globalTheme) {
disconnect(QCoreApplication::instance(), 0, d, 0);
@ -145,7 +144,7 @@ void Theme::setThemeName(const QString &themeName)
connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()),
d, SLOT(onAppExitCleanup()));
}
// connect(d, &ThemePrivate::themeChanged, this, &Theme::themeChanged);
connect(d, &ThemePrivate::themeChanged, this, &Theme::themeChanged);
}
d->setThemeName(themeName, true);