imported changes from 1.1.0

  * added plasma panel reset
  * new dolphin view defaults
  * lock plasma desktop as default
  * use user-desktop icon for Desktop folder
  * icedove and iceweasel default handler updated

 -- Maximilian Gerhard <maxbox@directbox.com>  Sat, 24 Sep 2011 23:11:20 +0200

2 files changed, 18 insertions, 1 deletions

diff --git a/plasma-desktop/updates/01-kanotix-default-lock.js b/plasma-desktop/updates/01-kanotix-default-lock.js
new file mode 100644
index 0000000..80f258d
--- /dev/null
+++ b/plasma-desktop/updates/01-kanotix-default-lock.js
@@ -0,0 +1,2 @@
+// lock plasma desktop
+locked = true;
diff --git a/plasma-desktop/updates/01-kanotix-default-setup.js b/plasma-desktop/updates/01-kanotix-default-setup.js
index 23caaca..de6e691 100644
--- a/plasma-desktop/updates/01-kanotix-default-setup.js
+++ b/plasma-desktop/updates/01-kanotix-default-setup.js
@@ -1,4 +1,14 @@
-var activity = activityForScreen(0);
+// if desktop is locked, save current state and unlock
+var was_locked = false;
+if (locked) {
+    was_locked = true
+    locked = false
+}
+
+p = panelById(panelIds[0]);
+if (typeof p === "panel") {
+    p.remove();
+}
 
 var panel = new Panel("panel");
 panel.location = "bottom";
@@ -35,3 +45,8 @@ systray.writeConfig("plugin", "notifier");
 
 clock = panel.addWidget("digital-clock");
 clock.writeConfig("showDate", "true");
+
+// lock again, if it was locked before
+if (was_locked) {
+    locked = true
+}