[Blends-commit] [SCM] ezgo branch, master, updated. 69fd53f59b781100ba94e6547b889f5b5e01ca49

[Franklin]

The following commit has been merged in the master branch:
commit 05d17f33fcfb26b3888fb96c5c6b2953d2d9ae87
Author: Franklin <franklin at goodhorse.idv.tw>
Date:   Sun Nov 23 13:46:08 2014 +0800

    Change the background image filename so that we can upgrade when a new version is published.

diff --git a/ezgo-kde/kde/30-desktop-base-ezgo.js b/ezgo-kde/kde/30-desktop-base-ezgo.js
index f6dbb7b..f6deb05 100644
--- a/ezgo-kde/kde/30-desktop-base-ezgo.js
+++ b/ezgo-kde/kde/30-desktop-base-ezgo.js
@@ -11,7 +11,7 @@ for (var i = 0; i < screenCount; ++i) {
     desktop.writeConfig('slidepaths', '/usr/share/ezgo/wallpaper/')
     desktop.writeConfig("slideTimer", 360)
     desktop.writeConfig("userswallpapers", "/usr/share/ezgo/wallpaper/ezgo12-wallpapaer-1366x768.png,/usr/share/ezgo/wallpaper/ezgo12-wallpaper-1920x1080.png")
-    desktop.writeConfig("wallpaper", "/usr/share/ezgo/wallpaper/ezgo12-wallpaper-1366x768.png")
+    desktop.writeConfig("wallpaper", "/etc/alternatives/desktop-background")
     desktop.writeConfig("wallpaperposition", 2)
     desktop.writeConfig("immutability", 2)
 
@@ -39,7 +39,7 @@ for (var i = 0; i < screenCount; ++i) {
     sal.writeConfig('slidepaths', '/usr/share/ezgo/wallpaper/')
     sal.writeConfig("slideTimer", 60)
     sal.writeConfig("userswallpapers", "/usr/share/ezgo/wallpaper/ezgo12-wallpaper-1366x768.png,/usr/share/ezgo/wallpaper/ezgo12-wallpaper-1920x1080.png")
-    sal.writeConfig("wallpaper", "/usr/share/ezgo/wallpaper/ezgo12-wallpaper-1366x768.png")
+    sal.writeConfig("wallpaper", "/etc/alternatives/desktop-background")
 
     sal.currentConfigGroup = Array('stripwidget', 'favourite-0')
     sal.writeConfig('url', '/usr/share/applications/firefox.desktop')
diff --git a/ezgo-kde/kde/layout.js b/ezgo-kde/kde/layout.js
index 6988ad6..98b0888 100644
--- a/ezgo-kde/kde/layout.js
+++ b/ezgo-kde/kde/layout.js
@@ -27,8 +27,9 @@ dolphin = panel.addWidget("icon")
 dolphin.writeConfig("Url", "file:///usr/share/applications/kde4/dolphin.desktop")
 dolphin.writeConfig("immutability", 2)
 
-trash = panel.addWidget("trash")
-trash.writeConfig("immutability", 2)
+showdesktop = panel.addWidget("showdesktop")
+showdesktop.globalShortcut = "Meta+D"
+showdesktop.writeConfig("immutability", 2)
 
 tasks = panel.addWidget("tasks")
 tasks.writeConfig("immutability", 2)
@@ -40,9 +41,8 @@ systemtray.writeConfig("immutability", 2)
 dc = panel.addWidget("digital-clock")
 dc.writeConfig("immutability", 2)
 
-showdesktop = panel.addWidget("showdesktop")
-showdesktop.globalShortcut = "Meta+D"
-showdesktop.writeConfig("immutability", 2)
+trash = panel.addWidget("trash")
+trash.writeConfig("immutability", 2)
 
 panel.writeConfig("immutability", 2)
 

-- 
Blend for educatipn with asian specific adaptations