diff --git a/cmake/modules/KDE4Macros.cmake b/cmake/modules/KDE4Macros.cmake index 092a457e..2b239172 100644 --- a/cmake/modules/KDE4Macros.cmake +++ b/cmake/modules/KDE4Macros.cmake @@ -35,7 +35,6 @@ set(_KDE4_ICON_GROUP_intl "intl") # a "map" of short theme names to the theme directory set(_KDE4_ICON_THEME_ox "ariya") -set(_KDE4_ICON_THEME_lo "locolor") set(_KDE4_ICON_THEME_hi "hicolor") # only used internally by KDE4_INSTALL_ICONS diff --git a/kdeui/icons/kicontheme.cpp b/kdeui/icons/kicontheme.cpp index 70d6ac9a..60029a7c 100644 --- a/kdeui/icons/kicontheme.cpp +++ b/kdeui/icons/kicontheme.cpp @@ -134,12 +134,11 @@ KIconTheme::KIconTheme(const QString& name, const QString& appName) QStringList themeDirs; QSet addedDirs; // Used for avoiding duplicates. - // Applications can have local additions to the global "locolor" and - // "hicolor" icon themes. For these, the _global_ theme description - // files are used.. + // Applications can have local additions to the global "hicolor" icon + // themes. For these, the _global_ theme description files are used.. if (!appName.isEmpty() && - ( name == defaultThemeName() || name== "hicolor" || name == "locolor" ) ) { + ( name == defaultThemeName() || name== "hicolor" ) ) { icnlibs = KGlobal::dirs()->resourceDirs("data"); for (it=icnlibs.constBegin(); it!=icnlibs.constEnd(); ++it) { const QString cDir = *it + appName + "/icons/" + name; @@ -521,13 +520,12 @@ QString KIconTheme::current() if ( *_theme == QLatin1String("hicolor") ) { *_theme = defaultThemeName(); } -/* if (_theme->isEmpty()) +/* + if (_theme->isEmpty()) { - if (QX11Info::appDepth() > 8) - *_theme = defaultThemeName(); - else - *_theme = QLatin1String("locolor"); - }*/ + *_theme = defaultThemeName(); + } +*/ return *_theme; } diff --git a/plasma/private/packages.cpp b/plasma/private/packages.cpp index 88ab3df2..33cb377d 100644 --- a/plasma/private/packages.cpp +++ b/plasma/private/packages.cpp @@ -158,46 +158,6 @@ ThemePackage::ThemePackage(QObject *parent) addFileDefinition("opaque/widgets/tooltip", "opaque/widgets/tooltip.svgz", i18n("Opaque background image for tooltips")); - addDirectoryDefinition("locolor/dialogs", "locolor/dialogs/", - i18n("Low color images for dialogs")); - - addFileDefinition("locolor/dialogs/background", "locolor/dialogs/background.svg", - i18n("Low color generic dialog background")); - addFileDefinition("locolor/dialogs/background", "locolor/dialogs/background.svgz", - i18n("Low color generic dialog background")); - - addFileDefinition("locolor/dialogs/shutdowndialog", "locolor/dialogs/shutdowndialog.svg", - i18n("Low color theme for the logout dialog")); - addFileDefinition("locolor/dialogs/shutdowndialog", "locolor/dialogs/shutdowndialog.svgz", - i18n("Low color theme for the logout dialog")); - - addDirectoryDefinition("locolor/widgets", "locolor/widgets/", i18n("Images for widgets")); - - addFileDefinition("locolor/widgets/background", "locolor/widgets/background.svg", - i18n("Low color background image for widgets")); - addFileDefinition("locolor/widgets/background", "locolor/widgets/background.svgz", - i18n("Low color background image for widgets")); - - addFileDefinition("locolor/widgets/clock", "locolor/widgets/clock.svg", - i18n("Low color analog clock face")); - addFileDefinition("locolor/widgets/clock", "locolor/widgets/clock.svgz", - i18n("Low color analog clock face")); - - addFileDefinition("locolor/widgets/panel-background", "locolor/widgets/panel-background.svg", - i18n("Low color background image for panels")); - addFileDefinition("locolor/widgets/panel-background", "locolor/widgets/panel-background.svgz", - i18n("Low color background image for panels")); - - addFileDefinition("locolor/widgets/plot-background", "locolor/widgets/plot-background.svg", - i18n("Low color background for graphing widgets")); - addFileDefinition("locolor/widgets/plot-background", "locolor/widgets/plot-background.svgz", - i18n("Low color background for graphing widgets")); - - addFileDefinition("locolor/widgets/tooltip", "locolor/widgets/tooltip.svg", - i18n("Low color background image for tooltips")); - addFileDefinition("locolor/widgets/tooltip", "locolor/widgets/tooltip.svgz", - i18n("Low color background image for tooltips")); - addFileDefinition("colors", "colors", i18n("KColorScheme configuration file")); QStringList mimetypes; diff --git a/plasma/theme.cpp b/plasma/theme.cpp index 4b3cc1ad..31fddb0e 100644 --- a/plasma/theme.cpp +++ b/plasma/theme.cpp @@ -81,7 +81,6 @@ public: defaultWallpaperWidth(DEFAULT_WALLPAPER_WIDTH), defaultWallpaperHeight(DEFAULT_WALLPAPER_HEIGHT), cachesToDiscard(NoCache), - locolor(false), compositingActive(KWindowSystem::self()->compositingActive()), isDefault(false), useGlobal(true), @@ -184,7 +183,6 @@ public: QString themeVersion; QString themeMetadataPath; - bool locolor : 1; bool compositingActive : 1; bool isDefault : 1; bool useGlobal : 1; @@ -251,10 +249,7 @@ QString ThemePrivate::findInTheme(const QString &image, const QString &theme, bo QString search; - if (locolor) { - search = QLatin1String("desktoptheme/") + theme + QLatin1String("/locolor/") + image; - search = KStandardDirs::locate("data", search); - } else if (!compositingActive) { + if (!compositingActive) { search = QLatin1String("desktoptheme/") + theme + QLatin1String("/opaque/") + image; search = KStandardDirs::locate("data", search); } else {