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

client-profiles/20-kde-4.4/.kde4/share/config/plasma-desktop-appletsrc

@@ -114,6 +114,7 @@ Order=#-sum(apporder,apporder+1)-#
 #cl_remote_host#
 #?cl_remote_ftp==#
 [Containments][#-sum(cont,cont)-#][Applets][!#-sum(app,app+1)-#]
+#-sum(apporder,,apporder+1)-#
 #cl_remote_ftp#
 
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]

client-profiles/20-kde-always/.calculate_directory

@@ -0,0 +1 @@
+# Calculate ini(main.update)!=off&ini(update.kde)!=off&pkg(kde-base/kdelibs)>=4.4

client-profiles/20-kde-always/.kde4/share/config/plasma-desktop-appletsrc

@@ -0,0 +1,12 @@
+# Calculate format=plasma cl_remote_host!=&ini(domain)!=cl_remote_host
+#------------------------------------------------------------------------------
+#рабочий стол
+#------------------------------------------------------------------------------
+
+[Containments][1]
+#-sum(iconx,,10)-#
+#-sum(icony,,10)-#
+#-sum(iconcx,,112)-#
+#-sum(iconcy,,100)-#
+#-sum(iconcount,,2)-#
+savedPositions=1,7,Home.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,Disks.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,FTP.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,#-sum(iconx,,10)-##-sum(icony,,icony+iconcy)-#calculate-install.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,partitionmanager.desktop,#-sum(iconx,iconx,10)-#,#-sum(icony,icony,icony+iconcy)-#,README.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,calculate-community.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#

client-profiles/20-kde-always/Desktop/.calculate_directory

@@ -0,0 +1,2 @@
+# Calculate cl_remote_host!=&ini(domain)!=cl_remote_host
+

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

@@ -0,0 +1,8 @@
+# Calculate 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

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

@@ -0,0 +1,8 @@
+# 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

client-profiles/90-gimp-2.6/.calculate/ini.env

@@ -0,0 +1,7 @@
+# Calculate format=samba
+
+[ver]
+gimp = 2.6
+
+[update]
+gimp = on

client-profiles/90-gimp-2.6/.calculate_directory

@@ -0,0 +1 @@
+# Calculate ini(main.update)!=off&ini(update.gimp)!=off&ini(ver.gimp)==&pkg(media-gfx/gimp)>=2.6

client-profiles/90-gimp-2.6/.local/share/applications/gimp.desktop

@@ -0,0 +1,12 @@
+# Calculate format=kde link=/usr/share/applications/gimp.desktop mirror
+
+[Desktop Entry]
+Name=Gimp
+Name[de]=Gimp
+Name[es]=Gimp
+Name[fr]=Gimp
+Name[it]=Gimp
+Name[pl]=Gimp
+Name[pt_BR]=Gimp
+Name[ru]=Gimp
+Name[uk]=Gimp

client-profiles/99-system-always/.calculate/ini.env

@@ -4,3 +4,9 @@
 #Delete flag updating system
 !newsystem =
 #ini#
+#?cl_remote_host!=#
+domain = #-cl_remote_host-#
+#cl_remote_host#
+#?cl_remote_host==#
+!domain = 
+#cl_remote_host#