kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-23 13:33:50 +03:00
Code Issues Projects Releases Wiki Activity

simplify indicators names

Browse Source
This commit is contained in:
Michail Vourlakos 2019-03-24 18:44:27 +02:00
parent 5e420b597b
commit 28ef36a774
17 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/indicator/factory.cpp
View File

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

8
app/view/indicator.cpp
View File

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

2
app/view/indicator.h
View File

@ -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<QQmlComponent> m_component;
QPointer<QQmlComponent> m_plasmaComponent;

2
containment/package/contents/ui/indicators/Manager.qml
View File

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

4
indicators/CMakeLists.txt
View File

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

4
indicators/Messages.sh
View File

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

2
indicators/default/metadata.desktop
View File

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

2
indicators/org.kde.latte.indicator.plasma/metadata.desktop → indicators/org.kde.latte.plasma/metadata.desktop
View File

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

0
indicators/org.kde.latte.indicator.plasma/package/ui/BackLayer.qml → indicators/org.kde.latte.plasma/package/ui/BackLayer.qml
View File

0
indicators/org.kde.latte.indicator.plasma/package/ui/FrontLayer.qml → indicators/org.kde.latte.plasma/package/ui/FrontLayer.qml
View File

0
indicators/org.kde.latte.indicator.plasma/package/ui/main.qml → indicators/org.kde.latte.plasma/package/ui/main.qml
View File

2
indicators/org.kde.latte.indicator.unity/metadata.desktop → indicators/org.kde.latte.unity/metadata.desktop
View File

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

0
indicators/org.kde.latte.indicator.unity/package/ui/BackLayer.qml → indicators/org.kde.latte.unity/package/ui/BackLayer.qml
View File

0
indicators/org.kde.latte.indicator.unity/package/ui/FrontLayer.qml → indicators/org.kde.latte.unity/package/ui/FrontLayer.qml
View File

0
indicators/org.kde.latte.indicator.unity/package/ui/main.qml → indicators/org.kde.latte.unity/package/ui/main.qml
View File

2
plasmoid/package/contents/ui/indicators/Manager.qml
View File

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

6
shell/package/contents/configuration/pages/EffectsConfig.qml
View File

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