Merge branch 'master' of http://mhiretskiy@git.calculate.ru/dev/calculate2/calculate-client

client-profiles/70-update-CLD9.9/.kde4/share/config/plasma-desktop-appletsrc

@@ -142,10 +142,10 @@ zvalue=150
 geometry=#-sum(x,0)-#,0,#-sum(x,bs,x+bs)-#,#-sum(bs,bs)-#
 immutability=1
 plugin=simplelauncher
-#plugin=lancelot_launcher
 zvalue=0
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
 icon=kde
+views=Applications,Favorites,RunCommand,Leave
 
 #?cl_remote_host==#
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
@@ -262,17 +262,9 @@ minimumSize=#-hr_x11_width-#,#-sum(panel,panel)-#
 #-sum(bs,,40)-#
 #-sum(sp,,4)-#
 #-sum(height,,bs+sp)-#
-#-sum(width,,height*12)-#
+#-sum(width,,height*14)-#
 
-#?pkg(xchat)!=#
-#-sum(width,,width+height)-#
-#pkg#
-
-#?pkg(digikam)!=#
-#-sum(width,,width+height)-#
-#pkg#
-
-#?pkg(k3b)!=#
+#?pkg(konversation)!=#
 #-sum(width,,width+height)-#
 #pkg#
 
@@ -293,7 +285,7 @@ plugin=icon
 zvalue=0
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
 #?pkg(mozilla-firefox)!=#
-Url=file:///usr/share/applications/mozilla-firefox-3.5.desktop
+Url=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox-3.5.desktop
 #pkg#
 #?pkg(mozilla-firefox)==#
 Url=file:///usr/share/applications/kde4/konqbrowser.desktop
@@ -307,14 +299,14 @@ zvalue=0
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
 Url=file:///usr/share/applications/kde4/KMail.desktop
 
-#?pkg(xchat)!=#
+#?pkg(konversation)!=#
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
 geometry=#-sum(x,x+sp)-#,0,#-sum(x,bs,x+bs)-#,#-sum(bs,bs)-#
 immutability=1
 plugin=icon
 zvalue=0
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-Url=file:///home/#-ur_login-#/.local/share/applications/calculate-community.desktop
+Url=file:///usr/share/applications/kde4/konversation.desktop
 #pkg#
 
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
@@ -349,14 +341,6 @@ zvalue=0
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
 Url=file:///usr/share/applications/kde4/kcalc.desktop
 
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
-geometry=#-sum(x,x+sp)-#,0,#-sum(x,bs,x+bs)-#,#-sum(bs,bs)-#
-immutability=1
-plugin=icon
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-Url=file:///usr/share/applications/kde4/kwrite.desktop
-
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
 geometry=#-sum(x,x+sp)-#,0,#-sum(x,bs,x+bs)-#,#-sum(bs,bs)-#
 immutability=1
@@ -365,7 +349,6 @@ zvalue=0
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
 Url=file:///home/#-ur_login-#/.local/share/applications/gimp.desktop
 
-#?pkg(digikam)!=#
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
 geometry=#-sum(x,x+sp)-#,0,#-sum(x,bs,x+bs)-#,#-sum(bs,bs)-#
 immutability=1
@@ -373,7 +356,6 @@ plugin=icon
 zvalue=0
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
 Url=file:///usr/share/applications/kde4/digikam.desktop
-#pkg#
 
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
 geometry=#-sum(x,x+sp)-#,0,#-sum(x,bs,x+bs)-#,#-sum(bs,bs)-#
@@ -391,7 +373,6 @@ zvalue=0
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
 Url=file:///usr/share/applications/smplayer.desktop
 
-#?pkg(k3b)!=#
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
 geometry=#-sum(x,x+sp)-#,0,#-sum(x,bs,x+bs)-#,#-sum(bs,bs)-#
 immutability=1
@@ -399,7 +380,6 @@ plugin=icon
 zvalue=0
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
 Url=file:///usr/share/applications/kde4/k3b.desktop
-#pkg#
 
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
 geometry=#-sum(x,x+sp)-#,0,#-sum(x,bs,x+bs)-#,#-sum(bs,bs)-#
@@ -414,6 +394,14 @@ Url=file:///usr/share/applications/goldendict.desktop
 Url=file:///usr/share/applications/qstardict.desktop
 #pkg#
 
+[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
+geometry=#-sum(x,x+sp)-#,0,#-sum(x,bs,x+bs)-#,#-sum(bs,bs)-#
+immutability=1
+plugin=icon
+zvalue=0
+[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
+Url=file:///usr/share/applications/kde4/kwrite.desktop
+
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
 geometry=#-sum(x,x+sp)-#,0,#-sum(x,bs,x+bs)-#,#-sum(bs,bs)-#
 immutability=1

client-profiles/70-update-CLD9.9/.local/share/applications/goldendict.desktop

@@ -0,0 +1,3 @@
+# Calculate format=kde link=/usr/share/applications/goldendict.desktop mirror
+[Desktop Entry]
+Categories=Office;Dictionary

client-profiles/70-update-CLD9.9/.local/share/applications/mozilla-firefox-3.5.desktop

@@ -0,0 +1,4 @@
+# Calculate format=kde link=/usr/share/applications/mozilla-firefox-3.5.desktop mirror
+[Desktop Entry]
+Icon=applications-internet
+Exec=kgtk-wrapper firefox %U