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

update launchers group correctly from config win

Browse Source
This commit is contained in:
Michail Vourlakos 2017-07-31 04:14:04 +03:00
parent eefbc5e9ec
commit 6a47f6e811
1 changed files with 38 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
plasmoid/package/contents/ui/main.qml
View File

@ -256,26 +256,6 @@ Item {
}
}
property bool loadLaunchersFirstTime: false;
onCurrentLayoutChanged: {
if (currentLayout && !loadLaunchersFirstTime) {
if (latteDock.universalSettings
&& (latteDock.launchersGroup === Latte.Dock.LayoutLaunchers
|| latteDock.launchersGroup === Latte.Dock.GlobalLaunchers)) {
if (latteDock.launchersGroup === Latte.Dock.LayoutLaunchers) {
tasksModel.launcherList = latteDock.universalLayoutManager.currentLayout.launchers;
} else if (latteDock.launchersGroup === Latte.Dock.GlobalLaunchers) {
tasksModel.launcherList = latteDock.universalSettings.launchers;
}
} else {
tasksModel.launcherList = plasmoid.configuration.launchers59;
}
loadLaunchersFirstTime = true;
}
}
/////
PlasmaCore.ColorScope{
id: colorScopePalette
@ -347,37 +327,6 @@ Item {
return false;
}
///REMOVE
function updateLaunchersNewArchitecture(){
///frameworks 5.29.0 provide id 335104
//work only after Plasma 5.9 and frameworks 5.29
/* if (Latte.WindowSystem.frameworksVersion < 335104) {
return;
}
var launchers = [];
var tasks = icList.contentItem.children;
var len = tasks.length
for(var i=0; i<len; ++i){
var task;
for (var j=0; j<len; ++j){
if (tasks && tasks[j] && tasks[j].itemIndex === i) {
task = tasks[j];
break;
}
}
if (task && task.m && task.m.LauncherUrlWithoutIcon
&& ActivitiesTools.getIndex(task.m.LauncherUrlWithoutIcon, tasksModel.launcherList)>=0) {
launchers.push(task.m.LauncherUrlWithoutIcon);
}
}
ActivitiesTools.updateLaunchers(launchers);*/
}
onDragSourceChanged: {
if (dragSource == null) {
root.draggingFinished();
@ -498,6 +447,26 @@ Item {
/////Window Previews/////////
property bool loadLaunchersFirstTime: false;
onCurrentLayoutChanged: {
if (currentLayout && !loadLaunchersFirstTime) {
tasksModel.updateLaunchersList();
loadLaunchersFirstTime = true;
}
}
Connections{
target: latteDock
onLaunchersGroupChanged:{
if( latteDock && latteDock.editMode) {
tasksModel.updateLaunchersList();
}
}
}
TaskManager.TasksModel {
id: tasksModel
@ -518,11 +487,6 @@ Item {
groupMode: TaskManager.TasksModel.GroupApplications
sortMode: TaskManager.TasksModel.SortManual
///REMOVE
onActivityChanged: {
ActivitiesTools.currentActivity = String(activity);
}
function checkSeparator() {
var hasSep = false;
for(var i=0; i<launcherList.length; ++i){
@ -537,6 +501,24 @@ Item {
parabolicManager.internalSeparatorPos = -1;
}
function updateLaunchersList(){
if (latteDock.universalSettings
&& (latteDock.launchersGroup === Latte.Dock.LayoutLaunchers
|| latteDock.launchersGroup === Latte.Dock.GlobalLaunchers)) {
if (latteDock.launchersGroup === Latte.Dock.LayoutLaunchers) {
tasksModel.launcherList = latteDock.universalLayoutManager.currentLayout.launchers;
} else if (latteDock.launchersGroup === Latte.Dock.GlobalLaunchers) {
tasksModel.launcherList = latteDock.universalSettings.launchers;
}
} else {
tasksModel.launcherList = plasmoid.configuration.launchers59;
}
}
onActivityChanged: {
ActivitiesTools.currentActivity = String(activity);
}
onLauncherListChanged: {
if (currentLayout) {
if (latteDock && latteDock.universalLayoutManager