From 28ef36a774b2dcfb5a04e72303c6ee07518dc581 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Sun, 24 Mar 2019 18:44:27 +0200 Subject: [PATCH] simplify indicators names --- app/indicator/factory.cpp | 2 +- app/view/indicator.cpp | 8 ++++---- app/view/indicator.h | 2 +- containment/package/contents/ui/indicators/Manager.qml | 2 +- indicators/CMakeLists.txt | 4 ++-- indicators/Messages.sh | 4 ++-- indicators/default/metadata.desktop | 2 +- .../metadata.desktop | 2 +- .../package/ui/BackLayer.qml | 0 .../package/ui/FrontLayer.qml | 0 .../package/ui/main.qml | 0 .../metadata.desktop | 2 +- .../package/ui/BackLayer.qml | 0 .../package/ui/FrontLayer.qml | 0 .../package/ui/main.qml | 0 plasmoid/package/contents/ui/indicators/Manager.qml | 2 +- .../contents/configuration/pages/EffectsConfig.qml | 6 +++--- 17 files changed, 18 insertions(+), 18 deletions(-) rename indicators/{org.kde.latte.indicator.plasma => org.kde.latte.plasma}/metadata.desktop (88%) rename indicators/{org.kde.latte.indicator.plasma => org.kde.latte.plasma}/package/ui/BackLayer.qml (100%) rename indicators/{org.kde.latte.indicator.plasma => org.kde.latte.plasma}/package/ui/FrontLayer.qml (100%) rename indicators/{org.kde.latte.indicator.plasma => org.kde.latte.plasma}/package/ui/main.qml (100%) rename indicators/{org.kde.latte.indicator.unity => org.kde.latte.unity}/metadata.desktop (88%) rename indicators/{org.kde.latte.indicator.unity => org.kde.latte.unity}/package/ui/BackLayer.qml (100%) rename indicators/{org.kde.latte.indicator.unity => org.kde.latte.unity}/package/ui/FrontLayer.qml (100%) rename indicators/{org.kde.latte.indicator.unity => org.kde.latte.unity}/package/ui/main.qml (100%) diff --git a/app/indicator/factory.cpp b/app/indicator/factory.cpp index ee88c8fdf..d4fd9017e 100644 --- a/app/indicator/factory.cpp +++ b/app/indicator/factory.cpp @@ -37,7 +37,7 @@ Factory::Factory(QObject *parent) { reload(); - qDebug() << m_plugins["org.kde.latte.indicator.default"].name(); + qDebug() << m_plugins["org.kde.latte.default"].name(); } Factory::~Factory() diff --git a/app/view/indicator.cpp b/app/view/indicator.cpp index ba660e5c3..231089b51 100644 --- a/app/view/indicator.cpp +++ b/app/view/indicator.cpp @@ -214,8 +214,8 @@ void Indicator::load(QString type) //! create all indicators with the new type setPluginIsReady(true); - } else if (type!="org.kde.latte.indicator.default") { - setType("org.kde.latte.indicator.default"); + } else if (type!="org.kde.latte.default") { + setType("org.kde.latte.default"); } } @@ -239,7 +239,7 @@ void Indicator::loadPlasmaComponent() { auto prevComponent = m_plasmaComponent; - KPluginMetaData metadata = m_corona->indicatorFactory()->metadata("org.kde.latte.indicator.plasma"); + KPluginMetaData metadata = m_corona->indicatorFactory()->metadata("org.kde.latte.plasma"); QString uiPath = metadata.value("X-Latte-MainScript"); if (!uiPath.isEmpty()) { @@ -328,7 +328,7 @@ void Indicator::loadConfig() m_enabledForApplets = config.readEntry("enabledForApplets", true); m_padding = config.readEntry("padding", (float)0.08); m_reversed = config.readEntry("reversed", false); - m_type = config.readEntry("type", "org.kde.latte.indicator.default"); + m_type = config.readEntry("type", "org.kde.latte.default"); } void Indicator::saveConfig() diff --git a/app/view/indicator.h b/app/view/indicator.h index d9925a7a8..ac827a7a4 100644 --- a/app/view/indicator.h +++ b/app/view/indicator.h @@ -132,7 +132,7 @@ private: float m_padding{0.08}; QString m_pluginPath; - QString m_type{"org.kde.latte.indicator.default"}; + QString m_type{"org.kde.latte.default"}; QPointer m_component; QPointer m_plasmaComponent; diff --git a/containment/package/contents/ui/indicators/Manager.qml b/containment/package/contents/ui/indicators/Manager.qml index ad1b8c984..e666f6da5 100644 --- a/containment/package/contents/ui/indicators/Manager.qml +++ b/containment/package/contents/ui/indicators/Manager.qml @@ -35,7 +35,7 @@ Item{ readonly property bool enabledForApplets: latteView && latteView.indicator ? latteView.indicator.enabledForApplets : true readonly property bool reversed: latteView && latteView.indicator ? latteView.indicator.reversed : false readonly property real padding: latteView && latteView.indicator ? latteView.indicator.padding: 0.08 - readonly property string type: latteView && latteView.indicator ? latteView.indicator.type : "org.kde.latte.indicator.default" + readonly property string type: latteView && latteView.indicator ? latteView.indicator.type : "org.kde.latte.default" readonly property Component plasmaStyleComponent: latteView && latteView.indicator ? latteView.indicator.plasmaComponent : null readonly property Component indicatorComponent: latteView && latteView.indicator ? latteView.indicator.component : null diff --git a/indicators/CMakeLists.txt b/indicators/CMakeLists.txt index f9b669a01..89798b3eb 100644 --- a/indicators/CMakeLists.txt +++ b/indicators/CMakeLists.txt @@ -1,3 +1,3 @@ install(DIRECTORY default DESTINATION ${CMAKE_INSTALL_PREFIX}/share/latte/indicators) -install(DIRECTORY org.kde.latte.indicator.plasma DESTINATION ${CMAKE_INSTALL_PREFIX}/share/latte/indicators) -install(DIRECTORY org.kde.latte.indicator.unity DESTINATION ${CMAKE_INSTALL_PREFIX}/share/latte/indicators) +install(DIRECTORY org.kde.latte.plasma DESTINATION ${CMAKE_INSTALL_PREFIX}/share/latte/indicators) +install(DIRECTORY org.kde.latte.unity DESTINATION ${CMAKE_INSTALL_PREFIX}/share/latte/indicators) diff --git a/indicators/Messages.sh b/indicators/Messages.sh index eedc419cf..8d13643a3 100644 --- a/indicators/Messages.sh +++ b/indicators/Messages.sh @@ -1,4 +1,4 @@ #! /usr/bin/env bash -$XGETTEXT `find default -name \*.js -o -name \*.qml -o -name \*.cpp` -o $podir/latte_indicator_org.kde.latte.indicator.default.pot -$XGETTEXT `find org.kde.latte.indicator.plasma -name \*.js -o -name \*.qml -o -name \*.cpp` -o $podir/latte_indicator_org.kde.latte.indicator.plasma.pot +$XGETTEXT `find default -name \*.js -o -name \*.qml -o -name \*.cpp` -o $podir/latte_indicator_org.kde.latte.default.pot +$XGETTEXT `find org.kde.latte.plasma -name \*.js -o -name \*.qml -o -name \*.cpp` -o $podir/latte_indicator_org.kde.latte.plasma.pot diff --git a/indicators/default/metadata.desktop b/indicators/default/metadata.desktop index f489ecfe2..fecaec259 100644 --- a/indicators/default/metadata.desktop +++ b/indicators/default/metadata.desktop @@ -11,7 +11,7 @@ X-Latte-ConfigXml=config/main.xml X-KDE-PluginInfo-Author=Michail Vourlakos X-KDE-PluginInfo-Email=mvourlakos@gmail.com -X-KDE-PluginInfo-Name=org.kde.latte.indicator.default +X-KDE-PluginInfo-Name=org.kde.latte.default X-KDE-PluginInfo-Version=0.1 X-KDE-PluginInfo-Category=Latte Indicator X-KDE-PluginInfo-License=GPL v2+ diff --git a/indicators/org.kde.latte.indicator.plasma/metadata.desktop b/indicators/org.kde.latte.plasma/metadata.desktop similarity index 88% rename from indicators/org.kde.latte.indicator.plasma/metadata.desktop rename to indicators/org.kde.latte.plasma/metadata.desktop index 30aaa1bab..c07161bec 100644 --- a/indicators/org.kde.latte.indicator.plasma/metadata.desktop +++ b/indicators/org.kde.latte.plasma/metadata.desktop @@ -9,7 +9,7 @@ X-Latte-MainScript=ui/main.qml X-KDE-PluginInfo-Author=Michail Vourlakos X-KDE-PluginInfo-Email=mvourlakos@gmail.com -X-KDE-PluginInfo-Name=org.kde.latte.indicator.plasma +X-KDE-PluginInfo-Name=org.kde.latte.plasma X-KDE-PluginInfo-Version=0.1 X-KDE-PluginInfo-Category=Latte Indicator X-KDE-PluginInfo-License=GPL v2+ diff --git a/indicators/org.kde.latte.indicator.plasma/package/ui/BackLayer.qml b/indicators/org.kde.latte.plasma/package/ui/BackLayer.qml similarity index 100% rename from indicators/org.kde.latte.indicator.plasma/package/ui/BackLayer.qml rename to indicators/org.kde.latte.plasma/package/ui/BackLayer.qml diff --git a/indicators/org.kde.latte.indicator.plasma/package/ui/FrontLayer.qml b/indicators/org.kde.latte.plasma/package/ui/FrontLayer.qml similarity index 100% rename from indicators/org.kde.latte.indicator.plasma/package/ui/FrontLayer.qml rename to indicators/org.kde.latte.plasma/package/ui/FrontLayer.qml diff --git a/indicators/org.kde.latte.indicator.plasma/package/ui/main.qml b/indicators/org.kde.latte.plasma/package/ui/main.qml similarity index 100% rename from indicators/org.kde.latte.indicator.plasma/package/ui/main.qml rename to indicators/org.kde.latte.plasma/package/ui/main.qml diff --git a/indicators/org.kde.latte.indicator.unity/metadata.desktop b/indicators/org.kde.latte.unity/metadata.desktop similarity index 88% rename from indicators/org.kde.latte.indicator.unity/metadata.desktop rename to indicators/org.kde.latte.unity/metadata.desktop index 56a9f5b4e..25591ff89 100644 --- a/indicators/org.kde.latte.indicator.unity/metadata.desktop +++ b/indicators/org.kde.latte.unity/metadata.desktop @@ -9,7 +9,7 @@ X-Latte-MainScript=ui/main.qml X-KDE-PluginInfo-Author=Michail Vourlakos X-KDE-PluginInfo-Email=mvourlakos@gmail.com -X-KDE-PluginInfo-Name=org.kde.latte.indicator.unity +X-KDE-PluginInfo-Name=org.kde.latte.unity X-KDE-PluginInfo-Version=0.1 X-KDE-PluginInfo-Category=Latte Indicator X-KDE-PluginInfo-License=GPL v2+ diff --git a/indicators/org.kde.latte.indicator.unity/package/ui/BackLayer.qml b/indicators/org.kde.latte.unity/package/ui/BackLayer.qml similarity index 100% rename from indicators/org.kde.latte.indicator.unity/package/ui/BackLayer.qml rename to indicators/org.kde.latte.unity/package/ui/BackLayer.qml diff --git a/indicators/org.kde.latte.indicator.unity/package/ui/FrontLayer.qml b/indicators/org.kde.latte.unity/package/ui/FrontLayer.qml similarity index 100% rename from indicators/org.kde.latte.indicator.unity/package/ui/FrontLayer.qml rename to indicators/org.kde.latte.unity/package/ui/FrontLayer.qml diff --git a/indicators/org.kde.latte.indicator.unity/package/ui/main.qml b/indicators/org.kde.latte.unity/package/ui/main.qml similarity index 100% rename from indicators/org.kde.latte.indicator.unity/package/ui/main.qml rename to indicators/org.kde.latte.unity/package/ui/main.qml diff --git a/plasmoid/package/contents/ui/indicators/Manager.qml b/plasmoid/package/contents/ui/indicators/Manager.qml index 99a8bbd18..511b8cabd 100644 --- a/plasmoid/package/contents/ui/indicators/Manager.qml +++ b/plasmoid/package/contents/ui/indicators/Manager.qml @@ -35,7 +35,7 @@ Item{ readonly property bool isEnabled: true readonly property bool reversed: plasmoid.configuration.reverseLinesPosition - readonly property string type: "org.kde.latte.indicator.default" + readonly property string type: "org.kde.latte.default" readonly property Component indicatorComponent: latteStyleIndicator diff --git a/shell/package/contents/configuration/pages/EffectsConfig.qml b/shell/package/contents/configuration/pages/EffectsConfig.qml index 81272436a..ddf5df0b0 100644 --- a/shell/package/contents/configuration/pages/EffectsConfig.qml +++ b/shell/package/contents/configuration/pages/EffectsConfig.qml @@ -492,7 +492,7 @@ PlasmaComponents.Page { exclusiveGroup: indicatorStyleGroup tooltip: i18n("Use Latte style for your indicators") - readonly property string type: "org.kde.latte.indicator.default" + readonly property string type: "org.kde.latte.default" } PlasmaComponents.Button { @@ -503,7 +503,7 @@ PlasmaComponents.Page { exclusiveGroup: indicatorStyleGroup tooltip: i18n("Use Plasma style for your indicators") - readonly property string type: "org.kde.latte.indicator.plasma" + readonly property string type: "org.kde.latte.plasma" } PlasmaComponents.Button { @@ -514,7 +514,7 @@ PlasmaComponents.Page { exclusiveGroup: indicatorStyleGroup tooltip: i18n("Use Unity style for your indicators") - readonly property string type: "org.kde.latte.indicator.unity" + readonly property string type: "org.kde.latte.unity" } }