Hello community, here is the log from the commit of package latte-dock for openSUSE:Factory checked in at 2018-12-31 09:47:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/latte-dock (Old) and /work/SRC/openSUSE:Factory/.latte-dock.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "latte-dock" Mon Dec 31 09:47:15 2018 rev:7 rq:662054 version:0.8.4 Changes: -------- --- /work/SRC/openSUSE:Factory/latte-dock/latte-dock.changes 2018-11-26 10:32:56.356842853 +0100 +++ /work/SRC/openSUSE:Factory/.latte-dock.new.28833/latte-dock.changes 2018-12-31 09:47:53.794142360 +0100 @@ -1,0 +2,15 @@ +Sun Dec 30 08:15:40 UTC 2018 - [email protected] + +- Update to 0.8.4 + * Restore mouse wheel action to activate your tasks that broke + with v0.8.3 + * Support fillWidth(s)/Height(s) applets in Left/Center/Right + alignments, add a plasma taskmanager to see what happens + * Do not break applets order in Justify alignment when some of + the applets in the layout are not found in the system + * Fix a crash that was related to grouped tasks + * Improve launchers synchronization between different + docks/panels +- Mark license file as %license instead of %doc + +------------------------------------------------------------------- Old: ---- latte-dock-0.8.3.tar.xz New: ---- latte-dock-0.8.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ latte-dock.spec ++++++ --- /var/tmp/diff_new_pack.tWJ3ee/_old 2018-12-31 09:47:54.290141954 +0100 +++ /var/tmp/diff_new_pack.tWJ3ee/_new 2018-12-31 09:47:54.290141954 +0100 @@ -13,13 +13,13 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define kf5_version 5.38.0 Name: latte-dock -Version: 0.8.3 +Version: 0.8.4 Release: 0 Summary: Task manager License: GPL-2.0-or-later @@ -50,10 +50,10 @@ BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-util) BuildRequires: pkgconfig(zlib) +Recommends: %{name}-lang %if 0%{?is_opensuse} BuildRequires: update-desktop-files %endif -Recommends: %{name}-lang %description Latte is a dock based on plasma frameworks that animating its @@ -83,7 +83,7 @@ %files %doc README.md -%doc COPYING.LIB +%license COPYING.LIB %config %{_kf5_sysconfdir}/xdg/latte-layouts.knsrc %{_kf5_bindir}/%{name} %{_kf5_plasmadir}/ ++++++ latte-dock-0.8.3.tar.xz -> latte-dock-0.8.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/latte-dock-0.8.3/CHANGELOG.md new/latte-dock-0.8.4/CHANGELOG.md --- old/latte-dock-0.8.3/CHANGELOG.md 2018-11-23 17:37:07.328872060 +0100 +++ new/latte-dock-0.8.4/CHANGELOG.md 2018-12-28 22:59:14.787096213 +0100 @@ -1,5 +1,15 @@ #**CHANGELOG**# +#### Version 0.8.4 + +* FIX: restore mouse wheel action to activate your tasks that broke with v0.8.3 +* FIX: support fillWidth(s)/Height(s) applets in Left/Center/Right alignments, +add a plasma taskmanager to see what happens +* FIX: do not break applets order in Justify alignment when some of +the applets in the layout are not found in the system +* fix: a crash that was related to grouped tasks +* fix: improve launchers synchronization between different docks/panels + #### Version 0.8.3 * FIX: support multi-screen plasmoids that use plasmoid.screenGeometry such diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/latte-dock-0.8.3/CMakeLists.txt new/latte-dock-0.8.4/CMakeLists.txt --- old/latte-dock-0.8.3/CMakeLists.txt 2018-11-23 17:39:40.030116870 +0100 +++ new/latte-dock-0.8.4/CMakeLists.txt 2018-12-28 23:00:14.475864469 +0100 @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0 FATAL_ERROR) set(CMAKE_CXX_STANDARD 14) -set(VERSION 0.8.3) +set(VERSION 0.8.4) set(AUTHOR "Michail Vourlakos, Smith Ar") set(EMAIL "[email protected], [email protected]") set(WEBSITE "https://github.com/psifidotos/Latte-Dock";) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/latte-dock-0.8.3/README.md new/latte-dock-0.8.4/README.md --- old/latte-dock-0.8.3/README.md 2018-11-23 17:37:07.328872060 +0100 +++ new/latte-dock-0.8.4/README.md 2018-12-28 22:59:14.787096213 +0100 @@ -78,7 +78,7 @@ ### Void Linux -- [Void Linux](https://github.com/voidlinux/void-packages/tree/master/srcpkgs/latte-dock) +- [Void Linux](https://github.com/void-linux/void-packages/tree/master/srcpkgs/latte-dock) ### FreeBSD - [FreeBSD Port](https://www.freshports.org/deskutils/latte-dock/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/latte-dock-0.8.3/containment/package/contents/code/LayoutManager.js new/latte-dock-0.8.4/containment/package/contents/code/LayoutManager.js --- old/latte-dock-0.8.3/containment/package/contents/code/LayoutManager.js 2018-11-23 17:37:07.344872191 +0100 +++ new/latte-dock-0.8.4/containment/package/contents/code/LayoutManager.js 2018-12-28 22:59:14.795096311 +0100 @@ -63,11 +63,27 @@ // console.log("splitters restored:"+plasmoid.configuration.splitterPosition+ " - " + plasmoid.configuration.splitterPosition2); //add the splitters in the correct position if they exist if(plasmoid.configuration.splitterPosition !== -1){ - root.addInternalViewSplitter(plasmoid.configuration.splitterPosition); + var missingApplets = 0; + + for (var i=0; i<plasmoid.configuration.splitterPosition; ++i) { + if (appletsOrder[i] === undefined) { + missingApplets = missingApplets + 1; + } + } + + root.addInternalViewSplitter(plasmoid.configuration.splitterPosition-missingApplets); } if(plasmoid.configuration.splitterPosition2 !== -1){ - root.addInternalViewSplitter(plasmoid.configuration.splitterPosition2); + var missingApplets2 = 0; + + for (var i=0; i<plasmoid.configuration.splitterPosition2; ++i) { + if (appletsOrder[i] === undefined) { + missingApplets2 = missingApplets2 + 1; + } + } + + root.addInternalViewSplitter(plasmoid.configuration.splitterPosition2-missingApplets2); } //rewrite, so if in the orders there were now invalid ids or if some were missing creates a correct list instead diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/latte-dock-0.8.3/containment/package/contents/code/MathTools.js new/latte-dock-0.8.4/containment/package/contents/code/MathTools.js --- old/latte-dock-0.8.3/containment/package/contents/code/MathTools.js 1970-01-01 01:00:00.000000000 +0100 +++ new/latte-dock-0.8.4/containment/package/contents/code/MathTools.js 2018-12-28 22:59:14.795096311 +0100 @@ -0,0 +1,25 @@ +/* +* Copyright 2018 Michail Vourlakos <[email protected]> +* +* This file is part of Latte-Dock +* +* Latte-Dock is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* Latte-Dock is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + + +//! bound the preferred value between minimum and maximum boundaries +function bound(min, pref, max) +{ + return Math.max(min, Math.min(pref, max)); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/latte-dock-0.8.3/containment/package/contents/ui/LayoutsContainer.qml new/latte-dock-0.8.4/containment/package/contents/ui/LayoutsContainer.qml --- old/latte-dock-0.8.3/containment/package/contents/ui/LayoutsContainer.qml 2018-11-23 17:37:07.348872224 +0100 +++ new/latte-dock-0.8.4/containment/package/contents/ui/LayoutsContainer.qml 2018-12-28 22:59:14.799096360 +0100 @@ -131,7 +131,7 @@ slotAnimationsNeedLength(1); } - HeuristicTools.updateSizeForAppletsInFill(); + layoutsContainer.updateSizeForAppletsInFill(); delayUpdateMaskArea.start(); } @@ -156,7 +156,7 @@ slotAnimationsNeedLength(1); } - HeuristicTools.updateSizeForAppletsInFill(); + layoutsContainer.updateSizeForAppletsInFill(); delayUpdateMaskArea.start(); } @@ -230,9 +230,9 @@ return no; } - onFillAppletsChanged: HeuristicTools.updateSizeForAppletsInFill(); - onShownAppletsChanged: HeuristicTools.updateSizeForAppletsInFill(); - onSizeWithNoFillAppletsChanged: HeuristicTools.updateSizeForAppletsInFill(); + onFillAppletsChanged: layoutsContainer.updateSizeForAppletsInFill(); + onShownAppletsChanged: layoutsContainer.updateSizeForAppletsInFill(); + onSizeWithNoFillAppletsChanged: layoutsContainer.updateSizeForAppletsInFill(); states:[ State { @@ -357,9 +357,9 @@ return no; } - onFillAppletsChanged: HeuristicTools.updateSizeForAppletsInFill(); - onShownAppletsChanged: HeuristicTools.updateSizeForAppletsInFill(); - onSizeWithNoFillAppletsChanged: HeuristicTools.updateSizeForAppletsInFill(); + onFillAppletsChanged: layoutsContainer.updateSizeForAppletsInFill(); + onShownAppletsChanged: layoutsContainer.updateSizeForAppletsInFill(); + onSizeWithNoFillAppletsChanged: layoutsContainer.updateSizeForAppletsInFill(); transitions: Transition { enabled: editModeVisual.plasmaEditMode @@ -623,9 +623,9 @@ return no; } - onFillAppletsChanged: HeuristicTools.updateSizeForAppletsInFill(); - onShownAppletsChanged: HeuristicTools.updateSizeForAppletsInFill(); - onSizeWithNoFillAppletsChanged: HeuristicTools.updateSizeForAppletsInFill(); + onFillAppletsChanged: layoutsContainer.updateSizeForAppletsInFill(); + onShownAppletsChanged: layoutsContainer.updateSizeForAppletsInFill(); + onSizeWithNoFillAppletsChanged: layoutsContainer.updateSizeForAppletsInFill(); states:[ State { @@ -685,6 +685,16 @@ function updateSizeForAppletsInFill() { - HeuristicTools.updateSizeForAppletsInFill(); + if (!updateSizeForAppletsInFillTimer.running) { + updateSizeForAppletsInFillTimer.start(); + } + } + + //! This timer is needed in order to reduce the calls to heavy cpu function + //! HeuristicTools.updateSizeForAppletsInFill() + Timer{ + id: updateSizeForAppletsInFillTimer + interval: 10 + onTriggered: HeuristicTools.updateSizeForAppletsInFill(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/latte-dock-0.8.3/containment/package/contents/ui/applet/AppletItemWrapper.qml new/latte-dock-0.8.4/containment/package/contents/ui/applet/AppletItemWrapper.qml --- old/latte-dock-0.8.3/containment/package/contents/ui/applet/AppletItemWrapper.qml 2018-11-23 17:37:07.348872224 +0100 +++ new/latte-dock-0.8.4/containment/package/contents/ui/applet/AppletItemWrapper.qml 2018-12-28 22:59:14.799096360 +0100 @@ -28,6 +28,7 @@ import org.kde.latte 0.1 as Latte +import "../../code/MathTools.js" as MathTools Item{ id: wrapper @@ -44,15 +45,17 @@ } //! width for applets that use fillWidth/fillHeight such plasma taskmanagers and AWC - if (container.needsFillSpace) { - if (root.panelAlignment !== Latte.Dock.Justify && root.isHorizontal) { - var constrainedWidth = container.sizeForFill>-1 ? Math.min(container.sizeForFill, applet.Layout.preferredWidth) : - applet.Layout.preferredWidth; + if (container.needsFillSpace && root.isHorizontal) { + if (root.panelAlignment !== Latte.Dock.Justify) { + var maximumValue = (applet.Layout.maximumWidth === Infinity) || applet.Layout.maximumWidth === -1 ? + container.sizeForFill : Math.min(container.sizeForFill, applet.Layout.maximumWidth); + + var constrainedWidth = MathTools.bound(applet.Layout.minimumWidth, applet.Layout.preferredWidth, maximumValue); return root.editMode ? Math.max(constrainedWidth, root.iconSize) : constrainedWidth; } - if((container.sizeForFill>-1) && root.isHorizontal){ + if(container.sizeForFill>-1){ return container.sizeForFill; } } @@ -81,16 +84,18 @@ return root.iconSize; } - if (container.needsFillSpace) { - //! height for applets that use fillWidth/fillHeight such plasma taskmanagers and AWC - if (root.panelAlignment !== Latte.Dock.Justify && root.isVertical) { - var constrainedHeight = container.sizeForFill>-1 ? Math.min(container.sizeForFill, applet.Layout.preferredHeight) : - applet.Layout.preferredHeight; + //! height for applets that use fillWidth/fillHeight such plasma taskmanagers and AWC + if (container.needsFillSpace && root.isVertical) { + if (root.panelAlignment !== Latte.Dock.Justify) { + var maximumValue = (applet.Layout.maximumHeight === Infinity) || applet.Layout.maximumHeight === -1 ? + container.sizeForFill : Math.min(container.sizeForFill, applet.Layout.maximumHeight); + + var constrainedHeight = MathTools.bound(applet.Layout.minimumHeight, applet.Layout.preferredHeight, maximumValue); return root.editMode ? Math.max(constrainedHeight, root.iconSize) : constrainedHeight; } - if ((container.sizeForFill>-1) && root.isVertical){ + if (container.sizeForFill>-1){ return container.sizeForFill; } } @@ -261,6 +266,10 @@ } function updateLayoutHeight(){ + if (container.needsFillSpace && root.isVertical) { + layoutsContainer.updateSizeForAppletsInFill(); + return; + } if(container.isInternalViewSplitter){ if(!root.editMode) @@ -307,6 +316,10 @@ } function updateLayoutWidth(){ + if (container.needsFillSpace && root.isHorizontal) { + layoutsContainer.updateSizeForAppletsInFill(); + return; + } if(container.isInternalViewSplitter){ if(!root.editMode) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/latte-dock-0.8.3/containment/package/metadata.desktop new/latte-dock-0.8.4/containment/package/metadata.desktop --- old/latte-dock-0.8.3/containment/package/metadata.desktop 2018-11-23 17:37:07.348872224 +0100 +++ new/latte-dock-0.8.4/containment/package/metadata.desktop 2018-12-28 22:59:14.799096360 +0100 @@ -55,7 +55,7 @@ X-KDE-PluginInfo-Author=Michail Vourlakos, Smith Ar [email protected], [email protected] X-KDE-PluginInfo-Name=org.kde.latte.containment -X-KDE-PluginInfo-Version=0.8.3 +X-KDE-PluginInfo-Version=0.8.4 X-KDE-PluginInfo-Website=https://github.com/psifidotos/Latte-Dock X-KDE-PluginInfo-Category=X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-License=GPL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/latte-dock-0.8.3/plasmoid/package/contents/ui/main.qml new/latte-dock-0.8.4/plasmoid/package/contents/ui/main.qml --- old/latte-dock-0.8.3/plasmoid/package/contents/ui/main.qml 2018-11-23 17:37:07.356872289 +0100 +++ new/latte-dock-0.8.4/plasmoid/package/contents/ui/main.qml 2018-12-28 22:59:14.803096409 +0100 @@ -1419,6 +1419,7 @@ launchers.length = 0; parabolicManager.updateTasksEdgesIndexes(); root.separatorsUpdated(); + tasksModel.syncLaunchers(); } else { var currentLaunchers = currentListViewLauncherList(); @@ -1710,6 +1711,7 @@ if (group === latteDock.launchersGroup) { tasksModel.requestAddLauncher(launcher); launchersUpdatedFor(launcher); + tasksModel.syncLaunchers(); } } @@ -1718,6 +1720,7 @@ root.launcherForRemoval = launcher; tasksModel.requestRemoveLauncher(launcher); launchersUpdatedFor(launcher); + tasksModel.syncLaunchers(); } } @@ -1731,6 +1734,7 @@ tasksModel.requestAddLauncherToActivity(launcher, activity); launchersUpdatedFor(launcher); + tasksModel.syncLaunchers(); } } @@ -1742,6 +1746,7 @@ tasksModel.requestRemoveLauncherFromActivity(launcher, activity); launchersUpdatedFor(launcher); + tasksModel.syncLaunchers(); } } @@ -1753,10 +1758,10 @@ function extSignalMoveTask(group, from, to) { if (group === latteDock.launchersGroup && !root.dragSource) { - //! disable syncing for moving launchers action in favor of validatorOrder launchersSignal - /* tasksModel.move(from, to); + tasksModel.move(from, to); parabolicManager.updateTasksEdgesIndexes(); - root.separatorsUpdated();*/ + root.separatorsUpdated(); + tasksModel.syncLaunchers(); } } @@ -1880,6 +1885,7 @@ tasksModel.requestAddLauncher(url); launchersUpdatedFor(url); + tasksModel.syncLaunchers(); } function resetDragSource() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/latte-dock-0.8.3/plasmoid/package/contents/ui/task/TaskWindows.qml new/latte-dock-0.8.4/plasmoid/package/contents/ui/task/TaskWindows.qml --- old/latte-dock-0.8.3/plasmoid/package/contents/ui/task/TaskWindows.qml 2018-11-23 17:37:07.356872289 +0100 +++ new/latte-dock-0.8.4/plasmoid/package/contents/ui/task/TaskWindows.qml 2018-12-28 22:59:14.803096409 +0100 @@ -27,7 +27,17 @@ Item{ id: windowsContainer - property int windowsCount: 0 + property int windowsCount: { + if (isLauncher) { + return 0; + } + + if (isGroupParent) { + return windowsRepeater.count; + } + + return 1; + } property bool isLauncher: IsLauncher ? true : false property bool isStartup: IsStartup ? true : false @@ -35,60 +45,67 @@ property int lastActiveWinInGroup: -1 - onIsLauncherChanged: updateCounter(); - // onIsStartupChanged: updateCounter(); - // onIsWindowChanged: updateCounter(); - //states that exist in windows in a Group of windows property bool hasMinimized: false; property bool hasShown: false; property bool hasActive: false; - //FIXME: For some reason the index is not updated correctly in some cases (e.g. window dragging, repositioning launchers) - // and this way much beautiful information are lost, an activity change back and return, - // it fixes this sometimes... Repeater{ + id: windowsRepeater model:DelegateModel { id: windowsLocalModel - model: tasksModel //icList.model - /* rootIndex: { - if (root.inDraggingPhase) { - return tasksModel.makeModelIndex(lastValidIndex); - } + model: tasksModel - return tasksModel.makeModelIndex(currentIndex >=0 ? currentIndex : index) - }*/ - - property int currentIndex: -1 + delegate: Item{ + readonly property string title: display !== undefined ? display : "" + readonly property bool isMinimized: IsMinimized === true ? true : false + readonly property bool isActive: IsActive === true ? true : false - //! Trying to avoid a crash during dragging tasks/launchers - Binding{ - target: windowsLocalModel - property: "rootIndex" - - value: { - if (root.inDraggingPhase) { - return 0; + onIsMinimizedChanged: windowsContainer.updateStates(); + onIsActiveChanged: { + if (isActive) { + windowsContainer.lastActiveWinInGroup = (LegacyWinIdList!==undefined ? LegacyWinIdList[0] : 0); } - - return tasksModel.makeModelIndex(currentIndex >=0 ? currentIndex : index) + windowsContainer.updateStates(); } } - delegate: Item{ - readonly property string title: display - readonly property bool isMinimized: IsMinimized === true ? true : false - - onIsMinimizedChanged: windowsContainer.initializeStates(); + Component.onCompleted: { + rootIndex = mainItemContainer.modelIndex(); } } + } + + Connections{ + target: mainItemContainer + onItemIndexChanged: windowsContainer.updateStates(); + } + + Connections{ + target: root + onInDraggingPhaseChanged: windowsContainer.updateStates(); + } - onCountChanged:{ - windowsContainer.updateCounter(); + //! try to give the time to the model to update its states in order to + //! avoid any suspicious crashes during dragging grouped tasks that + //! are synced between multiple panels/docks. At the same time in updateStates() + //! function we block any DelegateModel updates when the user is dragging + //! a task because this could create crashes + Timer{ + id: initializeStatesTimer + interval: 200 + onTriggered: windowsContainer.initializeStates(); + } + + function updateStates() { + if (!root.inDraggingPhase) { + initializeStatesTimer.start(); } } function initializeStates(){ + windowsLocalModel.rootIndex = mainItemContainer.modelIndex(); + hasMinimized = false; hasShown = false; hasActive = false; @@ -109,7 +126,6 @@ } function checkInternalStates(){ - windowsLocalModel.currentIndex = index; var childs = windowsLocalModel.items; for(var i=0; i<childs.count; ++i){ @@ -126,22 +142,14 @@ } function windowsTitles() { + windowsLocalModel.rootIndex = mainItemContainer.modelIndex(); var result = new Array; - - windowsLocalModel.currentIndex = index; var childs = windowsLocalModel.items; for(var i=0; i<childs.count; ++i){ var kid = childs.get(i); var title = kid.model.display - //console.log(title); - // FIXME: we may need a way to remove the app name from the end - /* var lst = title.lastIndexOf(" - "); - if (lst > 0) { - title = title.substring(0, lst); - }*/ - result.push(title); } @@ -151,13 +159,13 @@ //! function which is used to cycle activation into //! a group of windows function activateNextTask() { + windowsLocalModel.rootIndex = mainItemContainer.modelIndex(); + if (!mainItemContainer.isGroupParent) { return; } - windowsLocalModel.currentIndex = index; var childs = windowsLocalModel.items; - var nextAvailableWindow = -1; for(var i=0; i<childs.count; ++i){ @@ -194,11 +202,12 @@ //! function which is used to cycle activation into //! a group of windows backwise function activatePreviousTask() { + windowsLocalModel.rootIndex = mainItemContainer.modelIndex(); + if (!mainItemContainer.isGroupParent) { return; } - windowsLocalModel.currentIndex = index; var childs = windowsLocalModel.items; //indicates than nothing was found @@ -234,69 +243,11 @@ tasksModel.requestActivate(tasksModel.makeModelIndex(index,prevAvailableWindow)); } - - - // keep a record of the last active window in a group - Connections{ - target:tasksModel - onActiveTaskChanged:{ - if (!mainItemContainer.isGroupParent) { - return; - } - - windowsLocalModel.currentIndex = index; - var childs = windowsLocalModel.items; - - for(var i=0; i<childs.count; ++i){ - var kid = childs.get(i); - if (kid.model.IsActive === true) { - windowsContainer.lastActiveWinInGroup = kid.model.LegacyWinIdList ? kid.model.LegacyWinIdList[0] : 0; - break; - } - } - } - } - Component.onCompleted: { mainItemContainer.checkWindowsStates.connect(initializeStates); - updateCounter(); } Component.onDestruction: { mainItemContainer.checkWindowsStates.disconnect(initializeStates); } - - function updateCounter(){ - // console.log("--------- "+ index+" -------"); - if(index>=0){ - if(IsGroupParent){ - windowsLocalModel.currentIndex = index; - var tempC = windowsLocalModel.count; - - if (tempC == 0){ - if(isLauncher){ - windowsCount = 0; - } - else if(isWindow || isStartup){ - windowsCount = 1; - } - } - else{ - windowsCount = tempC; - } - } - else{ - if(isLauncher){ - windowsCount = 0; - } - else if(isWindow || isStartup){ - windowsCount = 1; - } - } - - initializeStates(); - } - - } - } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/latte-dock-0.8.3/plasmoid/package/metadata.desktop new/latte-dock-0.8.4/plasmoid/package/metadata.desktop --- old/latte-dock-0.8.3/plasmoid/package/metadata.desktop 2018-11-23 17:37:07.356872289 +0100 +++ new/latte-dock-0.8.4/plasmoid/package/metadata.desktop 2018-12-28 22:59:14.803096409 +0100 @@ -57,7 +57,7 @@ X-KDE-PluginInfo-Author=Michail Vourlakos, Smith Ar [email protected], [email protected] X-KDE-PluginInfo-Name=org.kde.latte.plasmoid -X-KDE-PluginInfo-Version=0.8.3 +X-KDE-PluginInfo-Version=0.8.4 X-KDE-PluginInfo-Website=https://github.com/psifidotos/Latte-Dock X-KDE-PluginInfo-Category=Windows and Tasks X-KDE-PluginInfo-Depends=X-KDE-PluginInfo-License=GPL v2+ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/latte-dock-0.8.3/po/gl/latte-dock.po new/latte-dock-0.8.4/po/gl/latte-dock.po --- old/latte-dock-0.8.3/po/gl/latte-dock.po 2018-11-23 17:38:29.169539219 +0100 +++ new/latte-dock-0.8.4/po/gl/latte-dock.po 2018-12-28 22:59:46.563489484 +0100 @@ -7,7 +7,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-07-13 06:00+0200\n" -"PO-Revision-Date: 2018-10-20 11:15+0100\n" +"PO-Revision-Date: 2018-12-28 19:38+0100\n" "Last-Translator: Adrián Chaves (Gallaecio) <[email protected]>\n" "Language-Team: Galician <[email protected]>\n" "Language: gl\n" @@ -655,7 +655,7 @@ #: ../shell/package/contents/configuration/TasksConfig.qml:229 #, kde-format msgid "Right Click" -msgstr "Botón secundario" +msgstr "Clic dereito" #: ../shell/package/contents/configuration/TasksConfig.qml:258 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/latte-dock-0.8.3/po/zh_CN/latte-dock.po new/latte-dock-0.8.4/po/zh_CN/latte-dock.po --- old/latte-dock-0.8.3/po/zh_CN/latte-dock.po 2018-11-23 17:39:37.246094170 +0100 +++ new/latte-dock-0.8.4/po/zh_CN/latte-dock.po 2018-12-28 23:00:14.027858455 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-07-13 06:00+0200\n" -"PO-Revision-Date: 2018-11-12 09:30\n" +"PO-Revision-Date: 2018-12-27 07:45\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -68,7 +68,7 @@ #: ../shell/package/contents/configuration/AppearanceConfig.qml:358 #, kde-format msgid "Background" -msgstr "背景色" +msgstr "背景" #: ../shell/package/contents/configuration/AppearanceConfig.qml:368 #, kde-format @@ -91,7 +91,7 @@ #: ../shell/package/contents/configuration/AppearanceConfig.qml:506 #, kde-format msgid "Solid" -msgstr "立体" +msgstr "纯色" #: ../shell/package/contents/configuration/AppearanceConfig.qml:526 #, kde-format @@ -101,7 +101,7 @@ #: ../shell/package/contents/configuration/AppearanceConfig.qml:547 #, kde-format msgid "None" -msgstr "未分组" +msgstr "无" #: ../shell/package/contents/configuration/AppearanceConfig.qml:556 #, kde-format @@ -127,13 +127,13 @@ #, kde-format msgctxt "active indicator style" msgid "Style" -msgstr "风格" +msgstr "样式" #: ../shell/package/contents/configuration/AppearanceConfig.qml:630 #, kde-format msgctxt "line indicator" msgid "Line" -msgstr "直线" +msgstr "线条" #: ../shell/package/contents/configuration/AppearanceConfig.qml:634 #, kde-format @@ -144,7 +144,7 @@ #, kde-format msgctxt "dot indicator" msgid "Dot" -msgstr "Dot" +msgstr "圆点" #: ../shell/package/contents/configuration/AppearanceConfig.qml:646 #, kde-format @@ -155,7 +155,7 @@ #, kde-format msgctxt "reverse the position of the active indicator e.g. from bottom to top" msgid "Reverse" -msgstr "逆序" +msgstr "反转" #: ../shell/package/contents/configuration/AppearanceConfig.qml:661 #, kde-format @@ -166,7 +166,7 @@ #, kde-format msgctxt "active indicator to no applets" msgid "None" -msgstr "未分组" +msgstr "无" #: ../shell/package/contents/configuration/AppearanceConfig.qml:682 #, kde-format @@ -179,7 +179,7 @@ #, kde-format msgctxt "active indicator only to in-house latte applets" msgid "Internals" -msgstr "内置" +msgstr "内部" #: ../shell/package/contents/configuration/AppearanceConfig.qml:694 #, kde-format @@ -555,7 +555,7 @@ #: ../shell/package/contents/configuration/TasksConfig.qml:135 #, kde-format msgid "Show window actions in the context menu" -msgstr "在上下文菜单中显示窗口操作" +msgstr "在右键菜单中显示窗口操作" #: ../shell/package/contents/configuration/TasksConfig.qml:148 #, kde-format @@ -1434,7 +1434,7 @@ #, kde-format msgctxt "single layout" msgid "Single" -msgstr "单人照" +msgstr "单个" #. i18n: ectx: property (toolTip), widget (QToolButton, multipleToolBtn) #: settingsdialog.ui:66 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/latte-dock-0.8.3/po/zh_CN/plasma_applet_audoban.applet.separator.po new/latte-dock-0.8.4/po/zh_CN/plasma_applet_audoban.applet.separator.po --- old/latte-dock-0.8.3/po/zh_CN/plasma_applet_audoban.applet.separator.po 2018-11-23 17:39:37.246094170 +0100 +++ new/latte-dock-0.8.4/po/zh_CN/plasma_applet_audoban.applet.separator.po 2018-12-28 23:00:14.031858507 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-09-09 03:09+0200\n" -"PO-Revision-Date: 2018-11-12 09:30\n" +"PO-Revision-Date: 2018-12-27 07:45\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/latte-dock-0.8.3/po/zh_CN/plasma_applet_org.kde.latte.containment.po new/latte-dock-0.8.4/po/zh_CN/plasma_applet_org.kde.latte.containment.po --- old/latte-dock-0.8.3/po/zh_CN/plasma_applet_org.kde.latte.containment.po 2018-11-23 17:39:37.254094236 +0100 +++ new/latte-dock-0.8.4/po/zh_CN/plasma_applet_org.kde.latte.containment.po 2018-12-28 23:00:14.031858507 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-05-01 03:23+0200\n" -"PO-Revision-Date: 2018-11-12 09:30\n" +"PO-Revision-Date: 2018-12-27 07:45\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/latte-dock-0.8.3/po/zh_CN/plasma_applet_org.kde.latte.plasmoid.po new/latte-dock-0.8.4/po/zh_CN/plasma_applet_org.kde.latte.plasmoid.po --- old/latte-dock-0.8.3/po/zh_CN/plasma_applet_org.kde.latte.plasmoid.po 2018-11-23 17:39:37.254094236 +0100 +++ new/latte-dock-0.8.4/po/zh_CN/plasma_applet_org.kde.latte.plasmoid.po 2018-12-28 23:00:14.031858507 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-10-07 06:49+0200\n" -"PO-Revision-Date: 2018-11-12 09:30\n" +"PO-Revision-Date: 2018-12-27 07:45\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -117,7 +117,7 @@ #: package/contents/ui/config/ConfigInteraction.qml:78 #, kde-format msgid "Show window actions in the context menu" -msgstr "在上下文菜单中显示窗口操作" +msgstr "在右键菜单中显示窗口操作" #: package/contents/ui/config/ConfigInteraction.qml:84 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/latte-dock-0.8.3/po/zh_CN/plasma_applet_org.kde.latte.spacer.po new/latte-dock-0.8.4/po/zh_CN/plasma_applet_org.kde.latte.spacer.po --- old/latte-dock-0.8.3/po/zh_CN/plasma_applet_org.kde.latte.spacer.po 2018-11-23 17:39:37.246094170 +0100 +++ new/latte-dock-0.8.4/po/zh_CN/plasma_applet_org.kde.latte.spacer.po 2018-12-28 23:00:14.031858507 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-09-09 03:09+0200\n" -"PO-Revision-Date: 2018-11-12 09:30\n" +"PO-Revision-Date: 2018-12-27 07:45\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/latte-dock-0.8.3/po/zh_CN/plasma_containmentactions_lattecontextmenu.po new/latte-dock-0.8.4/po/zh_CN/plasma_containmentactions_lattecontextmenu.po --- old/latte-dock-0.8.3/po/zh_CN/plasma_containmentactions_lattecontextmenu.po 2018-11-23 17:39:37.254094236 +0100 +++ new/latte-dock-0.8.4/po/zh_CN/plasma_containmentactions_lattecontextmenu.po 2018-12-28 23:00:14.031858507 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-02-13 03:14+0100\n" -"PO-Revision-Date: 2018-11-12 09:30\n" +"PO-Revision-Date: 2018-12-27 07:45\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/latte-dock-0.8.3/po/zh_TW/latte-dock.po new/latte-dock-0.8.4/po/zh_TW/latte-dock.po --- old/latte-dock-0.8.3/po/zh_TW/latte-dock.po 2018-11-23 17:39:40.010116708 +0100 +++ new/latte-dock-0.8.4/po/zh_TW/latte-dock.po 2018-12-28 23:00:14.451864146 +0100 @@ -2,14 +2,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Jeff Huang <[email protected]>, 2016, 2017, 2018. +# pan93412 <[email protected]>, 2018. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-07-13 06:00+0200\n" -"PO-Revision-Date: 2018-04-18 12:09+0800\n" -"Last-Translator: Jeff Huang <[email protected]>\n" -"Language-Team: Chinese <[email protected]>\n" +"PO-Revision-Date: 2018-12-02 23:33+0800\n" +"Last-Translator: pan93412 <[email protected]>\n" +"Language-Team: Chinese <[email protected]>\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -576,12 +577,12 @@ #: ../shell/package/contents/configuration/TasksConfig.qml:161 #, kde-format msgid "Group tasks of the same application" -msgstr "" +msgstr "將同一個應用程式的視窗分為一個群組" #: ../shell/package/contents/configuration/TasksConfig.qml:163 #, kde-format msgid "By default group tasks of the same application" -msgstr "" +msgstr "預設情況下同一個應用程式的視窗會分為一個群組" #: ../shell/package/contents/configuration/TasksConfig.qml:174 #, kde-format @@ -774,10 +775,9 @@ "在最大化或被捕捉的視窗中" #: ../shell/package/contents/configuration/TweaksConfig.qml:130 -#, fuzzy, kde-format -#| msgid "Improve contents visibility when panel is transparent" +#, kde-format msgid "Monochrome contents when panel is transparent" -msgstr "當面板是透明的時候改善內容可讀性" +msgstr "當面板是透明的時候將內容變成單色" #: ../shell/package/contents/configuration/TweaksConfig.qml:132 #, kde-format @@ -841,16 +841,14 @@ "Dock 將不會在設定為「總是在最上層」的視窗上" #: ../shell/package/contents/configuration/TweaksConfig.qml:213 -#, fuzzy, kde-format -#| msgid "Raise dock on desktop change" +#, kde-format msgid "Raise on desktop change" -msgstr "在桌面變更時提升 dock" +msgstr "在桌面變更時提升" #: ../shell/package/contents/configuration/TweaksConfig.qml:224 -#, fuzzy, kde-format -#| msgid "Raise dock on activity change" +#, kde-format msgid "Raise on activity change" -msgstr "在活動變更時提升 dock" +msgstr "在活動變更時提升" #: ../shell/package/contents/configuration/TweaksConfig.qml:242 #, kde-format @@ -998,10 +996,9 @@ msgstr "預設" #: layoutmanager.cpp:911 -#, fuzzy, kde-format -#| msgid "Adding layout: <b>%0</b> ..." +#, kde-format msgid "Activating layout: <b>%0</b> ..." -msgstr "正在新增佈局：<b>%0</b> ..." +msgstr "正在啟用佈局：<b>%0</b> ..." #: layoutmanager.cpp:1201 #, kde-format @@ -1029,12 +1026,10 @@ msgstr "文字顏色..." #: main.cpp:99 -#, fuzzy, kde-format -#| msgctxt "command line" -#| msgid "Replace the current dock instance." +#, kde-format msgctxt "command line" msgid "Replace the current Latte instance." -msgstr "取代目前的 dock 實體。" +msgstr "取代目前的 Latte 實體。" #: main.cpp:100 #, kde-format @@ -1379,22 +1374,19 @@ msgstr "佈局：<b>%0</b> 匯入成功<br>" #: settingsdialog.cpp:872 -#, fuzzy, kde-format -#| msgid "Background" +#, kde-format msgctxt "column for layout background" msgid "Background" msgstr "背景" #: settingsdialog.cpp:873 -#, fuzzy, kde-format -#| msgid "Name" +#, kde-format msgctxt "column for layout name" msgid "Name" msgstr "名稱" #: settingsdialog.cpp:874 -#, fuzzy, kde-format -#| msgid "In Menu" +#, kde-format msgctxt "column for layout to show in menu" msgid "In Menu" msgstr "在選單中" @@ -1403,11 +1395,10 @@ #, kde-format msgctxt "column for layout to hide borders for maximized windows" msgid "Borderless" -msgstr "" +msgstr "無邊框" #: settingsdialog.cpp:876 -#, fuzzy, kde-format -#| msgid "Activities" +#, kde-format msgctxt "column for layout to show which activities is assigned to" msgid "Activities" msgstr "活動" @@ -1462,10 +1453,9 @@ #. i18n: ectx: property (toolTip), widget (QToolButton, multipleToolBtn) #: settingsdialog.ui:66 -#, fuzzy, kde-format -#| msgid "Multiple layouts can be present in memory" +#, kde-format msgid "Multiple layouts can be present and active in memory at the same time" -msgstr "記憶中可以有多種佈局" +msgstr "記憶中可以有多種佈局同時啟用" #. i18n: ectx: property (text), widget (QToolButton, multipleToolBtn) #: settingsdialog.ui:69 @@ -1542,15 +1532,14 @@ #: settingsdialog.ui:270 #, kde-format msgid "Lock layout and make it read-only" -msgstr "" +msgstr "鎖定佈局並使其唯讀" #. i18n: ectx: property (text), widget (QPushButton, lockedButton) #: settingsdialog.ui:273 -#, fuzzy, kde-format -#| msgid "Locked" +#, kde-format msgctxt "locked layout" msgid "Locked" -msgstr "鎖定" +msgstr "已鎖定" #. i18n: ectx: property (toolTip), widget (QPushButton, importButton) #: settingsdialog.ui:347 @@ -1611,30 +1600,28 @@ #. i18n: ectx: property (toolTip), widget (QCheckBox, infoWindowChkBox) #: settingsdialog.ui:558 -#, fuzzy, kde-format -#| msgid "Provide visual feedback when layouts are added automatically" +#, kde-format msgid "Provide visual feedback when layouts are activated automatically" -msgstr "當自動新增佈局時提供視覺回饋" +msgstr "當自動啟用佈局時提供視覺回饋" #. i18n: ectx: property (text), widget (QCheckBox, infoWindowChkBox) #: settingsdialog.ui:561 -#, fuzzy, kde-format -#| msgid "Show informative window for layouts automatic switching" +#, kde-format msgid "Show informative window for layouts automatic activation" -msgstr "顯示佈局自動切換的資訊視窗" +msgstr "顯示佈局自動啟用的資訊視窗" #. i18n: ectx: property (toolTip), widget (QCheckBox, noBordersForMaximizedChkBox) #: settingsdialog.ui:588 #, kde-format msgid "" "Activate support for borderless maximized windows between different layouts" -msgstr "" +msgstr "在不同的佈局間啟用對無邊框最大化視窗的支援" #. i18n: ectx: property (text), widget (QCheckBox, noBordersForMaximizedChkBox) #: settingsdialog.ui:591 #, kde-format msgid "Support borderless maximized windows in different layouts" -msgstr "" +msgstr "在不同佈局支援無邊框最大化視窗" #. i18n: ectx: property (text), widget (QLabel, mouseSensetivityLbl) #: settingsdialog.ui:622 @@ -1701,10 +1688,9 @@ #. i18n: ectx: property (text), widget (QLabel, trackScreensDelayLbl) #: settingsdialog.ui:806 -#, fuzzy, kde-format -#| msgid "Track screen changes after" +#, kde-format msgid "React to screen changes after" -msgstr "追蹤螢幕變更在多久之後" +msgstr "反應螢幕變更在多久之後" #. i18n: ectx: property (suffix), widget (QSpinBox, screenTrackerSpinBox) #: settingsdialog.ui:835 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/latte-dock-0.8.3/po/zh_TW/plasma_applet_org.kde.latte.plasmoid.po new/latte-dock-0.8.4/po/zh_TW/plasma_applet_org.kde.latte.plasmoid.po --- old/latte-dock-0.8.3/po/zh_TW/plasma_applet_org.kde.latte.plasmoid.po 2018-11-23 17:39:40.014116739 +0100 +++ new/latte-dock-0.8.4/po/zh_TW/plasma_applet_org.kde.latte.plasmoid.po 2018-12-28 23:00:14.455864201 +0100 @@ -2,14 +2,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Jeff Huang <[email protected]>, 2016, 2017, 2018. +# pan93412 <[email protected]>, 2018. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-10-07 06:49+0200\n" -"PO-Revision-Date: 2018-04-18 11:37+0800\n" -"Last-Translator: Jeff Huang <[email protected]>\n" -"Language-Team: Chinese <[email protected]>\n" +"PO-Revision-Date: 2018-12-02 23:33+0800\n" +"Last-Translator: pan93412 <[email protected]>\n" +"Language-Team: Chinese <[email protected]>\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -387,16 +388,14 @@ msgstr "取消釘選" #: package/contents/ui/ContextMenu.qml:793 -#, fuzzy, kde-format -#| msgid "Add Internal Separator" +#, kde-format msgid "Add Separator" -msgstr "新增內部分隔器" +msgstr "新增分隔器" #: package/contents/ui/ContextMenu.qml:807 -#, fuzzy, kde-format -#| msgid "Remove Internal Separator" +#, kde-format msgid "Remove Separator" -msgstr "移除內部分隔器" +msgstr "移除分隔器" #: package/contents/ui/ContextMenu.qml:896 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/latte-dock-0.8.3/shell/package/metadata.desktop new/latte-dock-0.8.4/shell/package/metadata.desktop --- old/latte-dock-0.8.3/shell/package/metadata.desktop 2018-11-23 17:37:07.356872289 +0100 +++ new/latte-dock-0.8.4/shell/package/metadata.desktop 2018-12-28 22:59:14.807096458 +0100 @@ -80,5 +80,5 @@ [email protected], [email protected] X-KDE-PluginInfo-License=GPLv3+ X-KDE-PluginInfo-Name=org.kde.latte.shell -X-KDE-PluginInfo-Version=0.8.3 +X-KDE-PluginInfo-Version=0.8.4 X-KDE-PluginInfo-Website=https://github.com/psifidotos/Latte-Dock
