From 2a9ee6d2d9823f3dda7673f1e3bcf5d187ac7240 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Wed, 28 Dec 2016 23:07:17 +0200 Subject: [PATCH] renamed nowdock plasmoid to latte one --- CMakeLists.txt | 4 ++-- app/nowdockcorona.cpp | 2 +- containment/contents/ui/AppletItem.qml | 10 +++++----- containment/contents/ui/ConfigOverlay.qml | 2 +- containment/contents/ui/main.qml | 3 ++- icons/CMakeLists.txt | 2 +- ...plasmoid.svg => org.kde.latte.plasmoid.svg} | 0 plasmoid.metadata.desktop.template | 6 +++--- plasmoid/metadata.desktop.cmake | 14 +++++--------- po/Messages.sh | 2 +- po/app/el.po | 2 +- po/app/latte-dock.pot | 2 +- po/app/pl.po | 2 +- po/app/ro.po | 2 +- po/app/zh_TW.po | 2 +- ...plasma_applet_org.kde.latte.containment.pot | 2 +- po/plasmoid/el.po | 18 ++++++++++++------ po/plasmoid/pl.po | 16 +++++++++++----- ...> plasma_applet_org.kde.latte.plasmoid.pot} | 6 +++--- po/plasmoid/zh_TW.po | 16 +++++++++++----- po/shell/el.po | 2 +- po/shell/pl.po | 2 +- po/shell/plasma_shell_org.kde.latte.shell.pot | 2 +- po/shell/ro.po | 2 +- po/shell/zh_TW.po | 2 +- 25 files changed, 69 insertions(+), 54 deletions(-) rename icons/{org.kde.store.nowdock.plasmoid.svg => org.kde.latte.plasmoid.svg} (100%) rename po/plasmoid/{plasma_applet_org.kde.store.nowdock.plasmoid.pot => plasma_applet_org.kde.latte.plasmoid.pot} (98%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 742b2a677..f232aec31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,7 @@ ELSE(NOT GETTEXT_MSGFMT_EXECUTABLE) ENDFOREACH(_poFile ${PO_FILES}) #plasmoid translations - SET(catalogname-plasmoid plasma_applet_org.kde.store.nowdock.plasmoid) + SET(catalogname-plasmoid plasma_applet_org.kde.latte.plasmoid) ADD_CUSTOM_TARGET(translations-plasmoid ALL) FILE(GLOB PO_FILES_PLASMOID po/plasmoid/*.po) @@ -124,7 +124,7 @@ add_subdirectory(liblattedock) add_subdirectory(containment) plasma_install_package(build/containment/release org.kde.latte.containment) add_subdirectory(plasmoid) -plasma_install_package(build/plasmoid/release org.kde.store.nowdock.plasmoid) +plasma_install_package(build/plasmoid/release org.kde.latte.plasmoid) add_subdirectory(shell) plasma_install_package(build/shell/release org.kde.latte.shell shells shell) diff --git a/app/nowdockcorona.cpp b/app/nowdockcorona.cpp index 1fe6b4598..100b48ccd 100644 --- a/app/nowdockcorona.cpp +++ b/app/nowdockcorona.cpp @@ -226,7 +226,7 @@ void NowDockCorona::loadDefaultLayout() addDock(defaultContainment); - defaultContainment->createApplet(QStringLiteral("org.kde.store.nowdock.plasmoid")); + defaultContainment->createApplet(QStringLiteral("org.kde.latte.plasmoid")); defaultContainment->createApplet(QStringLiteral("org.kde.plasma.analogclock")); } diff --git a/containment/contents/ui/AppletItem.qml b/containment/contents/ui/AppletItem.qml index c1e722bec..235bb3900 100644 --- a/containment/contents/ui/AppletItem.qml +++ b/containment/contents/ui/AppletItem.qml @@ -42,7 +42,7 @@ Item { property int animationTime: root.durationTime* (1.2 *units.shortDuration) // 70 property int hoveredIndex: layoutsContainer.hoveredIndex property int index: -1 - property int appletMargin: (applet && (applet.pluginName === "org.kde.store.nowdock.plasmoid")) + property int appletMargin: (applet && (applet.pluginName === root.plasmoidName)) || isInternalViewSplitter || root.reverseLinesPosition ? 0 : root.statesLineSize property int maxWidth: root.isHorizontal ? root.height : root.width @@ -61,10 +61,10 @@ Item { property string title: isInternalViewSplitter ? "Now Dock Splitter" : "" property Item applet - property Item nowDock: applet && (applet.pluginName === "org.kde.store.nowdock.plasmoid") ? + property Item nowDock: applet && (applet.pluginName === root.plasmoidName) ? (applet.children[0] ? applet.children[0] : null) : null property Item appletWrapper: applet && - ((applet.pluginName === "org.kde.store.nowdock.plasmoid") || + ((applet.pluginName === root.plasmoidName) || (applet.pluginName === "org.kde.plasma.systemtray")) ? wrapper : wrapperContainer property alias containsMouse: appletMouseArea.containsMouse @@ -526,9 +526,9 @@ Item { active: container.applet &&((plasmoid.configuration.shadows === 1 /*Locked Applets*/ - && (!container.canBeHovered || (container.lockZoom && (applet.pluginName !== "org.kde.store.nowdock.plasmoid"))) ) + && (!container.canBeHovered || (container.lockZoom && (applet.pluginName !== root.plasmoidName))) ) || (plasmoid.configuration.shadows === 2 /*All Applets*/ - && (applet.pluginName !== "org.kde.store.nowdock.plasmoid"))) + && (applet.pluginName !== root.plasmoidName))) sourceComponent: DropShadow{ anchors.fill: parent diff --git a/containment/contents/ui/ConfigOverlay.qml b/containment/contents/ui/ConfigOverlay.qml index fe9ac8e82..fd23d7ccc 100644 --- a/containment/contents/ui/ConfigOverlay.qml +++ b/containment/contents/ui/ConfigOverlay.qml @@ -380,7 +380,7 @@ MouseArea { visible: currentApplet && ((currentApplet.applet && ((currentApplet.applet.pluginName === "org.kde.plasma.systemtray") - || (currentApplet.applet.pluginName === "org.kde.store.nowdock.plasmoid")) ) + || (currentApplet.applet.pluginName === root.plasmoidName)) ) || (currentApplet.isInternalViewSplitter)) ? false : true diff --git a/containment/contents/ui/main.qml b/containment/contents/ui/main.qml index 800f5e35a..9136d6607 100644 --- a/containment/contents/ui/main.qml +++ b/containment/contents/ui/main.qml @@ -81,9 +81,10 @@ DragDrop.DropArea { property int panelAlignment: plasmoid.immutable ? plasmoid.configuration.panelPosition : Latte.Dock.Center // property int panelAlignment: plasmoid.configuration.panelPosition - property real zoomFactor: windowSystem.compositingActive ? ( 1 + (plasmoid.configuration.zoomLevel / 20) ) : 1 + readonly property string plasmoidName: "org.kde.latte.plasmoid" + property var iconsArray: [16, 22, 32, 48, 64, 96, 128, 256] property var layoutManager: LayoutManager diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt index 9adc37914..32ba9e51f 100644 --- a/icons/CMakeLists.txt +++ b/icons/CMakeLists.txt @@ -10,5 +10,5 @@ ecm_install_icons(ICONS THEME hicolor DESTINATION ${ICON_INSTALL_DIR} ) -install(FILES org.kde.store.nowdock.plasmoid.svg DESTINATION ${ICON_INSTALL_DIR}/breeze/applets/256) +install(FILES org.kde.latte.plasmoid.svg DESTINATION ${ICON_INSTALL_DIR}/breeze/applets/256) diff --git a/icons/org.kde.store.nowdock.plasmoid.svg b/icons/org.kde.latte.plasmoid.svg similarity index 100% rename from icons/org.kde.store.nowdock.plasmoid.svg rename to icons/org.kde.latte.plasmoid.svg diff --git a/plasmoid.metadata.desktop.template b/plasmoid.metadata.desktop.template index 488229db9..6ab029e6e 100644 --- a/plasmoid.metadata.desktop.template +++ b/plasmoid.metadata.desktop.template @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=Now Dock -_Comment=Switch between running applications +_Name=Latte Plasmoid +_Comment=Plasmoid from the Latte Dock Type=Service @@ -11,7 +11,7 @@ X-Plasma-MainScript=ui/main.qml X-Plasma-Provides=org.kde.plasma.multitasking X-KDE-PluginInfo-Author=@AUTHOR@ X-KDE-PluginInfo-Email=@EMAIL@ -X-KDE-PluginInfo-Name=org.kde.store.nowdock.plasmoid +X-KDE-PluginInfo-Name=org.kde.latte.plasmoid X-KDE-PluginInfo-Version=@VERSION@ X-KDE-PluginInfo-Website=@WEBSITE@ X-KDE-PluginInfo-Category=Windows and Tasks diff --git a/plasmoid/metadata.desktop.cmake b/plasmoid/metadata.desktop.cmake index 6e83c22eb..5fed46bca 100644 --- a/plasmoid/metadata.desktop.cmake +++ b/plasmoid/metadata.desktop.cmake @@ -1,12 +1,8 @@ [Desktop Entry] -Name=Now Dock -Name[el]=Now Dock -Name[pl]=Now Dock -Name[zh_TW]=Now Dock -Comment=Switch between running applications -Comment[el]=Εναλλαγή μεταξύ ενεργών εφαρμογών -Comment[pl]=Przełączanie między uruchomionymi aplikacjami -Comment[zh_TW]=在執行中的應用程式間切換 +Name=Latte Plasmoid +Name[el]=Latte +Comment=Plasmoid from the Latte Dock +Comment[el]=Ένα πλασμoϊδές από τη σουίτα Latte Type=Service @@ -17,7 +13,7 @@ X-Plasma-MainScript=ui/main.qml X-Plasma-Provides=org.kde.plasma.multitasking X-KDE-PluginInfo-Author=@AUTHOR@ X-KDE-PluginInfo-Email=@EMAIL@ -X-KDE-PluginInfo-Name=org.kde.store.nowdock.plasmoid +X-KDE-PluginInfo-Name=org.kde.latte.plasmoid X-KDE-PluginInfo-Version=@VERSION@ X-KDE-PluginInfo-Website=@WEBSITE@ X-KDE-PluginInfo-Category=Windows and Tasks diff --git a/po/Messages.sh b/po/Messages.sh index b5ca7d48b..ebd5e3b9b 100644 --- a/po/Messages.sh +++ b/po/Messages.sh @@ -6,7 +6,7 @@ PROJECTPATH="../../containment" # project path BUGADDR="https://github.com/psifidotos/latte-dock/" # MSGID-Bugs WDIR="`pwd`/containment" # working dir -PROJECTPLASMOID="plasma_applet_org.kde.store.nowdock.plasmoid" # project name +PROJECTPLASMOID="plasma_applet_org.kde.latte.plasmoid" # project name PROJECTPATHPLASMOID="../../plasmoid" # project path WDIRPLASMOID="`pwd`/plasmoid" # working dir diff --git a/po/app/el.po b/po/app/el.po index adaca6378..bd48e8f02 100644 --- a/po/app/el.po +++ b/po/app/el.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n" -"POT-Creation-Date: 2016-12-28 22:42+0200\n" +"POT-Creation-Date: 2016-12-28 22:51+0200\n" "PO-Revision-Date: 2016-12-28 18:07+0200\n" "Last-Translator: Michail Vοurlakos \n" "Language-Team: Greek \n" diff --git a/po/app/latte-dock.pot b/po/app/latte-dock.pot index 597296c11..b051a197f 100644 --- a/po/app/latte-dock.pot +++ b/po/app/latte-dock.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n" -"POT-Creation-Date: 2016-12-28 22:42+0200\n" +"POT-Creation-Date: 2016-12-28 22:51+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/app/pl.po b/po/app/pl.po index ef549d6d2..2c91ad7e2 100644 --- a/po/app/pl.po +++ b/po/app/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n" -"POT-Creation-Date: 2016-12-28 22:42+0200\n" +"POT-Creation-Date: 2016-12-28 22:51+0200\n" "PO-Revision-Date: 2016-10-14 14:20+0100\n" "Last-Translator: Damian Kopeć \n" "Language-Team: Polish \n" diff --git a/po/app/ro.po b/po/app/ro.po index 740177ee2..a92665ffd 100644 --- a/po/app/ro.po +++ b/po/app/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n" -"POT-Creation-Date: 2016-12-28 22:42+0200\n" +"POT-Creation-Date: 2016-12-28 22:51+0200\n" "PO-Revision-Date: 2016-09-25 04:15+0300\n" "Last-Translator: Viorel-Cătălin Răpițeanu \n" diff --git a/po/app/zh_TW.po b/po/app/zh_TW.po index 398a59411..34f79ee9f 100644 --- a/po/app/zh_TW.po +++ b/po/app/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n" -"POT-Creation-Date: 2016-12-28 22:42+0200\n" +"POT-Creation-Date: 2016-12-28 22:51+0200\n" "PO-Revision-Date: 2016-11-26 17:31+0800\n" "Last-Translator: Jeff Huang \n" "Language-Team: Chinese \n" diff --git a/po/containment/plasma_applet_org.kde.latte.containment.pot b/po/containment/plasma_applet_org.kde.latte.containment.pot index 641a39547..7a3f10e16 100644 --- a/po/containment/plasma_applet_org.kde.latte.containment.pot +++ b/po/containment/plasma_applet_org.kde.latte.containment.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n" -"POT-Creation-Date: 2016-12-28 22:42+0200\n" +"POT-Creation-Date: 2016-12-28 22:51+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/plasmoid/el.po b/po/plasmoid/el.po index 89b507df3..043ab4153 100644 --- a/po/plasmoid/el.po +++ b/po/plasmoid/el.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n" -"POT-Creation-Date: 2016-12-28 22:42+0200\n" -"PO-Revision-Date: 2016-11-25 00:01+0200\n" +"POT-Creation-Date: 2016-12-28 22:51+0200\n" +"PO-Revision-Date: 2016-12-28 22:53+0200\n" "Last-Translator: Michail Vοurlakos \n" "Language-Team: Greek \n" "Language: el_GR\n" @@ -356,9 +356,15 @@ msgid "Close" msgstr "Κλείσιμο" #: rc.cpp:1 -msgid "Now Dock" -msgstr "Now Dock" +msgid "Latte Plasmoid" +msgstr "Latte" #: rc.cpp:2 -msgid "Switch between running applications" -msgstr "Εναλλαγή μεταξύ ενεργών εφαρμογών" +msgid "Plasmoid from the Latte Dock" +msgstr "Ένα πλασμoϊδές από τη σουίτα Latte" + +#~ msgid "Now Dock" +#~ msgstr "Now Dock" + +#~ msgid "Switch between running applications" +#~ msgstr "Εναλλαγή μεταξύ ενεργών εφαρμογών" diff --git a/po/plasmoid/pl.po b/po/plasmoid/pl.po index a976f5c44..6ebd787ef 100644 --- a/po/plasmoid/pl.po +++ b/po/plasmoid/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n" -"POT-Creation-Date: 2016-12-28 22:42+0200\n" +"POT-Creation-Date: 2016-12-28 22:51+0200\n" "PO-Revision-Date: 2016-10-16 13:14+0100\n" "Last-Translator: Damian Kopeć \n" "Language-Team: Polish \n" @@ -356,9 +356,15 @@ msgid "Close" msgstr "Zamknij" #: rc.cpp:1 -msgid "Now Dock" -msgstr "Now Dock" +msgid "Latte Plasmoid" +msgstr "" #: rc.cpp:2 -msgid "Switch between running applications" -msgstr "Przełączanie między uruchomionymi aplikacjami" +msgid "Plasmoid from the Latte Dock" +msgstr "" + +#~ msgid "Now Dock" +#~ msgstr "Now Dock" + +#~ msgid "Switch between running applications" +#~ msgstr "Przełączanie między uruchomionymi aplikacjami" diff --git a/po/plasmoid/plasma_applet_org.kde.store.nowdock.plasmoid.pot b/po/plasmoid/plasma_applet_org.kde.latte.plasmoid.pot similarity index 98% rename from po/plasmoid/plasma_applet_org.kde.store.nowdock.plasmoid.pot rename to po/plasmoid/plasma_applet_org.kde.latte.plasmoid.pot index 9558fef74..8e6efa84b 100644 --- a/po/plasmoid/plasma_applet_org.kde.store.nowdock.plasmoid.pot +++ b/po/plasmoid/plasma_applet_org.kde.latte.plasmoid.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n" -"POT-Creation-Date: 2016-12-28 22:42+0200\n" +"POT-Creation-Date: 2016-12-28 22:51+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -354,9 +354,9 @@ msgid "Close" msgstr "" #: rc.cpp:1 -msgid "Now Dock" +msgid "Latte Plasmoid" msgstr "" #: rc.cpp:2 -msgid "Switch between running applications" +msgid "Plasmoid from the Latte Dock" msgstr "" diff --git a/po/plasmoid/zh_TW.po b/po/plasmoid/zh_TW.po index 956c38e01..f6d355be4 100644 --- a/po/plasmoid/zh_TW.po +++ b/po/plasmoid/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n" -"POT-Creation-Date: 2016-12-28 22:42+0200\n" +"POT-Creation-Date: 2016-12-28 22:51+0200\n" "PO-Revision-Date: 2016-11-26 17:34+0800\n" "Last-Translator: Jeff Huang \n" "Language-Team: Chinese \n" @@ -354,9 +354,15 @@ msgid "Close" msgstr "關閉" #: rc.cpp:1 -msgid "Now Dock" -msgstr "Now Dock" +msgid "Latte Plasmoid" +msgstr "" #: rc.cpp:2 -msgid "Switch between running applications" -msgstr "在執行中的應用程式間切換" +msgid "Plasmoid from the Latte Dock" +msgstr "" + +#~ msgid "Now Dock" +#~ msgstr "Now Dock" + +#~ msgid "Switch between running applications" +#~ msgstr "在執行中的應用程式間切換" diff --git a/po/shell/el.po b/po/shell/el.po index 38a579128..d07a80333 100644 --- a/po/shell/el.po +++ b/po/shell/el.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n" -"POT-Creation-Date: 2016-12-28 22:42+0200\n" +"POT-Creation-Date: 2016-12-28 22:51+0200\n" "PO-Revision-Date: 2016-12-25 18:54+0200\n" "Last-Translator: Michail Vοurlakos \n" "Language-Team: Greek \n" diff --git a/po/shell/pl.po b/po/shell/pl.po index a3c123cad..07980971d 100644 --- a/po/shell/pl.po +++ b/po/shell/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n" -"POT-Creation-Date: 2016-12-28 22:42+0200\n" +"POT-Creation-Date: 2016-12-28 22:51+0200\n" "PO-Revision-Date: 2016-10-14 14:20+0100\n" "Last-Translator: Damian Kopeć \n" "Language-Team: Polish \n" diff --git a/po/shell/plasma_shell_org.kde.latte.shell.pot b/po/shell/plasma_shell_org.kde.latte.shell.pot index 7ca2c505b..93217d007 100644 --- a/po/shell/plasma_shell_org.kde.latte.shell.pot +++ b/po/shell/plasma_shell_org.kde.latte.shell.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n" -"POT-Creation-Date: 2016-12-28 22:42+0200\n" +"POT-Creation-Date: 2016-12-28 22:51+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/shell/ro.po b/po/shell/ro.po index 71fc1820d..ef6ad53ec 100644 --- a/po/shell/ro.po +++ b/po/shell/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n" -"POT-Creation-Date: 2016-12-28 22:42+0200\n" +"POT-Creation-Date: 2016-12-28 22:51+0200\n" "PO-Revision-Date: 2016-09-25 04:15+0300\n" "Last-Translator: Viorel-Cătălin Răpițeanu \n" diff --git a/po/shell/zh_TW.po b/po/shell/zh_TW.po index 2152981ce..e0040cca4 100644 --- a/po/shell/zh_TW.po +++ b/po/shell/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n" -"POT-Creation-Date: 2016-12-28 22:42+0200\n" +"POT-Creation-Date: 2016-12-28 22:51+0200\n" "PO-Revision-Date: 2016-11-26 17:31+0800\n" "Last-Translator: Jeff Huang \n" "Language-Team: Chinese \n"