From fd3b1a385e15edbd4859f25e3350251f2e82db3d Mon Sep 17 00:00:00 2001 From: q5sys Date: Tue, 18 Jul 2017 16:42:57 -0400 Subject: the second great renaming --- .../src/lthemeengine/lthemeengine.cpp | 115 +++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp (limited to 'src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp') diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp new file mode 100644 index 00000000..1316cd75 --- /dev/null +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp @@ -0,0 +1,115 @@ +/* + * Copyright (c) 2014-2017, Ilya Kotov + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include "lthemeengine.h" + +#ifndef LTHEMEENGINE_DATADIR +#define LTHEMEENGINE_DATADIR "/usr/share" +#endif + + +QString lthemeengine::configPath() +{ + return QDir::homePath() + "/.config/lthemeengine/"; +} + +QString lthemeengine::configFile() +{ + return configPath() + "lthemeengine.conf"; +} + +QStringList lthemeengine::iconPaths() +{ + QString xdgDataDirs = qgetenv("XDG_DATA_DIRS"); + QString xdgDataHome = qgetenv("XDG_DATA_HOME"); + + QStringList paths; + paths << QDir::homePath() + "/.icons/"; + + if(xdgDataDirs.isEmpty()) + { + paths << "/usr/share/icons"; + paths << "/usr/local/share/icons"; + } + else + { + foreach (QString p, xdgDataDirs.split(":")) + paths << QDir(p + "/icons/").absolutePath(); + } + + if(xdgDataHome.isEmpty()) + xdgDataHome = QDir::homePath() + "/.local/share"; + + paths << "/usr/share/pixmaps"; + paths << xdgDataHome + "/icons"; + paths.removeDuplicates(); + + //remove invalid + foreach (QString p, paths) + { + if(!QDir(p).exists()) + paths.removeAll(p); + } + return paths; +} + +QString lthemeengine::userStyleSheetPath() +{ + return configPath() + "qss/"; +} + +QString lthemeengine::sharedStyleSheetPath() +{ + return LTHEMEENGINE_DATADIR"/lthemeengine/qss/"; +} + +QString lthemeengine::userColorSchemePath() +{ + return configPath() + "colors/"; +} + +QString lthemeengine::sharedColorSchemePath() +{ + return LTHEMEENGINE_DATADIR"/lthemeengine/colors/"; +} + +QString lthemeengine::systemLanguageID() +{ +#ifdef Q_OS_UNIX + QByteArray v = qgetenv ("LC_ALL"); + if (v.isEmpty()) + v = qgetenv ("LC_MESSAGES"); + if (v.isEmpty()) + v = qgetenv ("LANG"); + if (!v.isEmpty()) + return QLocale (v).name(); +#endif + return QLocale::system().name(); +} -- cgit From 2b41fac681c5b94206e78c5995551d033467ae01 Mon Sep 17 00:00:00 2001 From: q5sys Date: Tue, 18 Jul 2017 17:37:06 -0400 Subject: apply path patch --- .../src/lthemeengine/lthemeengine.cpp | 45 +++++++++++++++------- 1 file changed, 31 insertions(+), 14 deletions(-) (limited to 'src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp') diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp index 1316cd75..c0c23f24 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp @@ -85,20 +85,37 @@ QString lthemeengine::userStyleSheetPath() return configPath() + "qss/"; } -QString lthemeengine::sharedStyleSheetPath() -{ - return LTHEMEENGINE_DATADIR"/lthemeengine/qss/"; -} - -QString lthemeengine::userColorSchemePath() -{ - return configPath() + "colors/"; -} - -QString lthemeengine::sharedColorSchemePath() -{ - return LTHEMEENGINE_DATADIR"/lthemeengine/colors/"; -} +QStringList lthemeengine::sharedStyleSheetPath() + { + QStringList dirs; + dirs << QString(getenv("XDG_CONFIG_HOME")); + dirs << QString(getenv("XDG_CONFIG_DIRS")).split(":"); + for(int i=0; i Date: Tue, 18 Jul 2017 18:52:18 -0400 Subject: set proper define for datadir --- src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp') diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp index c0c23f24..65328963 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp @@ -31,7 +31,7 @@ #include "lthemeengine.h" #ifndef LTHEMEENGINE_DATADIR -#define LTHEMEENGINE_DATADIR "/usr/share" +#define LTHEMEENGINE_DATADIR "/usr/local/share" #endif -- cgit