Merge branch 'master' of git.calculate.ru:calculate2/calculate-client

client-profiles/20-kde-4.3-4.4/.local/share/applications/mimeapps.list

@@ -1,26 +1,12 @@
 # Calculate format=compiz
 [Added Associations]
-#?pkg(www-client/mozilla-firefox)>=3.5&pkg(www-client/mozilla-firefox)<3.6#
-application/rss+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/vnd.mozilla.xul+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/x-font-ttx=mozilla-firefox-3.5.desktop;
-application/x-ufraw=mozilla-firefox-3.5.desktop;
-application/xhtml+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xml-external-parsed-entity=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xsd=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xslt+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-text/html=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-#pkg#
-#?pkg(www-client/mozilla-firefox)>=3.6#
-application/rss+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/vnd.mozilla.xul+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/x-font-ttx=mozilla-firefox-3.6.desktop;
-application/x-ufraw=mozilla-firefox-3.6.desktop;
-application/xhtml+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xml-external-parsed-entity=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xsd=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xslt+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-text/html=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-#pkg#
+application/rss+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
+application/vnd.mozilla.xul+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
+application/x-font-ttx=mozilla-firefox.desktop;
+application/x-ufraw=mozilla-firefox.desktop;
+application/xhtml+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
+application/xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
+application/xml-external-parsed-entity=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
+application/xsd=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
+application/xslt+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
+text/html=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;

client-profiles/20-kde-4.3/.local/share/applications/mimeapps.list

@@ -1,25 +1,12 @@
+# Calculate format=compiz
 [Added Associations]
-#?pkg(www-client/mozilla-firefox)>=3.5&pkg(www-client/mozilla-firefox)<3.6#
-application/rss+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/vnd.mozilla.xul+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/x-font-ttx=mozilla-firefox-3.5.desktop;
-application/x-ufraw=mozilla-firefox-3.5.desktop;
-application/xhtml+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xml-external-parsed-entity=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xsd=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xslt+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-text/html=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-#pkg#
-#?pkg(www-client/mozilla-firefox)>=3.6#
-application/rss+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/vnd.mozilla.xul+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/x-font-ttx=mozilla-firefox-3.6.desktop;
-application/x-ufraw=mozilla-firefox-3.6.desktop;
-application/xhtml+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xml-external-parsed-entity=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xsd=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xslt+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-text/html=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-#pkg#
+application/rss+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
+application/vnd.mozilla.xul+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
+application/x-font-ttx=mozilla-firefox.desktop;
+application/x-ufraw=mozilla-firefox.desktop;
+application/xhtml+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
+application/xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
+application/xml-external-parsed-entity=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
+application/xsd=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
+application/xslt+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
+text/html=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;

client-profiles/20-kde-4.4/.local/share/applications/mimeapps.list

@@ -1,25 +1,12 @@
+# Calculate format=compiz
 [Added Associations]
-#?pkg(www-client/mozilla-firefox)>=3.5&pkg(www-client/mozilla-firefox)<3.6#
-application/rss+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/vnd.mozilla.xul+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/x-font-ttx=mozilla-firefox-3.5.desktop;
-application/x-ufraw=mozilla-firefox-3.5.desktop;
-application/xhtml+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xml-external-parsed-entity=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xsd=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xslt+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-text/html=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-#pkg#
-#?pkg(www-client/mozilla-firefox)>=3.6#
-application/rss+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/vnd.mozilla.xul+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/x-font-ttx=mozilla-firefox-3.6.desktop;
-application/x-ufraw=mozilla-firefox-3.6.desktop;
-application/xhtml+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xml-external-parsed-entity=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xsd=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xslt+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-text/html=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-#pkg#
+application/rss+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
+application/vnd.mozilla.xul+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
+application/x-font-ttx=mozilla-firefox.desktop;
+application/x-ufraw=mozilla-firefox.desktop;
+application/xhtml+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
+application/xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
+application/xml-external-parsed-entity=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
+application/xsd=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
+application/xslt+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
+text/html=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;

client-profiles/20-kde-always/Desktop/FTP.desktop.remove

@@ -1,8 +1 @@
-# Calculate append=remove name=FTP.desktop format=kde cl_remote_host!=&cl_remote_ftp==
-[Desktop Entry]
-Encoding=UTF-8
-Name=FTP
-Comment=Browser FTP
-URL[$e]=$HOME/FTP
-Icon=folder-downloads
-Type=Link
+# Calculate append=remove name=FTP.desktop cl_remote_host!=&cl_remote_ftp==

client-profiles/30-gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml

@@ -3,7 +3,7 @@
 <gconf>
 	<entry name="attached_toplevel_id" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>
 	#-pop(offsetx)-#
-	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(offsetx,offsetx,offsetx+31)-#"/>
+	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(offsetx,offsetx,offsetx+1)-#"/>
 	#-push(offsetx)-#
 	<entry name="use_menu_path" schema="/schemas/apps/panel/objects/use_menu_path"/>
 	<entry name="action_type" schema="/schemas/apps/panel/objects/action_type"/>

client-profiles/30-gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml

@@ -2,7 +2,7 @@
 <?xml version="1.0"?>
 <gconf>
 	<entry name="attached_toplevel_id" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>
-	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="64"/>
+	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="96"/>
 	<entry name="use_menu_path" schema="/schemas/apps/panel/objects/use_menu_path"/>
 	<entry name="action_type" schema="/schemas/apps/panel/objects/action_type"/>
 	<entry name="toplevel_id" schema="/schemas/apps/panel/objects/toplevel_id" type="string">

client-profiles/40-cldx-10.2-10.4/.config/xfce4/panel/panels.xml

@@ -1,4 +1,4 @@
-
+# Calculate append=replace
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE config SYSTEM "config.dtd">
 <panels>

client-profiles/40-cldx-10.2-10.4/.local/share/applications/defaults.list

@@ -1,2 +1,44 @@
+# Calculate format=compiz
 [Default Applications]
-application/pdf=epdfview.desktop
+application/illustrator=gimp.desktop
+application/pdf=evince.desktop;gimp.desktop
+application/rss+xml=mozilla-firefox.desktop
+application/vnd.mozilla.xul+xml=mozilla-firefox.desktop
+application/vnd.oasis.opendocument.spreadsheet=calc.desktop
+application/vnd.oasis.opendocument.text=writer.desktop
+application/x-font-ttx=mozilla-firefox.desktop
+application/x-ufraw=mozilla-firefox.desktop
+application/xhtml+xml=mozilla-firefox.desktop
+application/xml-external-parsed-entity=mozilla-firefox.desktop
+application/xml=mozilla-firefox.desktop
+application/xsd=mozilla-firefox.desktop
+application/xslt+xml=mozilla-firefox.desktop
+audio/mp4=audacious2-gtkui.desktop
+audio/mpeg=audacious2-gtkui.desktop
+audio/x-flac=audacious2-gtkui.desktop
+audio/x-ms-wma=audacious2-gtkui.desktop
+audio/x-wav=audacious2-gtkui.desktop
+image/bmp=gqview.desktop;gimp.desktop
+image/gif=gqview.desktop;gimp.desktop
+image/jpeg=gqview.desktop;gimp.desktop
+image/jpg=gqview.desktop;gimp.desktop
+image/png=gqview.desktop;gimp.desktop
+image/svg+xml-compressed=gimp.desktop;gqview.desktop
+image/svg+xml=gqview.desktop;gimp.desktop
+image/tiff=gqview.desktop;gimp.desktop
+image/vnd.microsoft.icon=gqview.desktop;gimp.desktop
+image/vnd.wap.wbmp=gqview.desktop;gimp.desktop
+image/x-gray=gqview.desktop;gimp.desktop
+image/x-pcx=gqview.desktop;gimp.desktop
+image/x-png=gqview.desktop;gimp.desktop
+image/x-portable-anymap=gqview.desktop;gimp.desktop
+image/x-portable-bitmap=gqview.desktop;gimp.desktop
+image/x-portable-graymap=gqview.desktop;gimp.desktop
+image/x-portable-pixmap=gqview.desktop;gimp.desktop
+image/x-tga=gqview.desktop;gimp.desktop
+image/x-xbitmap=gqview.desktop;gimp.desktop
+image/x-xpixmap=gqview.desktop;gimp.desktop
+text/html=mozilla-firefox.desktop
+text/plain=mousepad.desktop
+video/x-msvideo=gnome-mplayer.desktop
+

client-profiles/40-cldx-10.2-10.4/.local/share/applications/mimeapps.list

@@ -1,26 +0,0 @@
-[Added Associations]
-application/pdf=evince.desktop;gimp.desktop
-#?pkg(www-client/mozilla-firefox)>=3.5&pkg(www-client/mozilla-firefox)<3.6#
-application/rss+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/vnd.mozilla.xul+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/x-font-ttx=mozilla-firefox-3.5.desktop;
-application/x-ufraw=mozilla-firefox-3.5.desktop;
-application/xhtml+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xml-external-parsed-entity=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xsd=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xslt+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-text/html=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-#pkg#
-#?pkg(www-client/mozilla-firefox)>=3.6#
-application/rss+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/vnd.mozilla.xul+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/x-font-ttx=mozilla-firefox-3.6.desktop;
-application/x-ufraw=mozilla-firefox-3.6.desktop;
-application/xhtml+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xml-external-parsed-entity=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xsd=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xslt+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-text/html=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-#pkg#

client-profiles/40-xfce-4.6/.config/xfce4/panel/panels.xml

@@ -1,4 +1,4 @@
-
+# Calculate format=xml_xfcepanel
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE config SYSTEM "config.dtd">
 <panels>

client-profiles/40-xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml

@@ -5,4 +5,9 @@
   <property name="general" type="empty">
     <property name="SaveOnExit" type="bool" value="false"/>
   </property>
+#?os_root_type==livecd#
+  <property name="shutdown" type="empty">
+    <property name="ShowHibernate" type="bool" value="false"/>
+  </property>
+#os_root_type#
 </channel>

client-profiles/40-xfce-4.6/.local/share/applications/audacious2-gtkui.desktop

@@ -0,0 +1,4 @@
+# Calculate format=kde link=/usr/share/applications/audacious2-gtkui.desktop mirror
+[Desktop Entry]
+#hidden from menu
+OnlyShowIn=X-NeverShowThis;

client-profiles/40-xfce-4.6/.local/share/applications/audacious2.desktop

@@ -0,0 +1,3 @@
+# Calculate format=kde link=/usr/share/applications/audacious2.desktop mirror
+[Desktop Entry]
+Exec=audacious2 -i gtkui %U

client-profiles/40-xfce-4.6/.local/share/applications/defaults.list

@@ -1,2 +1,44 @@
+# Calculate format=compiz
 [Default Applications]
-application/pdf=epdfview.desktop
+application/illustrator=gimp.desktop
+application/pdf=evince.desktop;gimp.desktop
+application/rss+xml=mozilla-firefox.desktop
+application/vnd.mozilla.xul+xml=mozilla-firefox.desktop
+application/vnd.oasis.opendocument.spreadsheet=calc.desktop
+application/vnd.oasis.opendocument.text=writer.desktop
+application/x-font-ttx=mozilla-firefox.desktop
+application/x-ufraw=mozilla-firefox.desktop
+application/xhtml+xml=mozilla-firefox.desktop
+application/xml-external-parsed-entity=mozilla-firefox.desktop
+application/xml=mozilla-firefox.desktop
+application/xsd=mozilla-firefox.desktop
+application/xslt+xml=mozilla-firefox.desktop
+audio/mp4=audacious2-gtkui.desktop
+audio/mpeg=audacious2-gtkui.desktop
+audio/x-flac=audacious2-gtkui.desktop
+audio/x-ms-wma=audacious2-gtkui.desktop
+audio/x-wav=audacious2-gtkui.desktop
+image/bmp=gqview.desktop;gimp.desktop
+image/gif=gqview.desktop;gimp.desktop
+image/jpeg=gqview.desktop;gimp.desktop
+image/jpg=gqview.desktop;gimp.desktop
+image/png=gqview.desktop;gimp.desktop
+image/svg+xml-compressed=gimp.desktop;gqview.desktop
+image/svg+xml=gqview.desktop;gimp.desktop
+image/tiff=gqview.desktop;gimp.desktop
+image/vnd.microsoft.icon=gqview.desktop;gimp.desktop
+image/vnd.wap.wbmp=gqview.desktop;gimp.desktop
+image/x-gray=gqview.desktop;gimp.desktop
+image/x-pcx=gqview.desktop;gimp.desktop
+image/x-png=gqview.desktop;gimp.desktop
+image/x-portable-anymap=gqview.desktop;gimp.desktop
+image/x-portable-bitmap=gqview.desktop;gimp.desktop
+image/x-portable-graymap=gqview.desktop;gimp.desktop
+image/x-portable-pixmap=gqview.desktop;gimp.desktop
+image/x-tga=gqview.desktop;gimp.desktop
+image/x-xbitmap=gqview.desktop;gimp.desktop
+image/x-xpixmap=gqview.desktop;gimp.desktop
+text/html=mozilla-firefox.desktop
+text/plain=mousepad.desktop
+video/x-msvideo=gnome-mplayer.desktop
+

client-profiles/40-xfce-4.6/.local/share/applications/mimeapps.list

@@ -1,26 +0,0 @@
-[Added Associations]
-application/pdf=evince.desktop;gimp.desktop
-#?pkg(www-client/mozilla-firefox)>=3.5&pkg(www-client/mozilla-firefox)<3.6#
-application/rss+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/vnd.mozilla.xul+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/x-font-ttx=mozilla-firefox-3.5.desktop;
-application/x-ufraw=mozilla-firefox-3.5.desktop;
-application/xhtml+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xml-external-parsed-entity=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xsd=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xslt+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-text/html=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-#pkg#
-#?pkg(www-client/mozilla-firefox)>=3.6#
-application/rss+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/vnd.mozilla.xul+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/x-font-ttx=mozilla-firefox-3.6.desktop;
-application/x-ufraw=mozilla-firefox-3.6.desktop;
-application/xhtml+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xml-external-parsed-entity=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xsd=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xslt+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-text/html=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-#pkg#

client-profiles/40-xfce-4.6/.local/share/desktop-directories/xfce-accessories.directory

@@ -1,3 +1,12 @@
-# Calculate format=kde link=/usr/share/desktop-directories/xfce-network.directory mirror
+# Calculate format=kde link=/usr/share/desktop-directories/xfce-accessories.directory mirror
+
 [Desktop Entry]
+Name=Utilities
+Name[de]=Dienstprogramme
+Name[es]=Utilidades
+Name[fr]=Utilitaires
+Name[it]=Accessori
+Name[pl]=Narzędzia
+Name[pt_BR]=Utilitários
 Name[ru]=Служебные
+Name[uk]=Утиліти

client-profiles/40-xfce-always/.calculate_directory

@@ -0,0 +1 @@
+# Calculate ini(main.update)!=off&ini(update.xfce)!=off&pkg(xfce-base/xfdesktop)>=4.6&ini(domain)!=cl_remote_host

client-profiles/40-xfce-always/.config/xfce4/desktop/icons.screen0.rc

@@ -0,0 +1,17 @@
+# Calculate format=samba
+[Home]
+row=0
+col=0
+
+#?cl_remote_host!=#
+[Disks]
+row=0
+col=1
+#cl_remote_host#
+
+#?cl_remote_host!=&cl_remote_ftp!=#
+[FTP]
+row=0
+col=2
+#cl_remote_host#
+

client-profiles/40-xfce-always/.config/xfce4/panel/panels.xml

@@ -0,0 +1,34 @@
+# Calculate format=xml_xfcepanel
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE config SYSTEM "config.dtd">
+<panels>
+	<panel>
+		<items>
+			<item name="xfce4-menu" id="1"/>
+#?cl_remote_host!=#
+			<item name="launcher" id="20"/>
+			<item name="launcher" id="21"/>
+#cl_remote_host#
+#?cl_remote_host!=&cl_remote_ftp!=#
+			<item name="launcher" id="22"/>
+#cl_remote_host#
+#?cl_remote_host==#
+			<item name="launcher" id="23"/>
+#cl_remote_host#
+			<item name="separator" id="50"/>
+			<item name="pager" id="3"/>
+			<item name="tasklist" id="5"/>
+			<item name="thunar-tpa" id="14"/>
+#?hr_laptop!=#
+			<item name="battmon" id="13"/>
+#hr_laptop#
+			<item name="xkb-plugin" id="8"/>
+			<item name="systray" id="6"/>
+			<item name="separator" id="51"/>
+			<item name="xfce4-mixer-plugin" id="9"/>
+			<item name="datetime" id="10"/>
+			<item name="separator" id="52"/>
+			<item name="actions" id="12"/>
+		</items>
+	</panel>
+</panels>

client-profiles/40-xfce-always/Desktop/FTP.desktop

@@ -0,0 +1,12 @@
+# Calculate format=samba cl_remote_host!=&cl_remote_ftp!=
+[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

client-profiles/40-xfce-always/Desktop/FTP.desktop.remove

@@ -0,0 +1 @@
+# Calculate append=remove name=FTP.desktop cl_remote_host!=&cl_remote_ftp==

profiles/client/etc/xdg/xfce4/kiosk/kioskrc

@@ -0,0 +1,9 @@
+# Calculate format=samba pkg(xfce-base/xfdesktop)!=
+
+[xfce4-session]
+#?cl_remote_host!=#
+Shutdown=NONE
+#cl_remote_host#
+#?cl_remote_host==#
+!Shutdown=
+#cl_remote_host#

profiles/domain/etc/xdg/xfce4/kiosk/kioskrc

@@ -0,0 +1,9 @@
+# Calculate format=samba pkg(xfce-base/xfdesktop)!=
+
+[xfce4-session]
+#?cl_remote_host!=#
+Shutdown=NONE
+#cl_remote_host#
+#?cl_remote_host==#
+!Shutdown=
+#cl_remote_host#

pym/cl_client.py

@@ -35,7 +35,7 @@ import subprocess
 from encrypt import encrypt
 from signal import SIGTERM
 
-Version = "calculate-client 2.1.12"
+Version = "calculate-client 2.1.15"
 
 tr = cl_base.lang()
 tr.setLanguage(sys.modules[__name__])
@@ -88,7 +88,7 @@ class GProgressBar(NoneProgressBar):
         title = re.sub("<[^>]+>", "", title)
         self.title = title
         if os.system('which Xdialog &>/dev/null') == 0:
-            pipe = subprocess.Popen('/usr/bin/Xdialog --progress "%s" 5 80'\
+            pipe = subprocess.Popen('/usr/bin/Xdialog --progress "%s" 6 80'\
                                     %(self.title),
                                     stdin=subprocess.PIPE,
                                     stdout=subprocess.PIPE,

pym/cl_vars_client.py

@@ -138,7 +138,7 @@ class Data:
     cl_name = {'value':'calculate-client'}
 
     # версия программы
-    cl_ver = {'value':'2.1.12'}
+    cl_ver = {'value':'2.1.15'}
 
     # Режим работы клиента клиент
     # (local или имя хоста клиента)

setup.py

@@ -102,7 +102,7 @@ class cl_install_data(install_data):
 
 setup(
     name = 'calculate-client',
-    version = "2.1.12",
+    version = "2.1.15",
     description = "Client for the calculate-server",
     author = "Mir Calculate Ltd.",
     author_email = "support@calculate.ru",