From 7670f8669bb85a9b43b096481c51efbb8fec942e Mon Sep 17 00:00:00 2001
From: guest <guest@atratsevskiy.local.calculate.ru>
Date: Mon, 17 Jan 2011 18:46:13 +0300
Subject: [PATCH] added initial support for XFCE 4.8

---
 .../desktop/40-xfce-4.6/.calculate_directory  |  2 +-
 .../desktop/40-xfce-4.8/.calculate/ini.env    |  7 ++
 .../desktop/40-xfce-4.8/.calculate_directory  |  1 +
 .../40-xfce-4.8/.config/Terminal/terminalrc   |  4 +
 .../xfce4-clipman-plugin-autostart.desktop    |  3 +
 .../autostart/xfce4-tips-autostart.desktop    |  3 +
 .../40-xfce-4.8/.config/xfce4/helpers.rc      |  5 +
 .../panel/launcher-13/12952684181.desktop     |  3 +
 .../panel/launcher-14/12952684322.desktop     |  3 +
 .../panel/launcher-15/12952684423.desktop     |  3 +
 .../panel/launcher-16/12952684614.desktop     |  3 +
 .../panel/launcher-17/12952684805.desktop     |  3 +
 .../panel/launcher-18/12952684846.desktop     |  3 +
 .../.config/xfce4/panel/xkb-plugin-10.rc      | 10 ++
 .../xfconf/xfce-perchannel-xml/keyboards.xml  | 11 +++
 .../xfce-perchannel-xml/xfce4-desktop.xml     | 21 ++++
 .../xfce-perchannel-xml/xfce4-panel.xml       | 98 +++++++++++++++++++
 .../xfce-perchannel-xml/xfce4-session.xml     | 28 ++++++
 .../xfconf/xfce-perchannel-xml/xfwm4.xml      | 14 +++
 .../xfconf/xfce-perchannel-xml/xsettings.xml  | 15 +++
 .../40-xfce-4.8/Desktop/.calculate_directory  |  1 +
 .../desktop/40-xfce-4.8/Desktop/FTP.desktop   | 12 +++
 .../desktop/40-xfce-4.8/Desktop/Home.desktop  | 17 ++++
 .../40-xfce-4.8/Desktop/README.desktop        | 27 +++++
 .../desktop/40-xfce-4.8/Desktop/Share.desktop | 12 +++
 .../Desktop/calculate-community.desktop       | 14 +++
 .../Desktop/calculate-install.desktop         |  4 +
 .../40-xfce-4.8/Desktop/gparted.desktop       |  4 +
 .../40-xfce-always/.calculate_directory       |  2 +-
 .../desktop/60-gqview-2.1/.calculate/ini.env  |  7 ++
 .../60-gqview-2.1/.calculate_directory        |  1 +
 .../.gqview => 60-gqview-2.1}/gqviewrc        |  1 +
 32 files changed, 340 insertions(+), 2 deletions(-)
 create mode 100644 desktop/desktop/40-xfce-4.8/.calculate/ini.env
 create mode 100644 desktop/desktop/40-xfce-4.8/.calculate_directory
 create mode 100644 desktop/desktop/40-xfce-4.8/.config/Terminal/terminalrc
 create mode 100644 desktop/desktop/40-xfce-4.8/.config/autostart/xfce4-clipman-plugin-autostart.desktop
 create mode 100644 desktop/desktop/40-xfce-4.8/.config/autostart/xfce4-tips-autostart.desktop
 create mode 100644 desktop/desktop/40-xfce-4.8/.config/xfce4/helpers.rc
 create mode 100644 desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-13/12952684181.desktop
 create mode 100644 desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-14/12952684322.desktop
 create mode 100644 desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-15/12952684423.desktop
 create mode 100644 desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-16/12952684614.desktop
 create mode 100644 desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-17/12952684805.desktop
 create mode 100644 desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-18/12952684846.desktop
 create mode 100644 desktop/desktop/40-xfce-4.8/.config/xfce4/panel/xkb-plugin-10.rc
 create mode 100644 desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
 create mode 100644 desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
 create mode 100644 desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
 create mode 100644 desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
 create mode 100644 desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
 create mode 100644 desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
 create mode 100644 desktop/desktop/40-xfce-4.8/Desktop/.calculate_directory
 create mode 100644 desktop/desktop/40-xfce-4.8/Desktop/FTP.desktop
 create mode 100644 desktop/desktop/40-xfce-4.8/Desktop/Home.desktop
 create mode 100644 desktop/desktop/40-xfce-4.8/Desktop/README.desktop
 create mode 100644 desktop/desktop/40-xfce-4.8/Desktop/Share.desktop
 create mode 100644 desktop/desktop/40-xfce-4.8/Desktop/calculate-community.desktop
 create mode 100644 desktop/desktop/40-xfce-4.8/Desktop/calculate-install.desktop
 create mode 100644 desktop/desktop/40-xfce-4.8/Desktop/gparted.desktop
 create mode 100644 desktop/desktop/60-gqview-2.1/.calculate/ini.env
 create mode 100644 desktop/desktop/60-gqview-2.1/.calculate_directory
 rename desktop/desktop/{40-xfce-4.6/.gqview => 60-gqview-2.1}/gqviewrc (88%)

diff --git a/desktop/desktop/40-xfce-4.6/.calculate_directory b/desktop/desktop/40-xfce-4.6/.calculate_directory
index 591ebe1..8cb2bbf 100644
--- a/desktop/desktop/40-xfce-4.6/.calculate_directory
+++ b/desktop/desktop/40-xfce-4.6/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(xfdesktop)!=&&ini(update.xfce)!=off&&ini(ver.xfce)==&&pkg(xfce-base/xfdesktop)>=4.6
+# Calculate append=skip belong(xfdesktop)!=&&ini(update.xfce)!=off&&ini(ver.xfce)==&&pkg(xfce-base/xfdesktop)>=4.6&&pkg(xfce-base/xfdesktop)<4.8
diff --git a/desktop/desktop/40-xfce-4.8/.calculate/ini.env b/desktop/desktop/40-xfce-4.8/.calculate/ini.env
new file mode 100644
index 0000000..62caa3f
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.calculate/ini.env
@@ -0,0 +1,7 @@
+# Calculate format=samba
+
+[ver]
+xfce = 4.8
+
+[update]
+xfce = on
diff --git a/desktop/desktop/40-xfce-4.8/.calculate_directory b/desktop/desktop/40-xfce-4.8/.calculate_directory
new file mode 100644
index 0000000..30724e4
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip belong(xfdesktop)!=&&ini(update.xfce)!=off&&ini(ver.xfce)==&&pkg(xfce-base/xfdesktop)>=4.8
diff --git a/desktop/desktop/40-xfce-4.8/.config/Terminal/terminalrc b/desktop/desktop/40-xfce-4.8/.config/Terminal/terminalrc
new file mode 100644
index 0000000..fb593dd
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/Terminal/terminalrc
@@ -0,0 +1,4 @@
+# Calculate format=kde
+[Configuration]
+FontName=Droid Sans Mono 10
+MiscSingleClick=TRUE
diff --git a/desktop/desktop/40-xfce-4.8/.config/autostart/xfce4-clipman-plugin-autostart.desktop b/desktop/desktop/40-xfce-4.8/.config/autostart/xfce4-clipman-plugin-autostart.desktop
new file mode 100644
index 0000000..b8ca220
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/autostart/xfce4-clipman-plugin-autostart.desktop
@@ -0,0 +1,3 @@
+[Desktop Entry]
+Hidden=false
+
diff --git a/desktop/desktop/40-xfce-4.8/.config/autostart/xfce4-tips-autostart.desktop b/desktop/desktop/40-xfce-4.8/.config/autostart/xfce4-tips-autostart.desktop
new file mode 100644
index 0000000..5673067
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/autostart/xfce4-tips-autostart.desktop
@@ -0,0 +1,3 @@
+[Desktop Entry]
+Hidden=true
+
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/helpers.rc b/desktop/desktop/40-xfce-4.8/.config/xfce4/helpers.rc
new file mode 100644
index 0000000..3164f60
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/helpers.rc
@@ -0,0 +1,5 @@
+# Calculate format=procmail
+WebBrowser=chromium-chromium
+FileManager=Thunar
+MailReader=sylpheed-claws
+
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-13/12952684181.desktop b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-13/12952684181.desktop
new file mode 100644
index 0000000..bb59fd7
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-13/12952684181.desktop
@@ -0,0 +1,3 @@
+# Calculate format=kde link=/usr/share/applications/chromium-chromium.desktop
+[Desktop Entry]
+X-XFCE-Source=file:///usr/share/applications/chromium-chromium.desktop
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-14/12952684322.desktop b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-14/12952684322.desktop
new file mode 100644
index 0000000..67565c2
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-14/12952684322.desktop
@@ -0,0 +1,3 @@
+# Calculate format=kde link=/usr/share/applications/claws-mail.desktop
+[Desktop Entry]
+X-XFCE-Source=file:///usr/share/applications/claws-mail.desktop
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-15/12952684423.desktop b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-15/12952684423.desktop
new file mode 100644
index 0000000..b17d5f3
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-15/12952684423.desktop
@@ -0,0 +1,3 @@
+# Calculate format=kde link=/usr/share/applications/xchat.desktop
+[Desktop Entry]
+X-XFCE-Source=file:///usr/share/applications/xchat.desktop
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-16/12952684614.desktop b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-16/12952684614.desktop
new file mode 100644
index 0000000..5827db6
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-16/12952684614.desktop
@@ -0,0 +1,3 @@
+# Calculate format=kde link=/usr/share/applications/galculator.desktop
+[Desktop Entry]
+X-XFCE-Source=file:///usr/share/applications/galculator.desktop
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-17/12952684805.desktop b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-17/12952684805.desktop
new file mode 100644
index 0000000..8f07621
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-17/12952684805.desktop
@@ -0,0 +1,3 @@
+# Calculate format=kde link=/usr/share/applications/writer.desktop
+[Desktop Entry]
+X-XFCE-Source=file:///usr/share/applications/writer.desktop
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-18/12952684846.desktop b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-18/12952684846.desktop
new file mode 100644
index 0000000..a64d647
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-18/12952684846.desktop
@@ -0,0 +1,3 @@
+# Calculate format=kde link=/usr/share/applications/calc.desktop
+[Desktop Entry]
+X-XFCE-Source=file:///usr/share/applications/calc.desktop
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/xkb-plugin-10.rc b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/xkb-plugin-10.rc
new file mode 100644
index 0000000..f04b04d
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/xkb-plugin-10.rc
@@ -0,0 +1,10 @@
+display_type=1
+group_policy=2
+default_group=0
+never_modify_config=false
+model=pc104
+layouts=us,ru
+variants=,
+toggle_option=grp:caps_toggle
+compose_key_position=
+
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
new file mode 100644
index 0000000..dd8ce7c
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="keyboards" version="1.0">
+  <property name="Default" type="empty">
+    <property name="Numlock" type="bool" value="true"/>
+    <property name="KeyRepeat" type="empty">
+      <property name="Rate" type="int" value="30"/>
+      <property name="Delay" type="int" value="330"/>
+      </property>
+  </property>
+</channel>
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
new file mode 100644
index 0000000..f0e5a2a
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-desktop" version="1.0">
+  <property name="desktop-icons" type="empty">
+    <property name="file-icons" type="empty">
+      <property name="show-trash" type="bool" value="false"/>
+      <property name="show-removable" type="bool" value="false"/>
+      <property name="show-filesystem" type="bool" value="false"/>
+    </property>
+    <property name="icon-size" type="uint" value="42"/>
+  </property>
+  <property name="backdrop" type="empty">
+    <property name="screen0" type="empty">
+      <property name="monitor0" type="empty">
+        <property name="image-path" type="string" value="/usr/share/xfce4/backdrops/xfce-stripes.png"/>
+        <property name="last-image" type="string" value="/usr/share/xfce4/backdrops/xfce-stripes.png"/>
+        <property name="last-single-image" type="string" value="/usr/share/xfce4/backdrops/xfce-stripes.png"/>
+      </property>
+    </property>
+  </property>
+</channel>
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
new file mode 100644
index 0000000..9666572
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-panel" version="1.0">
+  <property name="panels" type="uint" value="2">
+    <property name="panel-0" type="empty">
+      <property name="position" type="string" value="p=6;x=0;y=0"/>
+      <property name="length" type="uint" value="100"/>
+      <property name="position-locked" type="bool" value="true"/>
+      <property name="plugin-ids" type="array">
+        <value type="int" value="1"/>
+        <value type="int" value="7"/>
+        <value type="int" value="4"/>
+        <value type="int" value="8"/>
+        <value type="int" value="3"/>
+        <value type="int" value="9"/>
+        <value type="int" value="6"/>
+        <value type="int" value="10"/>
+        <value type="int" value="11"/>
+        <value type="int" value="5"/>
+        <value type="int" value="12"/>
+        <value type="int" value="2"/>
+      </property>
+    </property>
+    <property name="panel-1" type="empty">
+      <property name="position" type="string" value="p=10;x=0;y=0"/>
+      <property name="size" type="uint" value="48"/>
+      <property name="position-locked" type="bool" value="true"/>
+      <property name="plugin-ids" type="array">
+        <value type="int" value="13"/>
+        <value type="int" value="14"/>
+        <value type="int" value="15"/>
+        <value type="int" value="16"/>
+        <value type="int" value="17"/>
+        <value type="int" value="18"/>
+      </property>
+      <property name="length" type="uint" value="10"/>
+      <property name="autohide" type="bool" value="true"/>
+    </property>
+  </property>
+  <property name="plugins" type="empty">
+    <property name="plugin-1" type="string" value="applicationsmenu">
+      <property name="show-button-title" type="bool" value="false"/>
+    </property>
+    <property name="plugin-2" type="string" value="actions"/>
+    <property name="plugin-3" type="string" value="tasklist"/>
+    <property name="plugin-4" type="string" value="pager"/>
+    <property name="plugin-5" type="string" value="clock">
+      <property name="show-frame" type="bool" value="false"/>
+    </property>
+    <property name="plugin-6" type="string" value="systray">
+      <property name="plugin-7" type="string" value="showdesktop"/>
+      <property name="names-visible" type="array">
+        <value type="string" value="апплет networkmanager"/>
+        <value type="string" value="blueman-applet"/>
+      </property>
+    </property>
+    <property name="plugin-7" type="string" value="directorymenu">
+      <property name="base-directory" type="string" value="/home/guest"/>
+    </property>
+    <property name="plugin-8" type="string" value="showdesktop"/>
+    <property name="plugin-9" type="string" value="thunar-tpa"/>
+    <property name="plugin-10" type="string" value="xkb-plugin"/>
+    <property name="plugin-11" type="string" value="xfce4-mixer-plugin"/>
+    <property name="plugin-12" type="string" value="actions">
+      <property name="first-action" type="uint" value="2"/>
+    </property>
+    <property name="plugin-13" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="12952684181.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-14" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="12952684322.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-15" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="12952684423.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-16" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="12952684614.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-17" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="12952684805.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-18" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="12952684846.desktop"/>
+      </property>
+    </property>
+  </property>
+</channel>
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
new file mode 100644
index 0000000..861c741
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-session" version="1.0">
+  <property name="general" type="empty">
+    <property name="FailsafeSessionName" type="empty"/>
+    <property name="SessionName" type="string" value="Default"/>
+    <property name="SaveOnExit" type="bool" value="false"/>
+  </property>
+  <property name="sessions" type="empty">
+    <property name="Failsafe" type="empty">
+      <property name="IsFailsafe" type="empty"/>
+      <property name="Count" type="empty"/>
+      <property name="Client0_Command" type="empty"/>
+      <property name="Client0_PerScreen" type="empty"/>
+      <property name="Client1_Command" type="empty"/>
+      <property name="Client1_PerScreen" type="empty"/>
+      <property name="Client2_Command" type="empty"/>
+      <property name="Client2_PerScreen" type="empty"/>
+      <property name="Client3_Command" type="empty"/>
+      <property name="Client3_PerScreen" type="empty"/>
+      <property name="Client4_Command" type="empty"/>
+      <property name="Client4_PerScreen" type="empty"/>
+    </property>
+  </property>
+  <property name="splash" type="empty">
+    <property name="Engine" type="empty"/>
+  </property>
+</channel>
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
new file mode 100644
index 0000000..4fa587e
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfwm4" version="1.0">
+  <property name="general" type="empty">
+    <property name="button_layout" type="string" value="O|HMC"/>
+    <property name="move_opacity" type="int" value="90"/>
+    <property name="resize_opacity" type="int" value="90"/>
+    <property name="snap_to_windows" type="bool" value="true"/>
+    <property name="title_alignment" type="string" value="left"/>
+    <property name="title_font" type="string" value="Droid Sans Bold 10"/>
+    <property name="use_compositing" type="bool" value="false"/>
+    <property name="wrap_windows" type="bool" value="false"/>
+  </property>
+</channel>
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
new file mode 100644
index 0000000..868aa29
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xsettings" version="1.0">
+  <property name="Net" type="empty">
+    <property name="ThemeName" type="string" value="Xfce-4.2"/>
+    <property name="IconThemeName" type="string" value="Calculate"/>
+  </property>
+  <property name="Xft" type="empty">
+    <property name="Antialias" type="int" value="1"/>
+    <property name="HintStyle" type="string" value="hintmedium"/>
+  </property>
+  <property name="Gtk" type="empty">
+    <property name="FontName" type="string" value="Droid Sans 10"/>
+  </property>
+</channel>
diff --git a/desktop/desktop/40-xfce-4.8/Desktop/.calculate_directory b/desktop/desktop/40-xfce-4.8/Desktop/.calculate_directory
new file mode 100644
index 0000000..879d998
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/Desktop/.calculate_directory
@@ -0,0 +1 @@
+# Calculate name= path="#-ini(resource.desktop)-#"
diff --git a/desktop/desktop/40-xfce-4.8/Desktop/FTP.desktop b/desktop/desktop/40-xfce-4.8/Desktop/FTP.desktop
new file mode 100644
index 0000000..2f51da8
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/Desktop/FTP.desktop
@@ -0,0 +1,12 @@
+# Calculate format=samba env(client.os_remote_auth)!=&&ur_domain_set==on&&server(ftp.host)!=
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Application
+Name=FTP
+Comment=Browser FTP
+Categories=Application;
+Exec=thunar /home/#-ur_login-#/FTP
+Icon=update-manager
+Terminal=false
+StartupNotify=false
diff --git a/desktop/desktop/40-xfce-4.8/Desktop/Home.desktop b/desktop/desktop/40-xfce-4.8/Desktop/Home.desktop
new file mode 100644
index 0000000..ed986f2
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/Desktop/Home.desktop
@@ -0,0 +1,17 @@
+# Calculate format=samba
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Application
+Name=Home
+Comment=Browser Home
+Categories=Application;
+#?env(client.os_remote_auth)!=&&ur_domain_set==on#
+Exec=thunar /home/#-ur_login-#/Home
+#env#
+#?env(client.os_remote_auth)==||ur_domain_set==off#
+Exec=thunar /home/#-ur_login-#
+#env#
+Icon=user-home
+Terminal=false
+StartupNotify=false
diff --git a/desktop/desktop/40-xfce-4.8/Desktop/README.desktop b/desktop/desktop/40-xfce-4.8/Desktop/README.desktop
new file mode 100644
index 0000000..0868118
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/Desktop/README.desktop
@@ -0,0 +1,27 @@
+# Calculate os_root_type==livecd chmod=0755
+#!/usr/bin/env xdg-open
+
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Application
+Name[bg]=Ръководство за инсталиране
+Name[ru]=Руководство по установке
+Name=Installation Guide
+Comment=
+Categories=Application;
+#?os_locale_language!=ru&&pkg(www-client/chromium)==0#
+Exec=xdg-open /usr/share/calculate/doc/handbook-en.html
+#os_locale_language#
+#?os_locale_language!=ru&&pkg(www-client/chromium)>0#
+Exec=chromium --app="file:///usr/share/calculate/doc/handbook-en.html"
+#os_locale_language#
+#?os_locale_language==ru&&pkg(www-client/chromium)==0#
+Exec=xdg-open /usr/share/calculate/doc/handbook-ru.html
+#os_locale_language#
+#?os_locale_language==ru&&pkg(www-client/chromium)>0#
+Exec=chromium --app="file:///usr/share/calculate/doc/handbook-ru.html"
+#os_locale_language#
+Icon=text-html
+Terminal=false
+StartupNotify=false
diff --git a/desktop/desktop/40-xfce-4.8/Desktop/Share.desktop b/desktop/desktop/40-xfce-4.8/Desktop/Share.desktop
new file mode 100644
index 0000000..53bec28
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/Desktop/Share.desktop
@@ -0,0 +1,12 @@
+# Calculate format=samba env(client.os_remote_auth)!=&&ur_domain_set==on
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Application
+Name=Share
+Comment=Browser Share
+Categories=Application;
+Exec=thunar /home/#-ur_login-#/Share
+Icon=folder-remote
+Terminal=false
+StartupNotify=false
diff --git a/desktop/desktop/40-xfce-4.8/Desktop/calculate-community.desktop b/desktop/desktop/40-xfce-4.8/Desktop/calculate-community.desktop
new file mode 100644
index 0000000..da74a5c
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/Desktop/calculate-community.desktop
@@ -0,0 +1,14 @@
+# Calculate format=kde link=/usr/share/applications/xchat.desktop mirror os_root_type==livecd
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Application
+Name=Calculate Linux Community
+Name[ru]=Сообщество Calculate Linux
+#Change command line
+#?os_locale_language!=ru#
+Exec=xchat "--url=irc://irc.freenode.net:6667/#calculate"
+#os_locale_language#
+#?os_locale_language==ru#
+Exec=xchat "--url=irc://irc.freenode.net:6667/#calculate-ru"
+#os_locale_language#
diff --git a/desktop/desktop/40-xfce-4.8/Desktop/calculate-install.desktop b/desktop/desktop/40-xfce-4.8/Desktop/calculate-install.desktop
new file mode 100644
index 0000000..2c04924
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/Desktop/calculate-install.desktop
@@ -0,0 +1,4 @@
+# Calculate format=kde link=/usr/share/applications/cl-install-gui.desktop os_root_type==livecd mirror
+[Desktop Entry]
+Exec=sudo cl-install-gui
+
diff --git a/desktop/desktop/40-xfce-4.8/Desktop/gparted.desktop b/desktop/desktop/40-xfce-4.8/Desktop/gparted.desktop
new file mode 100644
index 0000000..7b59502
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/Desktop/gparted.desktop
@@ -0,0 +1,4 @@
+# Calculate format=kde link=/usr/share/applications/gparted.desktop mirror os_root_type==livecd
+[Desktop Entry]
+Exec=sudo /usr/sbin/gparted %f
+!OnlyShowIn=
diff --git a/desktop/desktop/40-xfce-always/.calculate_directory b/desktop/desktop/40-xfce-always/.calculate_directory
index f00fc2a..ce254d4 100644
--- a/desktop/desktop/40-xfce-always/.calculate_directory
+++ b/desktop/desktop/40-xfce-always/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(xfdesktop)!=&&ini(domain)!=#-env(client.os_remote_auth)-#&&pkg(xfce-base/xfdesktop)>=4.6||belong(xfdesktop)!=&&ini(xsession)!=#-cl_desktop_xsession-#&&pkg(xfce-base/xfdesktop)>=4.6
+# Calculate append=skip belong(xfdesktop)!=&&ini(domain)!=#-env(client.os_remote_auth)-#&&pkg(xfce-base/xfdesktop)<4.8||belong(xfdesktop)!=&&ini(xsession)!=#-cl_desktop_xsession-#&&pkg(xfce-base/xfdesktop)>=4.6&&pkg(xfce-base/xfdesktop)<4.8
diff --git a/desktop/desktop/60-gqview-2.1/.calculate/ini.env b/desktop/desktop/60-gqview-2.1/.calculate/ini.env
new file mode 100644
index 0000000..bb4b21c
--- /dev/null
+++ b/desktop/desktop/60-gqview-2.1/.calculate/ini.env
@@ -0,0 +1,7 @@
+# Calculate format=samba
+
+[ver]
+gqview = 2.1
+
+[update]
+gqview = on
diff --git a/desktop/desktop/60-gqview-2.1/.calculate_directory b/desktop/desktop/60-gqview-2.1/.calculate_directory
new file mode 100644
index 0000000..fee07fa
--- /dev/null
+++ b/desktop/desktop/60-gqview-2.1/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip belong(gqview)!=&&ini(update.gqview)!=off&&ini(ver.gqview)==&&pkg(media-gfx/gqview)>=2.1
diff --git a/desktop/desktop/40-xfce-4.6/.gqview/gqviewrc b/desktop/desktop/60-gqview-2.1/gqviewrc
similarity index 88%
rename from desktop/desktop/40-xfce-4.6/.gqview/gqviewrc
rename to desktop/desktop/60-gqview-2.1/gqviewrc
index f0f752a..0c398e9 100644
--- a/desktop/desktop/40-xfce-4.6/.gqview/gqviewrc
+++ b/desktop/desktop/60-gqview-2.1/gqviewrc
@@ -1,3 +1,4 @@
+# Calculate path=~/.gqview
 # черный фон окна
 black_window_background: true
 # автовращение по exit