From 813b372fb330fb1d125ec0bd07b2016570e63d88 Mon Sep 17 00:00:00 2001 From: Luc Menut Date: Sun, 25 Mar 2012 23:57:07 +0000 Subject: - fix plasma update script (mga #4845) - sync plasma update with default panel - sync classicPanel's config with defaultPanel --- .../org.mageia.plasma-desktop.classicPanel/contents/layout.js | 5 +++-- .../org.mageia.plasma-desktop.defaultPanel/contents/layout.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'kde4-profiles/Default/share/apps/plasma') diff --git a/kde4-profiles/Default/share/apps/plasma/layout-templates/org.mageia.plasma-desktop.classicPanel/contents/layout.js b/kde4-profiles/Default/share/apps/plasma/layout-templates/org.mageia.plasma-desktop.classicPanel/contents/layout.js index ba94f85..3e83fc3 100644 --- a/kde4-profiles/Default/share/apps/plasma/layout-templates/org.mageia.plasma-desktop.classicPanel/contents/layout.js +++ b/kde4-profiles/Default/share/apps/plasma/layout-templates/org.mageia.plasma-desktop.classicPanel/contents/layout.js @@ -9,7 +9,7 @@ if (panelIds.length == 1) { panel.location = 'bottom'; } -panel.height = screenGeometry(panel.screen).height > 1024 ? 35 : 27; +panel.height = 40; var w_simplelauncher = panel.addWidget("simplelauncher"); w_simplelauncher.writeConfig("icon", "mgabutton"); @@ -18,6 +18,7 @@ w_simplelauncher.writeConfig("showMenuTitles", "true"); w_simplelauncher.writeConfig("views", "RecentlyUsedApplications,Applications,Favorites,RecentlyUsed,RunCommand,Leave"); w_simplelauncher.reloadConfig(); +panel.addWidget("showdesktop"); panel.addWidget("org.kde.showActivityManager"); addIcon("dolphin.desktop"); @@ -66,4 +67,4 @@ w_systray.writeConfig('plugin', 'org.kde.telepathy-presence'); w_systray.currentConfigGroup = new Array(); w_systray.reloadConfig(); -sleep(2); +sleep(10); diff --git a/kde4-profiles/Default/share/apps/plasma/layout-templates/org.mageia.plasma-desktop.defaultPanel/contents/layout.js b/kde4-profiles/Default/share/apps/plasma/layout-templates/org.mageia.plasma-desktop.defaultPanel/contents/layout.js index 9a62190..03c9648 100644 --- a/kde4-profiles/Default/share/apps/plasma/layout-templates/org.mageia.plasma-desktop.defaultPanel/contents/layout.js +++ b/kde4-profiles/Default/share/apps/plasma/layout-templates/org.mageia.plasma-desktop.defaultPanel/contents/layout.js @@ -83,4 +83,4 @@ w_systray.currentConfigGroup = new Array('Applets', biggestId+1); w_systray.writeConfig('plugin', 'org.kde.telepathy-presence'); w_systray.currentConfigGroup = new Array(); w_systray.reloadConfig(); -sleep(2); +sleep(10); -- cgit v1.2.1