diff options
Diffstat (limited to 'src-qt5')
21 files changed, 105 insertions, 105 deletions
diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengine-qtplugin.pro b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengine-qtplugin.pro index 1b9bd682..064c7642 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengine-qtplugin.pro +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengine-qtplugin.pro @@ -17,7 +17,7 @@ greaterThan(QT_MINOR_VERSION, 7) { SOURCES += \ main.cpp \ lthemeengineplatformtheme.cpp \ - ../lthemeengine/qt5ct.cpp + ../lthemeengine/lthemeengine.cpp !equals (DISABLE_WIDGETS,1) { QT += widgets @@ -29,7 +29,7 @@ INCLUDEPATH += ../ HEADERS += \ lthemeengineplatformtheme.h \ - ../lthemeengine/qt5ct.h + ../lthemeengine/lthemeengine.h target.path = $$PLUGINDIR/platformthemes INSTALLS += target diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.cpp index ab0642dc..0b0403a4 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.cpp @@ -44,7 +44,7 @@ #include <QFile> #include <QFileSystemWatcher> -#include <lthemeengine/qt5ct.h> +#include <lthemeengine/lthemeengine.h> #include "lthemeengineplatformtheme.h" #if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)) && !defined(QT_NO_DBUS) #include <private/qdbusmenubar_p.h> @@ -56,11 +56,11 @@ -Q_LOGGING_CATEGORY(llthemeengine, "qt5ct") +Q_LOGGING_CATEGORY(llthemeengine, "lthemeengine") //QT_QPA_PLATFORMTHEME=lthemeengine -Qt5CTPlatformTheme::Qt5CTPlatformTheme() +lthemeenginePlatformTheme::Qt5CTPlatformTheme() { if(QGuiApplication::desktopSettingsAware()) { @@ -71,21 +71,21 @@ Qt5CTPlatformTheme::Qt5CTPlatformTheme() #endif QGuiApplication::setFont(m_generalFont); } - qCDebug(llthemeengine) << "using qt5ct plugin"; + qCDebug(llthemeengine) << "using lthemeengine plugin"; #ifdef QT_WIDGETS_LIB if(!QStyleFactory::keys().contains("lthemeengine-style")) - qCCritical(llthemeengine) << "unable to find qt5ct proxy style"; + qCCritical(llthemeengine) << "unable to find lthemeengine proxy style"; #endif } -Qt5CTPlatformTheme::~Qt5CTPlatformTheme() +lthemeenginePlatformTheme::~Qt5CTPlatformTheme() { if(m_customPalette) delete m_customPalette; } #if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)) && !defined(QT_NO_DBUS) -QPlatformMenuBar *Qt5CTPlatformTheme::createPlatformMenuBar() const +QPlatformMenuBar *lthemeenginePlatformTheme::createPlatformMenuBar() const { if(m_checkDBusGlobalMenu) { @@ -98,7 +98,7 @@ QPlatformMenuBar *Qt5CTPlatformTheme::createPlatformMenuBar() const #endif #if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON) -QPlatformSystemTrayIcon *Qt5CTPlatformTheme::createPlatformSystemTrayIcon() const +QPlatformSystemTrayIcon *lthemeenginePlatformTheme::createPlatformSystemTrayIcon() const { if(m_checkDBusTray) { @@ -111,20 +111,20 @@ QPlatformSystemTrayIcon *Qt5CTPlatformTheme::createPlatformSystemTrayIcon() cons } #endif -const QPalette *Qt5CTPlatformTheme::palette(QPlatformTheme::Palette type) const +const QPalette *lthemeenginePlatformTheme::palette(QPlatformTheme::Palette type) const { Q_UNUSED(type); return (m_usePalette ? m_customPalette : nullptr); } -const QFont *Qt5CTPlatformTheme::font(QPlatformTheme::Font type) const +const QFont *lthemeenginePlatformTheme::font(QPlatformTheme::Font type) const { if(type == QPlatformTheme::FixedFont) return &m_fixedFont; return &m_generalFont; } -QVariant Qt5CTPlatformTheme::themeHint(QPlatformTheme::ThemeHint hint) const +QVariant lthemeenginePlatformTheme::themeHint(QPlatformTheme::ThemeHint hint) const { switch (hint) { @@ -139,7 +139,7 @@ QVariant Qt5CTPlatformTheme::themeHint(QPlatformTheme::ThemeHint hint) const case QPlatformTheme::StyleNames: return QStringList() << "lthemeengine-style"; case QPlatformTheme::IconThemeSearchPaths: - return Qt5CT::iconPaths(); + return lthemeengine::iconPaths(); case DialogButtonBoxLayout: return m_buttonBoxLayout; case QPlatformTheme::UiEffects: @@ -153,7 +153,7 @@ QVariant Qt5CTPlatformTheme::themeHint(QPlatformTheme::ThemeHint hint) const } } -void Qt5CTPlatformTheme::applySettings() +void lthemeenginePlatformTheme::applySettings() { if(!QGuiApplication::desktopSettingsAware()) return; @@ -224,10 +224,10 @@ void Qt5CTPlatformTheme::applySettings() } #ifdef QT_WIDGETS_LIB -void Qt5CTPlatformTheme::createFSWatcher() +void lthemeenginePlatformTheme::createFSWatcher() { QFileSystemWatcher *watcher = new QFileSystemWatcher(this); - watcher->addPath(Qt5CT::configPath()); + watcher->addPath(lthemeengine::configPath()); QTimer *timer = new QTimer(this); timer->setSingleShot(true); @@ -236,7 +236,7 @@ void Qt5CTPlatformTheme::createFSWatcher() connect(timer, SIGNAL(timeout()), SLOT(updateSettings())); } -void Qt5CTPlatformTheme::updateSettings() +void lthemeenginePlatformTheme::updateSettings() { qCDebug(llthemeengine) << "updating settings.."; readSettings(); @@ -244,7 +244,7 @@ void Qt5CTPlatformTheme::updateSettings() } #endif -void Qt5CTPlatformTheme::readSettings() +void lthemeenginePlatformTheme::readSettings() { if(m_customPalette) { @@ -252,7 +252,7 @@ void Qt5CTPlatformTheme::readSettings() m_customPalette = 0; } - QSettings settings(Qt5CT::configFile(), QSettings::IniFormat); + QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); settings.beginGroup("Appearance"); m_style = settings.value("style", "Fusion").toString(); @@ -311,13 +311,13 @@ void Qt5CTPlatformTheme::readSettings() } #ifdef QT_WIDGETS_LIB -bool Qt5CTPlatformTheme::hasWidgets() +bool lthemeenginePlatformTheme::hasWidgets() { return qobject_cast<QApplication *> (qApp) != nullptr; } #endif -QString Qt5CTPlatformTheme::loadStyleSheets(const QStringList &paths) +QString lthemeenginePlatformTheme::loadStyleSheets(const QStringList &paths) { QString content; foreach (QString path, paths) @@ -335,7 +335,7 @@ QString Qt5CTPlatformTheme::loadStyleSheets(const QStringList &paths) return content; } -QPalette Qt5CTPlatformTheme::loadColorScheme(const QString &filePath) +QPalette lthemeenginePlatformTheme::loadColorScheme(const QString &filePath) { QPalette customPalette; QSettings settings(filePath, QSettings::IniFormat); diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.h b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.h index 5ff96844..3996b451 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.h +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.h @@ -26,8 +26,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef QT5CTPLATFORMTHEME_H -#define QT5CTPLATFORMTHEME_H +#ifndef LTHEMEENGINEPLATFORMTHEME_H +#define LTHEMEENGINEPLATFORMTHEME_H #include <qpa/qplatformtheme.h> #include <QObject> @@ -50,13 +50,13 @@ class QPlatformSystemTrayIcon; class QPlatformMenuBar; #endif -class Qt5CTPlatformTheme : public QObject, public QPlatformTheme +class lthemeenginePlatformTheme : public QObject, public QPlatformTheme { Q_OBJECT public: - Qt5CTPlatformTheme(); + lthemeenginePlatformTheme(); - virtual ~Qt5CTPlatformTheme(); + virtual ~lthemeenginePlatformTheme(); //virtual QPlatformMenuItem* createPlatformMenuItem() const; @@ -119,4 +119,4 @@ private: Q_DECLARE_LOGGING_CATEGORY(llthemeengine) -#endif // QT5CTPLATFORMTHEME_H +#endif // LTHEMEENGINEPLATFORMTHEME_H diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/main.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/main.cpp index e97db782..37798f70 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/main.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/main.cpp @@ -31,7 +31,7 @@ QT_BEGIN_NAMESPACE -class Qt5CTPlatformThemePlugin: public QPlatformThemePlugin +class lthemeenginePlatformThemePlugin: public QPlatformThemePlugin { Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformThemeFactoryInterface.5.1" FILE "lthemeengine.json") @@ -39,11 +39,11 @@ public: QPlatformTheme *create(const QString &key, const QStringList ¶ms); }; -QPlatformTheme *Qt5CTPlatformThemePlugin::create(const QString &key, const QStringList ¶ms) +QPlatformTheme *lthemeenginePlatformThemePlugin::create(const QString &key, const QStringList ¶ms) { Q_UNUSED(params); if (key.toLower() == "lthemeengine") - return new Qt5CTPlatformTheme(); + return new lthemeenginePlatformTheme(); return NULL; } diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengine-style.pro b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengine-style.pro index f8584138..0b40de64 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengine-style.pro +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengine-style.pro @@ -15,12 +15,12 @@ INCLUDEPATH += ../ HEADERS += \ lthemeengineproxystyle.h \ - ../lthemeengine/qt5ct.h + ../lthemeengine/lthemeengine.h SOURCES += \ plugin.cpp \ lthemeengineproxystyle.cpp \ - ../lthemeengine/qt5ct.cpp + ../lthemeengine/lthemeengine.cpp OTHER_FILES += \ lthemeengine.json diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengineproxystyle.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengineproxystyle.cpp index 8e72aff2..23ad01ef 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengineproxystyle.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengineproxystyle.cpp @@ -27,23 +27,23 @@ */ #include <QSettings> -#include <lthemeengine/qt5ct.h> +#include <lthemeengine/lthemeengine.h> #include "lthemeengineproxystyle.h" -Qt5CTProxyStyle::Qt5CTProxyStyle(const QString &key) : +lthemeengineProxyStyle::Qt5CTProxyStyle(const QString &key) : QProxyStyle(key) { - QSettings settings(Qt5CT::configFile(), QSettings::IniFormat); + QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); m_dialogButtonsHaveIcons = settings.value("Interface/dialog_buttons_have_icons", Qt::PartiallyChecked).toInt(); m_activateItemOnSingleClick = settings.value("Interface/activate_item_on_single_click", Qt::PartiallyChecked).toInt(); } -Qt5CTProxyStyle::~Qt5CTProxyStyle() +lthemeengineProxyStyle::~Qt5CTProxyStyle() { //qDebug("%s", Q_FUNC_INFO); } -int Qt5CTProxyStyle::styleHint(QStyle::StyleHint hint, const QStyleOption *option, const QWidget *widget, QStyleHintReturn *returnData) const +int lthemeengineProxyStyle::styleHint(QStyle::StyleHint hint, const QStyleOption *option, const QWidget *widget, QStyleHintReturn *returnData) const { if(hint == QStyle::SH_DialogButtonBox_ButtonsHaveIcons) { diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengineproxystyle.h b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengineproxystyle.h index 842247cf..47a18099 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengineproxystyle.h +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengineproxystyle.h @@ -26,18 +26,18 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef QT5CTPROXYSTYLE_H -#define QT5CTPROXYSTYLE_H +#ifndef LTHEMEENGINEPROXYSTYLE_H +#define LTHEMEENGINEPROXYSTYLE_H #include <QProxyStyle> -class Qt5CTProxyStyle : public QProxyStyle +class lthemeengineProxyStyle : public QProxyStyle { Q_OBJECT public: - explicit Qt5CTProxyStyle(const QString &key); + explicit lthemeengineProxyStyle(const QString &key); - virtual ~Qt5CTProxyStyle(); + virtual ~lthemeengineProxyStyle(); int styleHint(StyleHint hint, const QStyleOption *option, const QWidget *widget, QStyleHintReturn *returnData) const; @@ -47,4 +47,4 @@ private: }; -#endif // QT5CTPROXYSTYLE_H +#endif // LTHEMEENGINEPROXYSTYLE_H diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/plugin.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/plugin.cpp index 35ff6477..9d63093e 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/plugin.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/plugin.cpp @@ -29,10 +29,10 @@ #include <QStylePlugin> #include <QSettings> #include <QStyleFactory> -#include <lthemeengine/qt5ct.h> +#include <lthemeengine/lthemeengine.h> #include "lthemeengineproxystyle.h" -class Qt5CTStylePlugin : public QStylePlugin +class lthemeengineStylePlugin : public QStylePlugin { Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QStyleFactoryInterface" FILE "lthemeengine.json") @@ -41,15 +41,15 @@ public: QStyle *create(const QString &key); }; -QStyle *Qt5CTStylePlugin::create(const QString &key) +QStyle *lthemeengineStylePlugin::create(const QString &key) { if (key == "lthemeengine-style") { - QSettings settings(Qt5CT::configFile(), QSettings::IniFormat); + QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); QString style = settings.value("Appearance/style", "Fusion").toString(); if(key == style || !QStyleFactory::keys().contains(style)) style = "Fusion"; - return new Qt5CTProxyStyle(style); + return new lthemeengineProxyStyle(style); } return 0; } diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp index 13dcc395..2c125ea8 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp @@ -87,7 +87,7 @@ AppearancePage::~AppearancePage() void AppearancePage::writeSettings() { - QSettings settings(Qt5CT::configFile(), QSettings::IniFormat); + QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); settings.beginGroup("Appearance"); settings.setValue("style", m_ui->styleComboBox->currentText()); settings.setValue("custom_palette", m_ui->customPaletteButton->isChecked()); @@ -131,7 +131,7 @@ void AppearancePage::createColorScheme() return; } - QString schemePath = Qt5CT::userColorSchemePath() + "/" + name; + QString schemePath = lthemeengine::userColorSchemePath() + "/" + name; createColorScheme(schemePath, palette()); m_ui->colorSchemeComboBox->addItem(name.section('.',0,0), schemePath); @@ -207,7 +207,7 @@ void AppearancePage::copyColorScheme() return; } - QString newPath = Qt5CT::userColorSchemePath() + "/" + name; + QString newPath = lthemeengine::userColorSchemePath() + "/" + name; QFile::copy(m_ui->colorSchemeComboBox->currentData().toString(), newPath); m_ui->colorSchemeComboBox->addItem(name.section('.',0,0), newPath); } @@ -241,7 +241,7 @@ void AppearancePage::renameColorScheme() return; } - QString newPath = Qt5CT::userColorSchemePath() + "/" + name; + QString newPath = lthemeengine::userColorSchemePath() + "/" + name; QFile::rename(m_ui->colorSchemeComboBox->currentData().toString(), newPath); m_ui->colorSchemeComboBox->setItemText(index, name.section('.',0,0)); m_ui->colorSchemeComboBox->setItemData(index, newPath); @@ -300,7 +300,7 @@ void AppearancePage::updateActions() void AppearancePage::readSettings() { - QSettings settings(Qt5CT::configFile(), QSettings::IniFormat); + QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); settings.beginGroup("Appearance"); QString style = settings.value("style", "Fusion").toString(); m_ui->styleComboBox->setCurrentText(style); @@ -308,9 +308,9 @@ void AppearancePage::readSettings() m_ui->customPaletteButton->setChecked(settings.value("custom_palette", false).toBool()); QString colorSchemePath = settings.value("color_scheme_path").toString(); - QDir("/").mkpath(Qt5CT::userColorSchemePath()); - findColorSchemes(Qt5CT::userColorSchemePath()); - findColorSchemes(Qt5CT::sharedColorSchemePath()); + QDir("/").mkpath(lthemeengine::userColorSchemePath()); + findColorSchemes(lthemeengine::userColorSchemePath()); + findColorSchemes(lthemeengine::sharedColorSchemePath()); if(m_ui->colorSchemeComboBox->count() == 0) { diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/fontspage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/fontspage.cpp index bc8a4ee0..db48a3cc 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/fontspage.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/fontspage.cpp @@ -65,7 +65,7 @@ FontsPage::~FontsPage() void FontsPage::writeSettings() { - QSettings settings(Qt5CT::configFile(), QSettings::IniFormat); + QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); settings.beginGroup("Fonts"); settings.setValue("general", m_ui->generalFontLabel->font()); settings.setValue("fixed", m_ui->fixedFontLabel->font()); @@ -85,7 +85,7 @@ void FontsPage::onFontChangeRequested(QWidget *widget) void FontsPage::readSettings() { - QSettings settings(Qt5CT::configFile(), QSettings::IniFormat); + QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); settings.beginGroup("Fonts"); loadFont(&settings, m_ui->generalFontLabel, "general"); loadFont(&settings, m_ui->fixedFontLabel, "fixed"); diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/iconthemepage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/iconthemepage.cpp index d96c485c..ca9a3388 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/iconthemepage.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/iconthemepage.cpp @@ -53,7 +53,7 @@ IconThemePage::~IconThemePage() void IconThemePage::writeSettings() { - QSettings settings(Qt5CT::configFile(), QSettings::IniFormat); + QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); QTreeWidgetItem *item = m_ui->treeWidget->currentItem(); if(item) settings.setValue("Appearance/icon_theme", item->data(3, Qt::UserRole)); @@ -61,7 +61,7 @@ void IconThemePage::writeSettings() void IconThemePage::readSettings() { - QSettings settings(Qt5CT::configFile(), QSettings::IniFormat); + QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); QString name = settings.value("Appearance/icon_theme").toString(); if(name.isEmpty()) @@ -81,7 +81,7 @@ void IconThemePage::readSettings() void IconThemePage::loadThemes() { QFileInfoList themeFileList; - foreach(QString path, Qt5CT::iconPaths()) + foreach(QString path, lthemeengine::iconPaths()) { QDir dir(path); dir.setFilter(QDir::Dirs | QDir::NoDotDot | QDir::NoDot); diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/interfacepage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/interfacepage.cpp index fe953e78..a9f40080 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/interfacepage.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/interfacepage.cpp @@ -60,7 +60,7 @@ InterfacePage::~InterfacePage() void InterfacePage::writeSettings() { - QSettings settings(Qt5CT::configFile(), QSettings::IniFormat); + QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); settings.beginGroup("Interface"); settings.setValue("double_click_interval", m_ui->doubleClickIntervalSpinBox->value()); settings.setValue("cursor_flash_time", m_ui->cursorFlashTimeSpinBox->value()); @@ -97,7 +97,7 @@ void InterfacePage::writeSettings() void InterfacePage::readSettings() { - QSettings settings(Qt5CT::configFile(), QSettings::IniFormat); + QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); settings.beginGroup("Interface"); m_ui->doubleClickIntervalSpinBox->setValue(qApp->doubleClickInterval()); m_ui->cursorFlashTimeSpinBox->setValue(qApp->cursorFlashTime()); diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemengine.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp index ed3c909e..1316cd75 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemengine.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp @@ -30,22 +30,22 @@ #include <QLocale> #include "lthemeengine.h" -#ifndef QT5CT_DATADIR -#define QT5CT_DATADIR "/usr/share" +#ifndef LTHEMEENGINE_DATADIR +#define LTHEMEENGINE_DATADIR "/usr/share" #endif -QString Qt5CT::configPath() +QString lthemeengine::configPath() { return QDir::homePath() + "/.config/lthemeengine/"; } -QString Qt5CT::configFile() +QString lthemeengine::configFile() { return configPath() + "lthemeengine.conf"; } -QStringList Qt5CT::iconPaths() +QStringList lthemeengine::iconPaths() { QString xdgDataDirs = qgetenv("XDG_DATA_DIRS"); QString xdgDataHome = qgetenv("XDG_DATA_HOME"); @@ -80,27 +80,27 @@ QStringList Qt5CT::iconPaths() return paths; } -QString Qt5CT::userStyleSheetPath() +QString lthemeengine::userStyleSheetPath() { return configPath() + "qss/"; } -QString Qt5CT::sharedStyleSheetPath() +QString lthemeengine::sharedStyleSheetPath() { - return QT5CT_DATADIR"/lthemeengine/qss/"; + return LTHEMEENGINE_DATADIR"/lthemeengine/qss/"; } -QString Qt5CT::userColorSchemePath() +QString lthemeengine::userColorSchemePath() { return configPath() + "colors/"; } -QString Qt5CT::sharedColorSchemePath() +QString lthemeengine::sharedColorSchemePath() { - return QT5CT_DATADIR"/lthemeengine/colors/"; + return LTHEMEENGINE_DATADIR"/lthemeengine/colors/"; } -QString Qt5CT::systemLanguageID() +QString lthemeengine::systemLanguageID() { #ifdef Q_OS_UNIX QByteArray v = qgetenv ("LC_ALL"); diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemengine.desktop b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.desktop index be2bde14..be2bde14 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemengine.desktop +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.desktop diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemengine.h b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.h index 1aecd741..1eb33cdf 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemengine.h +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.h @@ -26,22 +26,22 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef QT5CT_H -#define QT5CT_H +#ifndef LTHEMEENGINE_H +#define LTHEMEENGINE_H -#define QT5CT_VERSION_MAJOR 0 -#define QT5CT_VERSION_MINOR 33 +#define LTHEMEENGINE_VERSION_MAJOR 0 +#define LTHEMEENGINE_VERSION_MINOR 33 -#define QT5CT_TOSTRING(s) #s -#define QT5CT_STRINGIFY(s) QT5CT_TOSTRING(s) +#define LTHEMEENGINE_TOSTRING(s) #s +#define LTHEMEENGINE_STRINGIFY(s) QT5CT_TOSTRING(s) -#define QT5CT_VERSION_INT (QT5CT_VERSION_MAJOR<<8 | QT5CT_VERSION_MINOR) -#define QT5CT_VERSION_STR QT5CT_STRINGIFY(QT5CT_VERSION_MAJOR.QT5CT_VERSION_MINOR) +#define LTHEMEENGINE_VERSION_INT (QT5CT_VERSION_MAJOR<<8 | QT5CT_VERSION_MINOR) +#define LTHEMEENGINE_VERSION_STR QT5CT_STRINGIFY(QT5CT_VERSION_MAJOR.QT5CT_VERSION_MINOR) #include <QString> #include <QStringList> -class Qt5CT +class lthemeengine { public: static QString configPath(); @@ -54,7 +54,7 @@ public: static QString systemLanguageID(); private: - Qt5CT() {} + lthemeengine() {} }; -#endif // QT5CT_H +#endif // LTHEMEENGINE_H diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemengine.pro b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.pro index 07677fe3..07677fe3 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemengine.pro +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.pro diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/main.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/main.cpp index f4a14222..481242cd 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/main.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/main.cpp @@ -40,7 +40,7 @@ int main(int argc, char **argv) { QApplication app(argc, argv); QTranslator translator; - QString locale = Qt5CT::systemLanguageID(); + QString locale = lthemeengine::systemLanguageID(); translator.load(QString(":/lthemeengine_") + locale); app.installTranslator(&translator); @@ -48,8 +48,8 @@ int main(int argc, char **argv) qt_translator.load(QLibraryInfo::location (QLibraryInfo::TranslationsPath) + "/qtbase_" + locale); app.installTranslator(&qt_translator); - qDebug("Configuration path: %s", qPrintable(Qt5CT::configPath())); - qDebug("Shared QSS path: %s", qPrintable(Qt5CT::sharedStyleSheetPath())); + qDebug("Configuration path: %s", qPrintable(lthemeengine::configPath())); + qDebug("Shared QSS path: %s", qPrintable(lthemeengine::sharedStyleSheetPath())); //checking environment QStringList errorMessages; diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp index ce3bd6b8..ed658e2e 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp @@ -50,12 +50,12 @@ MainWindow::MainWindow(QWidget *parent) : m_ui->tabWidget->addTab(new QSSPage(this), tr("Style Sheets")); #endif - QSettings settings(Qt5CT::configFile(), QSettings::IniFormat); + QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); restoreGeometry(settings.value("SettingsWindow/geometry").toByteArray()); setWindowIcon(QIcon::fromTheme("preferences-desktop-theme")); - m_ui->versionLabel->setText(tr("Version: %1").arg(QT5CT_VERSION_STR)); + m_ui->versionLabel->setText(tr("Version: %1").arg(LTHEMEENGINE_VERSION_STR)); } MainWindow::~MainWindow() @@ -65,7 +65,7 @@ MainWindow::~MainWindow() void MainWindow::closeEvent(QCloseEvent *) { - QSettings settings(Qt5CT::configFile(), QSettings::IniFormat); + QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); settings.setValue("SettingsWindow/geometry", saveGeometry()); } diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.cpp index f297b55c..0f8fcf66 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.cpp @@ -50,7 +50,7 @@ PaletteEditDialog::PaletteEditDialog(const QPalette &palette, QStyle *currentSty m_ui->tableWidget->setHorizontalHeaderLabels(labels); setPalette(palette); - QSettings settings(Qt5CT::configFile(), QSettings::IniFormat); + QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); restoreGeometry(settings.value("PaletteEditor/geometry").toByteArray()); } @@ -97,7 +97,7 @@ void PaletteEditDialog::setPalette(const QPalette &palette) void PaletteEditDialog::hideEvent(QHideEvent *) { - QSettings settings(Qt5CT::configFile(), QSettings::IniFormat); + QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); settings.setValue("PaletteEditor/geometry", saveGeometry()); } diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.cpp index fbe52cf9..b92b5619 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.cpp @@ -44,7 +44,7 @@ QSSEditorDialog::QSSEditorDialog(const QString &filePath, QWidget *parent) : m_ui->textEdit->setPlainText(QString::fromUtf8(file.readAll())); setWindowTitle(tr("%1 - Style Sheet Editor").arg(file.fileName())); - QSettings settings(Qt5CT::configFile(), QSettings::IniFormat); + QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); restoreGeometry(settings.value("QSSEditor/geometry").toByteArray()); } @@ -62,7 +62,7 @@ void QSSEditorDialog::save() void QSSEditorDialog::hideEvent(QHideEvent *) { - QSettings settings(Qt5CT::configFile(), QSettings::IniFormat); + QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); settings.setValue("QSSEditor/geometry", saveGeometry()); } diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp index f2f05ae9..56aedf4d 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp @@ -45,7 +45,7 @@ QSSPage::QSSPage(QWidget *parent) : m_ui(new Ui::QSSPage) { m_ui->setupUi(this); - QDir("/").mkpath(Qt5CT::userStyleSheetPath()); + QDir("/").mkpath(lthemeengine::userStyleSheetPath()); m_menu = new QMenu(this); m_menu->addAction(QIcon::fromTheme("accessories-text-editor"), tr("Edit"), this, SLOT(on_editButton_clicked())); @@ -69,7 +69,7 @@ QSSPage::~QSSPage() void QSSPage::writeSettings() { QStringList styleSheets; - QSettings settings(Qt5CT::configFile(), QSettings::IniFormat); + QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); for(int i = 0; i < m_ui->qssListWidget->count(); ++i) { @@ -106,7 +106,7 @@ void QSSPage::on_createButton_clicked() if(!name.endsWith(".qss", Qt::CaseInsensitive)) name.append(".qss"); - QString filePath = Qt5CT::userStyleSheetPath() + name; + QString filePath = lthemeengine::userStyleSheetPath() + name; if(QFile::exists(filePath)) { @@ -159,10 +159,10 @@ void QSSPage::readSettings() { //load stylesheets m_ui->qssListWidget->clear(); - findStyleSheets(Qt5CT::userStyleSheetPath()); - findStyleSheets(Qt5CT::sharedStyleSheetPath()); + findStyleSheets(lthemeengine::userStyleSheetPath()); + findStyleSheets(lthemeengine::sharedStyleSheetPath()); - QSettings settings(Qt5CT::configFile(), QSettings::IniFormat); + QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); QStringList styleSheets = settings.value("Interface/stylesheets").toStringList(); for(int i = 0; i < m_ui->qssListWidget->count(); ++i) { @@ -209,7 +209,7 @@ void QSSPage::on_renameButton_clicked() if(!name.endsWith(".qss", Qt::CaseInsensitive)) name.append(".qss"); - QString newPath = Qt5CT::userStyleSheetPath() + name; + QString newPath = lthemeengine::userStyleSheetPath() + name; if(!QFile::rename(item->data(QSS_FULL_PATH_ROLE).toString(), newPath)) { |