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

18 files changed, 107 insertions, 33 deletions

diff --git a/debian/changelog b/debian/changelog
index cb3ff72..5a7e3dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+etcskel-kanotix (1.1.0) unstable; urgency=low
+
+  * 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
+
 etcskel-kanotix (1.0.4) unstable; urgency=low
 
   * macbook touchpad configuration.
@@ -19,11 +29,11 @@ etcskel-kanotix (1.0.2) unstable; urgency=low
 
  -- Maximilian Gerhard <maxbox@directbox.com>  Fri, 29 Mar 2011 00:57:02 +0100
 
-etcskel-kanotix (1.0.1) unstable; urgency=low
+etcskel-kanotix (1.0.1~trialshot+1) trialshot; urgency=low
 
   * added trinity package.
 
- -- Andreas Loibl <andreas@andreas-loibl.de>  Sat, 19 Mar 2011 01:59:43 +0100
+ -- Andreas Loibl <andreas@andreas-loibl.de>  Sat, 19 Mar 2011 15:16:23 +0100
 
 etcskel-kanotix (1.0.0) unstable; urgency=low
 
diff --git a/debian/kanotix-plasma-script.install b/debian/kanotix-plasma-script.install
index 5548f1e..2a76d4e 100644
--- a/debian/kanotix-plasma-script.install
+++ b/debian/kanotix-plasma-script.install
@@ -1 +1,2 @@
 plasma-desktop usr/share/kde4/apps/
+kanotix-reset-plasma-panel usr/bin
diff --git a/debian/kanotix-plasma-script.manpages b/debian/kanotix-plasma-script.manpages
new file mode 100644
index 0000000..70e9c01
--- /dev/null
+++ b/debian/kanotix-plasma-script.manpages
@@ -0,0 +1 @@
+docs/kanotix-reset-plasma-panel.1 
diff --git a/docs/kanotix-reset-plasma-panel.1 b/docs/kanotix-reset-plasma-panel.1
new file mode 100644
index 0000000..bcc28e5
--- /dev/null
+++ b/docs/kanotix-reset-plasma-panel.1
@@ -0,0 +1,26 @@
+.TH KANOTIX-RESET-PLASMA-PANEL 1 "Sep 18, 2011" kanotix-reset-plasma-panel "Linux User's Manual"
+.SH NAME
+kanotix-reset-plasma-panel - a script to start interactive plasma desktop console with preloaded plasma panel reset script
+
+.SH SYNOPSIS
+.B KANOTIX-RESET-PLASMA-PANEL
+
+.SH DESCRIPTION
+\fBKanotix-reset-plasma-panel\fR is a script to start interactive plasma desktop console with
+preloaded plasma panel reset script.
+
+.SH USAGE
+\fBKanotix-reset-plasma-panel\fR is a simple shell script. After start you will see plasma's interactive
+console with script code inside. To reset your plasma panel to Kanotix defaults, press the execute button.
+The script will remove the existing main panel and create a new one with Kanotix default icons and entries.
+
+.SH OPTIONS
+No options available.
+
+.SH BUGS
+To report a bug, please visit Kanotix forum at \fIhttp://kanotix.com/\fR and/or
+report bugs to \fImaster@kanotix.com\fR
+
+.SH AUTHORS
+.TP
+.B 2011 Maximilian Gerhard <maxbox@directbox.com>
diff --git a/kanotix-reset-plasma-panel b/kanotix-reset-plasma-panel
new file mode 100644
index 0000000..898b451
--- /dev/null
+++ b/kanotix-reset-plasma-panel
@@ -0,0 +1,2 @@
+#!/bin/sh
+qdbus org.kde.plasma-desktop /MainApplication loadScriptInInteractiveConsole /usr/share/kde4/apps/plasma-desktop/updates/01-kanotix-default-setup.js
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
+}
diff --git a/profile/.icedove/ocpnorvk.default/mimeTypes.rdf b/profile/.icedove/ocpnorvk.default/mimeTypes.rdf
index 2113dd1..3266bba 100644
--- a/profile/.icedove/ocpnorvk.default/mimeTypes.rdf
+++ b/profile/.icedove/ocpnorvk.default/mimeTypes.rdf
@@ -2,7 +2,24 @@
 <RDF:RDF xmlns:NC="http://home.netscape.com/NC-rdf#"
          xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
   <RDF:Seq RDF:about="urn:mimetypes:root">
+    <RDF:li RDF:resource="urn:mimetype:application/pdf"/>
   </RDF:Seq>
+  <RDF:Description RDF:about="urn:mimetype:application/pdf"
+                   NC:value="application/pdf"
+                   NC:editable="true"
+                   NC:description="PDF-Dokument">
+    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/pdf"/>
+  </RDF:Description>
+  <RDF:Description RDF:about="urn:mimetype:handler:application/pdf"
+                   NC:alwaysAsk="true"
+                   NC:saveToDisk="false"
+                   NC:useSystemDefault="false"
+                   NC:handleInternal="false">
+    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/pdf"/>
+  </RDF:Description>
+  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/pdf"
+                   NC:path="/usr/bin/okular"
+                   NC:prettyName="Okular" />
   <RDF:Description RDF:about="urn:schemes">
     <NC:Protocol-Schemes RDF:resource="urn:schemes:root"/>
   </RDF:Description>
@@ -42,11 +59,11 @@
   </RDF:Seq>
   <RDF:Description RDF:about="urn:scheme:externalApplication:http"
                    NC:prettyName="Default browser"
-                   NC:path="/etc/alternatives/x-www-browser" />
+                   NC:path="/usr/bin/x-www-browser" />
   <RDF:Description RDF:about="urn:scheme:externalApplication:https"
                    NC:prettyName="Default browser"
-                   NC:path="/etc/alternatives/x-www-browser" />
+                   NC:path="/usr/bin/x-www-browser" />
   <RDF:Description RDF:about="urn:scheme:externalApplication:ftp"
                    NC:prettyName="Default browser"
-                   NC:path="/etc/alternatives/x-www-browser" />
-</RDF:RDF>
+                   NC:path="/usr/bin/x-www-browser" />
+</RDF:RDF> 
diff --git a/profile/.icedove/ocpnorvk.default/prefs.js b/profile/.icedove/ocpnorvk.default/prefs.js
index 5aee259..cf18c45 100644
--- a/profile/.icedove/ocpnorvk.default/prefs.js
+++ b/profile/.icedove/ocpnorvk.default/prefs.js
@@ -2,6 +2,6 @@ user_pref("font.default", "sans-serif");
 user_pref("font.minimum-size.x-western", 10);
 user_pref("font.size.fixed.x-western", 13);
 user_pref("font.size.variable.x-western", 13);
-user_pref("network.protocol-handler.app.ftp", "/usr/bin/firefox");
-user_pref("network.protocol-handler.app.https", "/usr/bin/firefox");
-user_pref("network.protocol-handler.app.http", "/usr/bin/firefox");
+user_pref("network.protocol-handler.app.ftp", "/usr/bin/x-www-browser");
+user_pref("network.protocol-handler.app.https", "/usr/bin/x-www-browser");
+user_pref("network.protocol-handler.app.http", "/usr/bin/x-www-browser");
diff --git a/profile/.mozilla-thunderbird/appreg b/profile/.mozilla-thunderbird/appreg
deleted file mode 100644
index f2f3e0e..0000000
--- a/profile/.mozilla-thunderbird/appreg
+++ /dev/null
diff --git a/profile/.mozilla-thunderbird/ocpnorvk.default/prefs.js b/profile/.mozilla-thunderbird/ocpnorvk.default/prefs.js
deleted file mode 100644
index 5aee259..0000000
--- a/profile/.mozilla-thunderbird/ocpnorvk.default/prefs.js
+++ /dev/null
@@ -1,7 +0,0 @@
-user_pref("font.default", "sans-serif");
-user_pref("font.minimum-size.x-western", 10);
-user_pref("font.size.fixed.x-western", 13);
-user_pref("font.size.variable.x-western", 13);
-user_pref("network.protocol-handler.app.ftp", "/usr/bin/firefox");
-user_pref("network.protocol-handler.app.https", "/usr/bin/firefox");
-user_pref("network.protocol-handler.app.http", "/usr/bin/firefox");
diff --git a/profile/.mozilla-thunderbird/profiles.ini b/profile/.mozilla-thunderbird/profiles.ini
deleted file mode 100644
index 40b65fa..0000000
--- a/profile/.mozilla-thunderbird/profiles.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[General]
-StartWithLastProfile=1
-
-[Profile0]
-Name=default
-IsRelative=1
-Path=ocpnorvk.default
-
diff --git a/profile/.mozilla/firefox/evc3to3e.default/mimeTypes.rdf b/profile/.mozilla/firefox/evc3to3e.default/mimeTypes.rdf
index 122c663..3ffcf17 100644
--- a/profile/.mozilla/firefox/evc3to3e.default/mimeTypes.rdf
+++ b/profile/.mozilla/firefox/evc3to3e.default/mimeTypes.rdf
@@ -8,8 +8,8 @@
     <NC:handlerProp RDF:resource="urn:mimetype:handler:application/pdf"/>
   </RDF:Description>
   <RDF:Description RDF:about="urn:mimetype:externalApplication:application/pdf"
-                   NC:path="/usr/bin/kpdf"
-                   NC:prettyName="kpdf" />
+                   NC:path="/usr/bin/okular"
+                   NC:prettyName="Okular" />
   <RDF:Seq RDF:about="urn:mimetypes:root">
     <RDF:li RDF:resource="urn:mimetype:application/pdf"/>
   </RDF:Seq>
@@ -23,4 +23,22 @@
   <RDF:Description RDF:about="urn:mimetypes">
     <NC:MIME-types RDF:resource="urn:mimetypes:root"/>
   </RDF:Description>
+  <RDF:Description RDF:about="urn:scheme:mailto"
+                   NC:value="mailto">
+    <NC:handlerProp RDF:resource="urn:scheme:handler:mailto"/>
+  </RDF:Description>
+  <RDF:Description RDF:about="urn:scheme:externalApplication:mailto"
+                   NC:prettyName="Default Desktop Mail Client"
+                   NC:path="/usr/bin/xdg-email" />
+  <RDF:Description RDF:about="urn:scheme:handler:mailto"
+                   NC:alwaysAsk="false">
+    <NC:possibleApplication RDF:resource="urn:handler:web:https://mail.google.com/mail/?extsrc=mailto&amp;url=%s"/>
+    <NC:possibleApplication RDF:resource="urn:handler:web:http://compose.mail.yahoo.com/?To=%s"/>
+    <NC:possibleApplication RDF:resource="urn:handler:local:/usr/bin/icedove"/>
+    <NC:possibleApplication RDF:resource="urn:handler:local:/usr/bin/xdg-email"/>
+    <NC:externalApplication RDF:resource="urn:scheme:externalApplication:mailto"/>
+  </RDF:Description>
+  <RDF:Seq RDF:about="urn:schemes:root">
+    <RDF:li RDF:resource="urn:scheme:mailto"/>
+  </RDF:Seq>
 </RDF:RDF>
diff --git a/profile/.mozilla/firefox/evc3to3e.default/prefs.js b/profile/.mozilla/firefox/evc3to3e.default/prefs.js
index 64e59c9..9e554be 100644
--- a/profile/.mozilla/firefox/evc3to3e.default/prefs.js
+++ b/profile/.mozilla/firefox/evc3to3e.default/prefs.js
@@ -24,7 +24,7 @@ user_pref("network.http.pipelining", true);
 user_pref("network.http.proxy.pipelining", true);
 user_pref("network.protocol-handler.app.ed2k", "/usr/bin/ed2k");
 user_pref("network.protocol-handler.app.klik", "~/.klik");
-user_pref("network.protocol-handler.app.mailto", "/usr/bin/mozilla-thunderbird");
+user_pref("network.protocol-handler.app.mailto", "/usr/bin/icedove");
 user_pref("network.protocol-handler.warn-external.ed2k", false);
 user_pref("network.protocol-handler.warn-external.klik", false);
 user_pref("nglayout.initialpaint.delay", 0);
diff --git a/skel/.kde/share/apps/dolphin/view_properties/global/.directory b/skel/.kde/share/apps/dolphin/view_properties/global/.directory
index ea7224b..d3a66c9 100644
--- a/skel/.kde/share/apps/dolphin/view_properties/global/.directory
+++ b/skel/.kde/share/apps/dolphin/view_properties/global/.directory
@@ -1,4 +1,3 @@
 [Dolphin]
 AdditionalInfo=3
 Timestamp=2010,9,30,18,53,23
-ViewMode=1
diff --git a/skel/.kde/share/config/synaptiksrc-macbook b/skel/.kde/share/config/synaptiksrc-macbook
index 8dd5316..aabec78 100644
--- a/skel/.kde/share/config/synaptiksrc-macbook
+++ b/skel/.kde/share/config/synaptiksrc-macbook
@@ -4,4 +4,4 @@ VerticalTwoFingerScrolling=true
 
 [Tapping]
 TwoFingerButton=RightMouseButton
-ThreeFingerButton=MiddleMouseButton
+ThreeFingerButton=MiddleMouseButton 
diff --git a/skel/Desktop/.directory b/skel/Desktop/.directory
index 6cb8ac9..4c25425 100644
--- a/skel/Desktop/.directory
+++ b/skel/Desktop/.directory
@@ -1,5 +1,4 @@
 [Desktop Entry]
 Encoding=UTF-8
 Icon=user-desktop
-Type=Directory
-
+Type=Directory 
diff --git a/skel/Downloads/.gitignore b/skel/Downloads/.gitignore
deleted file mode 100644
index 72e8ffc..0000000
--- a/skel/Downloads/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*