Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: drop locolor support

Browse source 
`apt-file` search yeilds 221 files matching (8 packages provide such),
it is also unused by plasma even tho there are leftovers from support for it

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-12-05 01:30:27 +02:00
parent 0e16676993
commit 148110f398
4 changed files with 9 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmake/modules/KDE4Macros.cmake
View file

@ -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

16
kdeui/icons/kicontheme.cpp
View file

@ -134,12 +134,11 @@ KIconTheme::KIconTheme(const QString& name, const QString& appName)
QStringList themeDirs;
QSet<QString> 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");
}*/
}
*/
return *_theme;
}

40
plasma/private/packages.cpp
View file

@ -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;

7
plasma/theme.cpp
View file

@ -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 {