diff --git a/client-profiles/00-new_templates/.calculate/ini.env b/client-profiles/00-new_templates/.calculate/ini.env index e32d1f2..d496f27 100644 --- a/client-profiles/00-new_templates/.calculate/ini.env +++ b/client-profiles/00-new_templates/.calculate/ini.env @@ -1,13 +1,13 @@ # Calculate format=samba [ver] -#?load(ver,~/.zzz-calculate.kde)!=# +#?load(~/.zzz-calculate.kde)!=# kde = #-load(ver,~/.zzz-calculate.kde)-# kmail = #-load(ver,~/.zzz-calculate.kde)-# konversation = 1.2 #load# -#?load(ver,~/.zzz-calculate.xfce)!=# +#?load(~/.zzz-calculate.xfce)!=# xfce = #-load(ver,~/.zzz-calculate.xfce)-# pidgin = 2.6 xchat = 2.8 @@ -23,13 +23,13 @@ fbreader = 0.1 xscreensaver = 5.10 [update] -#?load(ver,~/.zzz-calculate.kde)!=# +#?load(~/.zzz-calculate.kde)!=# kde = on kmail = on konversation = on #load# -#?load(ver,~/.zzz-calculate.xfce)!=# +#?load(~/.zzz-calculate.xfce)!=# xfce = on pidgin = on xchat = on @@ -43,6 +43,7 @@ mc = on firefox = on fbreader = on xscreensaver = on +patch = on [main] update = on diff --git a/client-profiles/01-init/.calculate/ini.env b/client-profiles/01-init/.calculate/ini.env index e52f8cf..b98d3c8 100644 --- a/client-profiles/01-init/.calculate/ini.env +++ b/client-profiles/01-init/.calculate/ini.env @@ -11,3 +11,13 @@ update = on #exists# system = #-os_linux_shortname-# ver = #-os_linux_ver-# + +#?exists(~/.kde4)==&exists(~/.gconf)==&exists(~/.config)==# +[ver] +patch = 2.1.19 +#exists# + +[update] +#?exists(~/.kde4)==&exists(~/.gconf)==&exists(~/.config)==# +patch = on +#exists# diff --git a/client-profiles/20-kde-4.3-4.4/.kde4/share/config/kdeglobals b/client-profiles/20-kde-4.3-4.4/.kde4/share/config/kdeglobals index 70225e7..4d40d3b 100644 --- a/client-profiles/20-kde-4.3-4.4/.kde4/share/config/kdeglobals +++ b/client-profiles/20-kde-4.3-4.4/.kde4/share/config/kdeglobals @@ -1,10 +1,14 @@ # Calculate format=kde [General] +# сделать chromium браузером по умолчанию, если он установлен +#?pkg(www-client/chromium)!=# +BrowserApplication[$e]=file:///usr/share/applications/chromium-chromium.desktop +#pkg# # сделать mozilla firefox браузером по умолчанию, если он установлен -#?pkg(www-client/mozilla-firefox)!=# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# BrowserApplication[$e]=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop #pkg# -#?pkg(www-client/mozilla-firefox)==# +#?pkg(www-client/mozilla-firefox)==&pkg(www-client/chromium)==# BrowserApplication[$e]=file:///usr/share/applications/kde4/konqbrowser.desktop #pkg# diff --git a/client-profiles/20-kde-4.3-4.4/.kde4/share/config/kwinrc b/client-profiles/20-kde-4.3-4.4/.kde4/share/config/kwinrc index eb1f063..da8e600 100644 --- a/client-profiles/20-kde-4.3-4.4/.kde4/share/config/kwinrc +++ b/client-profiles/20-kde-4.3-4.4/.kde4/share/config/kwinrc @@ -20,3 +20,5 @@ kwin4_effect_slidebackEnabled=false ElectricBorderMaximize=false #не расятгивать окно на половину экрана после перемещения к боковому краю экрана ElectricBorderTiling=false +#уровень предотвращение перевода фокуса - никогда +FocusStealingPreventionLevel=0 diff --git a/client-profiles/20-kde-4.3-4.4/.kde4/share/config/kxkbrc b/client-profiles/20-kde-4.3-4.4/.kde4/share/config/kxkbrc new file mode 100644 index 0000000..ee71d0b --- /dev/null +++ b/client-profiles/20-kde-4.3-4.4/.kde4/share/config/kxkbrc @@ -0,0 +1,4 @@ +# Calculate format=kde +#Раскладка клавиатуры +[Layout] +Options=grp:caps_toggle,grp_led:scroll,terminate:ctrl_alt_bksp diff --git a/client-profiles/20-kde-4.3-4.4/.kde4/share/config/plasma-desktop-appletsrc b/client-profiles/20-kde-4.3-4.4/.kde4/share/config/plasma-desktop-appletsrc index fa596be..1727120 100644 --- a/client-profiles/20-kde-4.3-4.4/.kde4/share/config/plasma-desktop-appletsrc +++ b/client-profiles/20-kde-4.3-4.4/.kde4/share/config/plasma-desktop-appletsrc @@ -217,10 +217,13 @@ geometry=0,0,#-sum(width,width)-#,#-sum(height,height)-# !geometry=del [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] -#?pkg(www-client/mozilla-firefox)!=# +#?pkg(www-client/chromium)!=# +Url=file:///usr/share/applications/chromium-chromium.desktop +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# Url=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop #pkg# -#?pkg(www-client/mozilla-firefox)==# +#?pkg(www-client/mozilla-firefox)==&pkg(www-client/chromium)==# Url=file:///usr/share/applications/kde4/konqbrowser.desktop #pkg# [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] diff --git a/client-profiles/20-kde-4.3-4.4/.local/share/applications/mimeapps.list b/client-profiles/20-kde-4.3-4.4/.local/share/applications/mimeapps.list index 53be7ec..d4a1c33 100644 --- a/client-profiles/20-kde-4.3-4.4/.local/share/applications/mimeapps.list +++ b/client-profiles/20-kde-4.3-4.4/.local/share/applications/mimeapps.list @@ -1,12 +1,12 @@ # Calculate format=compiz [Added Associations] -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; +application/rss+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/vnd.mozilla.xul+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/x-font-ttx=chromium-chromium.desktop;mozilla-firefox.desktop; +application/x-ufraw=chromium-chromium.desktop;mozilla-firefox.desktop; +application/xhtml+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xml-external-parsed-entity=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xsd=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xslt+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +text/html=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; diff --git a/client-profiles/20-kde-4.3-4.4/Desktop/README.desktop b/client-profiles/20-kde-4.3-4.4/Desktop/README.desktop index f6021bf..9f0c37b 100644 --- a/client-profiles/20-kde-4.3-4.4/Desktop/README.desktop +++ b/client-profiles/20-kde-4.3-4.4/Desktop/README.desktop @@ -9,10 +9,10 @@ Name=Readme Comment= Categories=Application; #?os_locale_language!=ru# -Exec=firefox /usr/calculate/install/doc/handbook.html +Exec=xdg-open /usr/calculate/install/doc/handbook.html #os_locale_language# #?os_locale_language==ru# -Exec=firefox /usr/calculate/install/doc/handbook-ru.html +Exec=xdg-open /usr/calculate/install/doc/handbook-ru.html #os_locale_language# Icon=text-html Terminal=false diff --git a/client-profiles/20-kde-4.3/.kde4/share/apps/konqueror/profiles/webbrowsing b/client-profiles/20-kde-4.3/.kde4/share/apps/konqueror/profiles/webbrowsing index 3dea100..a2e2b6d 100644 --- a/client-profiles/20-kde-4.3/.kde4/share/apps/konqueror/profiles/webbrowsing +++ b/client-profiles/20-kde-4.3/.kde4/share/apps/konqueror/profiles/webbrowsing @@ -8,7 +8,7 @@ View0_ServiceName=khtml View0_ServiceType=text/html View0_URL=http://www.calculate-linux.org #?os_locale_language==ru# -View0_URL=http://www.calculate-linux.org/ru +View0_URL=http://www.calculate-linux.ru #os_locale_language# #ширина окна браузера от экрана Width=1000 diff --git a/client-profiles/20-kde-4.3/.kde4/share/config/kdeglobals b/client-profiles/20-kde-4.3/.kde4/share/config/kdeglobals index dcb07ee..dcecda0 100644 --- a/client-profiles/20-kde-4.3/.kde4/share/config/kdeglobals +++ b/client-profiles/20-kde-4.3/.kde4/share/config/kdeglobals @@ -5,10 +5,13 @@ emoticonsTheme=KMess-Cartoon #Шрифты [General] -#?pkg(www-client/mozilla-firefox)!=# +#?pkg(www-client/chromium)!=# +BrowserApplication[$e]=file:///usr/share/applications/chromium-chromium.desktop +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# BrowserApplication[$e]=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop #pkg# -#?pkg(www-client/mozilla-firefox)==# +#?pkg(www-client/mozilla-firefox)==&pkg(www-client/chromium)==# BrowserApplication[$e]=file:///usr/share/applications/kde4/konqbrowser.desktop #pkg# XftHintStyle=hintmedium diff --git a/client-profiles/20-kde-4.3/.kde4/share/config/konquerorrc b/client-profiles/20-kde-4.3/.kde4/share/config/konquerorrc index 8b75f50..53b25b4 100644 --- a/client-profiles/20-kde-4.3/.kde4/share/config/konquerorrc +++ b/client-profiles/20-kde-4.3/.kde4/share/config/konquerorrc @@ -15,5 +15,5 @@ MediumFontSize=11 #Домашняя страница HomeURL=http://www.calculate-linux.org #?os_locale_language==ru# -HomeURL=http://www.calculate-linux.org/ru +HomeURL=http://www.calculate-linux.ru #os_locale_language# diff --git a/client-profiles/20-kde-4.3/.kde4/share/config/plasma-desktop-appletsrc b/client-profiles/20-kde-4.3/.kde4/share/config/plasma-desktop-appletsrc index 65c0de2..5b87458 100644 --- a/client-profiles/20-kde-4.3/.kde4/share/config/plasma-desktop-appletsrc +++ b/client-profiles/20-kde-4.3/.kde4/share/config/plasma-desktop-appletsrc @@ -305,10 +305,13 @@ immutability=1 plugin=icon zvalue=0 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] -#?pkg(www-client/mozilla-firefox)!=# +#?pkg(www-client/chromium)!=# +Url=file:///usr/share/applications/chromium-chromium.desktop +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# Url=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop #pkg# -#?pkg(www-client/mozilla-firefox)==# +#?pkg(www-client/mozilla-firefox)==&pkg(www-client/chromium)==# Url=file:///usr/share/applications/kde4/konqbrowser.desktop #pkg# diff --git a/client-profiles/20-kde-4.3/.local/share/applications/mimeapps.list b/client-profiles/20-kde-4.3/.local/share/applications/mimeapps.list index 53be7ec..d4a1c33 100644 --- a/client-profiles/20-kde-4.3/.local/share/applications/mimeapps.list +++ b/client-profiles/20-kde-4.3/.local/share/applications/mimeapps.list @@ -1,12 +1,12 @@ # Calculate format=compiz [Added Associations] -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; +application/rss+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/vnd.mozilla.xul+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/x-font-ttx=chromium-chromium.desktop;mozilla-firefox.desktop; +application/x-ufraw=chromium-chromium.desktop;mozilla-firefox.desktop; +application/xhtml+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xml-external-parsed-entity=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xsd=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xslt+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +text/html=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; diff --git a/client-profiles/20-kde-4.4/.kde4/share/apps/konqueror/profiles/webbrowsing b/client-profiles/20-kde-4.4/.kde4/share/apps/konqueror/profiles/webbrowsing index 3dea100..a2e2b6d 100644 --- a/client-profiles/20-kde-4.4/.kde4/share/apps/konqueror/profiles/webbrowsing +++ b/client-profiles/20-kde-4.4/.kde4/share/apps/konqueror/profiles/webbrowsing @@ -8,7 +8,7 @@ View0_ServiceName=khtml View0_ServiceType=text/html View0_URL=http://www.calculate-linux.org #?os_locale_language==ru# -View0_URL=http://www.calculate-linux.org/ru +View0_URL=http://www.calculate-linux.ru #os_locale_language# #ширина окна браузера от экрана Width=1000 diff --git a/client-profiles/20-kde-4.4/.kde4/share/config/kdeglobals b/client-profiles/20-kde-4.4/.kde4/share/config/kdeglobals index dcb07ee..dcecda0 100644 --- a/client-profiles/20-kde-4.4/.kde4/share/config/kdeglobals +++ b/client-profiles/20-kde-4.4/.kde4/share/config/kdeglobals @@ -5,10 +5,13 @@ emoticonsTheme=KMess-Cartoon #Шрифты [General] -#?pkg(www-client/mozilla-firefox)!=# +#?pkg(www-client/chromium)!=# +BrowserApplication[$e]=file:///usr/share/applications/chromium-chromium.desktop +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# BrowserApplication[$e]=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop #pkg# -#?pkg(www-client/mozilla-firefox)==# +#?pkg(www-client/mozilla-firefox)==&pkg(www-client/chromium)==# BrowserApplication[$e]=file:///usr/share/applications/kde4/konqbrowser.desktop #pkg# XftHintStyle=hintmedium diff --git a/client-profiles/20-kde-4.4/.kde4/share/config/konquerorrc b/client-profiles/20-kde-4.4/.kde4/share/config/konquerorrc index 8b75f50..53b25b4 100644 --- a/client-profiles/20-kde-4.4/.kde4/share/config/konquerorrc +++ b/client-profiles/20-kde-4.4/.kde4/share/config/konquerorrc @@ -15,5 +15,5 @@ MediumFontSize=11 #Домашняя страница HomeURL=http://www.calculate-linux.org #?os_locale_language==ru# -HomeURL=http://www.calculate-linux.org/ru +HomeURL=http://www.calculate-linux.ru #os_locale_language# diff --git a/client-profiles/20-kde-4.4/.kde4/share/config/kwinrc b/client-profiles/20-kde-4.4/.kde4/share/config/kwinrc index d9e913d..eddcd39 100644 --- a/client-profiles/20-kde-4.4/.kde4/share/config/kwinrc +++ b/client-profiles/20-kde-4.4/.kde4/share/config/kwinrc @@ -48,3 +48,5 @@ MoveResizeMaximizedWindows=true ElectricBorderMaximize=false #не расятгивать окно на половину экрана после перемещения к боковому краю экрана ElectricBorderTiling=false +#уровень предотвращение перевода фокуса - никогда +FocusStealingPreventionLevel=0 diff --git a/client-profiles/20-kde-4.4/.kde4/share/config/plasma-desktop-appletsrc b/client-profiles/20-kde-4.4/.kde4/share/config/plasma-desktop-appletsrc index b813fdb..b8a0903 100644 --- a/client-profiles/20-kde-4.4/.kde4/share/config/plasma-desktop-appletsrc +++ b/client-profiles/20-kde-4.4/.kde4/share/config/plasma-desktop-appletsrc @@ -225,10 +225,13 @@ immutability=1 plugin=icon zvalue=0 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] -#?pkg(www-client/mozilla-firefox)!=# +#?pkg(www-client/chromium)!=# +Url=file:///usr/share/applications/chromium-chromium.desktop +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# Url=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop #pkg# -#?pkg(www-client/mozilla-firefox)==# +#?pkg(www-client/mozilla-firefox)==&pkg(www-client/chromium)==# Url=file:///usr/share/applications/kde4/konqbrowser.desktop #pkg# [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] diff --git a/client-profiles/20-kde-4.4/.local/share/applications/mimeapps.list b/client-profiles/20-kde-4.4/.local/share/applications/mimeapps.list index 53be7ec..d4a1c33 100644 --- a/client-profiles/20-kde-4.4/.local/share/applications/mimeapps.list +++ b/client-profiles/20-kde-4.4/.local/share/applications/mimeapps.list @@ -1,12 +1,12 @@ # Calculate format=compiz [Added Associations] -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; +application/rss+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/vnd.mozilla.xul+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/x-font-ttx=chromium-chromium.desktop;mozilla-firefox.desktop; +application/x-ufraw=chromium-chromium.desktop;mozilla-firefox.desktop; +application/xhtml+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xml-external-parsed-entity=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xsd=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xslt+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +text/html=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; diff --git a/client-profiles/20-kde-4.4/Desktop/README.desktop b/client-profiles/20-kde-4.4/Desktop/README.desktop index f6021bf..9f0c37b 100644 --- a/client-profiles/20-kde-4.4/Desktop/README.desktop +++ b/client-profiles/20-kde-4.4/Desktop/README.desktop @@ -9,10 +9,10 @@ Name=Readme Comment= Categories=Application; #?os_locale_language!=ru# -Exec=firefox /usr/calculate/install/doc/handbook.html +Exec=xdg-open /usr/calculate/install/doc/handbook.html #os_locale_language# #?os_locale_language==ru# -Exec=firefox /usr/calculate/install/doc/handbook-ru.html +Exec=xdg-open /usr/calculate/install/doc/handbook-ru.html #os_locale_language# Icon=text-html Terminal=false diff --git a/client-profiles/20-kde-always/.kde4/share/config/plasma-desktop-appletsrc b/client-profiles/20-kde-always/.kde4/share/config/plasma-desktop-appletsrc index 50b945d..a3ecef9 100644 --- a/client-profiles/20-kde-always/.kde4/share/config/plasma-desktop-appletsrc +++ b/client-profiles/20-kde-always/.kde4/share/config/plasma-desktop-appletsrc @@ -1,4 +1,4 @@ -# Calculate format=plasma cl_remote_host!=&ini(domain)!=cl_remote_host +# Calculate format=plasma cl_remote_host!=&ini(domain)!=#-cl_remote_host-# #------------------------------------------------------------------------------ #рабочий стол #------------------------------------------------------------------------------ diff --git a/client-profiles/90-compiz-0.8.4/.gconf/%gconf.xml b/client-profiles/30-evolution-2.6/.evolution/signatures/default similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/%gconf.xml rename to client-profiles/30-evolution-2.6/.evolution/signatures/default diff --git a/client-profiles/30-evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml b/client-profiles/30-evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml index 4fc83ea..e08af05 100644 --- a/client-profiles/30-evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml +++ b/client-profiles/30-evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml @@ -4,13 +4,20 @@ #-pop(mtime)-# #-pop(pid)-# #-pop(serial)-# + +
  • + <?xml version="1.0"?> +<signature name="Default" uid="#-sum(mtime,mtime)-#.#-sum(pid,pid)-#.0@#-os_net_hostname-#" auto="false" format="text/plain"><filename>/home/#-ur_login-#/.evolution/signatures/default</filename></signature> + +
    • +     #-sum(mtime,mtime)-#.#-sum(pid,pid)-#.#-sum(serial,serial)-#@#-os_net_hostname-#
  • <?xml version="1.0"?> -<account name="IMAP" uid="#-sum(mtime,mtime)-#.#-sum(pid,pid)-#.#-sum(serial,serial)-#@mhiretskiy" enabled="true"><identity><name>#-ur_fullname-#</name><addr-spec>#-ur_mail-#</addr-spec><reply-to>#-ur_mail-#</reply-to><organization>#-ur_organization-#</organization><signature uid=""/></identity><source save-passwd="true" keep-on-server="false" auto-check="true" auto-check-timeout="5"><url>imap://#-ur_login-#@#-sr_mail_host-#/;check_lsub;command=ssh%20-C%20-l%20%25u%20%25h%20exec%20/usr/sbin/imapd;use_ssl=always;check_all</url></source><transport save-passwd="false"><url>smtp://#-ur_login-#@#-sr_mail_host-#/;use_ssl=never</url></transport><drafts-folder>imap://#-ur_login-#@#-sr_mail_host-#/Drafts</drafts-folder><sent-folder>imap://#-ur_login-#@#-sr_mail_host-#/Sent</sent-folder><auto-cc always="false"><recipients></recipients></auto-cc><auto-bcc always="false"><recipients></recipients></auto-bcc><receipt-policy policy="never"/><pgp encrypt-to-self="false" always-trust="false" always-sign="false" no-imip-sign="false"/><smime sign-default="false" encrypt-default="false" encrypt-to-self="false"/></account> +<account name="IMAP" uid="#-sum(mtime,mtime)-#.#-sum(pid,pid)-#.#-sum(serial,serial)-#@#-os_net_hostname-#" enabled="true"><identity><name>#-ur_fullname-#</name><addr-spec>#-ur_mail-#</addr-spec><reply-to>#-ur_mail-#</reply-to><organization>#-ur_organization-#</organization><signature uid="#-sum(mtime,mtime)-#.#-sum(pid,pid)-#.0@#-os_net_hostname-#"/></identity><source save-passwd="true" keep-on-server="false" auto-check="true" auto-check-timeout="5"><url>imap://#-ur_login-#@#-sr_mail_host-#/;check_lsub;command=ssh%20-C%20-l%20%25u%20%25h%20exec%20/usr/sbin/imapd;use_ssl=always;check_all</url></source><transport save-passwd="false"><url>smtp://#-ur_login-#@#-sr_mail_host-#/;use_ssl=never</url></transport><drafts-folder>imap://#-ur_login-#@#-sr_mail_host-#/Drafts</drafts-folder><sent-folder>imap://#-ur_login-#@#-sr_mail_host-#/Sent</sent-folder><auto-cc always="false"><recipients></recipients></auto-cc><auto-bcc always="false"><recipients></recipients></auto-bcc><receipt-policy policy="never"/><pgp encrypt-to-self="false" always-trust="false" always-sign="false" no-imip-sign="false"/><smime sign-default="false" encrypt-default="false" encrypt-to-self="false"/></account>
    • diff --git a/client-profiles/30-gnome-2.6/.config/autostart/fusion-icon-autostart.desktop b/client-profiles/30-gnome-2.6/.config/autostart/fusion-icon-autostart.desktop index 343b95f..a8a9b99 100644 --- a/client-profiles/30-gnome-2.6/.config/autostart/fusion-icon-autostart.desktop +++ b/client-profiles/30-gnome-2.6/.config/autostart/fusion-icon-autostart.desktop @@ -1 +1 @@ -# Calculate format=kde link=/usr/share/applications/fusion-icon.desktop mirror pgk(fusion-icon)!= +# Calculate format=kde link=/usr/share/applications/fusion-icon.desktop mirror pkg(fusion-icon)!= diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/panel/300_bottom_objects/300_webbrowser/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/apps/panel/300_bottom_objects/300_webbrowser/%gconf.xml index cbbf786..be7501f 100644 --- a/client-profiles/30-gnome-2.6/.gconf/apps/panel/300_bottom_objects/300_webbrowser/%gconf.xml +++ b/client-profiles/30-gnome-2.6/.gconf/apps/panel/300_bottom_objects/300_webbrowser/%gconf.xml @@ -20,7 +20,12 @@ +#?pkg(www-client/chromium)!=# + chromium-chromium.desktop +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# mozilla-firefox.desktop +#pkg# diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/panel/toplevels/top_panel_screen0/background/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/apps/panel/toplevels/top_panel_screen0/background/%gconf.xml index ba4d217..f11ae95 100644 --- a/client-profiles/30-gnome-2.6/.gconf/apps/panel/toplevels/top_panel_screen0/background/%gconf.xml +++ b/client-profiles/30-gnome-2.6/.gconf/apps/panel/toplevels/top_panel_screen0/background/%gconf.xml @@ -1,11 +1,11 @@ # Calculate format=xml_gconf - - - - - - - + + + + + + + diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/applications/browser/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/applications/browser/%gconf.xml index 357e802..6605ad6 100644 --- a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/applications/browser/%gconf.xml +++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/applications/browser/%gconf.xml @@ -2,7 +2,12 @@ +#?pkg(www-client/chromium)!=# + chromium +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# firefox +#pkg# diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/background/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/background/%gconf.xml index c1c05ba..642ce2a 100644 --- a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/background/%gconf.xml +++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/background/%gconf.xml @@ -1,10 +1,10 @@ # Calculate format=xml_gconf - + /usr/share/pixmaps/backgrounds/gnome/calculate/#-hr_x11_standart-#.jpg - + stretched diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/%gconf.xml rename to client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml new file mode 100644 index 0000000..39e38a2 --- /dev/null +++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml @@ -0,0 +1,15 @@ +# Calculate format=xml_gconf append=join + + + +
  • + grp grp:caps_toggle +
    • +
  • + terminate terminate:ctrl_alt_bksp +
    • +
  • + grp_led grp_led:scroll +
    • +     +     diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br new file mode 100644 index 0000000..4199009 --- /dev/null +++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br @@ -0,0 +1,12 @@ +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==pt_BR + + + +
  • + br +
    • +
  • + us +
    • +     +     diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de new file mode 100644 index 0000000..79d7b74 --- /dev/null +++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de @@ -0,0 +1,12 @@ +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==de_DE + + + +
  • + de +
    • +
  • + us +
    • +     +     diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es new file mode 100644 index 0000000..08cdcde --- /dev/null +++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es @@ -0,0 +1,12 @@ +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==es_ES + + + +
  • + es +
    • +
  • + us +
    • +     +     diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr new file mode 100644 index 0000000..8df3122 --- /dev/null +++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr @@ -0,0 +1,12 @@ +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==fr_FR + + + +
  • + fr +
    • +
  • + us +
    • +     +     diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it new file mode 100644 index 0000000..32f2dd9 --- /dev/null +++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it @@ -0,0 +1,12 @@ +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==it_IT + + + +
  • + it +
    • +
  • + us +
    • +     +     diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl new file mode 100644 index 0000000..ade4a69 --- /dev/null +++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl @@ -0,0 +1,12 @@ +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==pl_PL + + + +
  • + pl +
    • +
  • + us +
    • +     +     diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru new file mode 100644 index 0000000..74604b1 --- /dev/null +++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru @@ -0,0 +1,12 @@ +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==ru_RU + + + +
  • + us +
    • +
  • + ru +
    • +     +     diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk new file mode 100644 index 0000000..f38ce17 --- /dev/null +++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk @@ -0,0 +1,12 @@ +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==uk_UA + + + +
  • + us +
    • +
  • + ua +
    • +     +     diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us new file mode 100644 index 0000000..4e2233b --- /dev/null +++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us @@ -0,0 +1,9 @@ +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==en_US + + + +
  • + us +
    • +     +     diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/session/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/session/%gconf.xml index 57b9125..663e869 100644 --- a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/session/%gconf.xml +++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/session/%gconf.xml @@ -1,5 +1,5 @@ # Calculate format=xml_gconf - + diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/about/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/about/%gconf.xml index 007a9f2..1d95e4c 100644 --- a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/about/%gconf.xml +++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/about/%gconf.xml @@ -2,6 +2,11 @@ +#?pkg(www-client/chromium)!=# + chromium %s +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# firefox %s +#pkg# diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml index b81a766..d83de6f 100644 --- a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml +++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml @@ -4,6 +4,11 @@ +#?pkg(www-client/chromium)!=# + chromium %s +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# firefox %s +#pkg# diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml index b81a766..d83de6f 100644 --- a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml +++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml @@ -4,6 +4,11 @@ +#?pkg(www-client/chromium)!=# + chromium %s +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# firefox %s +#pkg# diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/http/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/http/%gconf.xml index 007a9f2..1d95e4c 100644 --- a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/http/%gconf.xml +++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/http/%gconf.xml @@ -2,6 +2,11 @@ +#?pkg(www-client/chromium)!=# + chromium %s +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# firefox %s +#pkg# diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/https/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/https/%gconf.xml index 007a9f2..1d95e4c 100644 --- a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/https/%gconf.xml +++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/https/%gconf.xml @@ -2,6 +2,11 @@ +#?pkg(www-client/chromium)!=# + chromium %s +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# firefox %s +#pkg# diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml index 007a9f2..1d95e4c 100644 --- a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml +++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml @@ -2,6 +2,11 @@ +#?pkg(www-client/chromium)!=# + chromium %s +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# firefox %s +#pkg# diff --git a/client-profiles/30-gnome-2.6/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd b/client-profiles/30-gnome-2.6/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd index d96b079..86a6115 100644 --- a/client-profiles/30-gnome-2.6/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd +++ b/client-profiles/30-gnome-2.6/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd @@ -7,10 +7,10 @@ Name=Readme Comment= Categories=Application; #?os_locale_language!=ru# -Exec=firefox /usr/calculate/install/doc/handbook.html +Exec=xdg-open /usr/calculate/install/doc/handbook.html #os_locale_language# #?os_locale_language==ru# -Exec=firefox /usr/calculate/install/doc/handbook-ru.html +Exec=xdg-open /usr/calculate/install/doc/handbook-ru.html #os_locale_language# Icon=html Terminal=false diff --git a/client-profiles/30-gnome-2.6/.local/share/applications/calculate-community.desktop b/client-profiles/30-gnome-2.6/.local/share/applications/calculate-community.desktop index 4f07efb..bd88525 100644 --- a/client-profiles/30-gnome-2.6/.local/share/applications/calculate-community.desktop +++ b/client-profiles/30-gnome-2.6/.local/share/applications/calculate-community.desktop @@ -7,5 +7,10 @@ Name=Calculate Linux Community Name[ru]=Сообщество Calculate Linux NoDisplay=true #изменим строку запуска +#?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/client-profiles/30-gnome-2.6/Desktop/README.desktop b/client-profiles/30-gnome-2.6/Desktop/README.desktop index 07d38f0..7b2c15b 100644 --- a/client-profiles/30-gnome-2.6/Desktop/README.desktop +++ b/client-profiles/30-gnome-2.6/Desktop/README.desktop @@ -8,10 +8,10 @@ Name=Readme Comment= Categories=Application; #?os_locale_language!=ru# -Exec=firefox /usr/calculate/install/doc/handbook.html +Exec=xdg-open /usr/calculate/install/doc/handbook.html #os_locale_language# #?os_locale_language==ru# -Exec=firefox /usr/calculate/install/doc/handbook-ru.html +Exec=xdg-open /usr/calculate/install/doc/handbook-ru.html #os_locale_language# Icon=html Terminal=false diff --git a/client-profiles/30-gnome-2.6/Desktop/calculate-community.desktop b/client-profiles/30-gnome-2.6/Desktop/calculate-community.desktop index 08f5769..5e64658 100644 --- a/client-profiles/30-gnome-2.6/Desktop/calculate-community.desktop +++ b/client-profiles/30-gnome-2.6/Desktop/calculate-community.desktop @@ -6,5 +6,10 @@ Type=Application Name=Calculate Linux Community Name[ru]=Сообщество Calculate Linux #изменим строку запуска +#?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/client-profiles/30-gnome-always/.calculate_directory b/client-profiles/30-gnome-always/.calculate_directory index abd22c5..4e6c732 100644 --- a/client-profiles/30-gnome-always/.calculate_directory +++ b/client-profiles/30-gnome-always/.calculate_directory @@ -1 +1 @@ -# Calculate ini(main.update)!=off&ini(update.gnome)!=off&pkg(gnome-base/libgnome)>=2.26&ini(domain)!=cl_remote_host +# Calculate ini(main.update)!=off&ini(update.gnome)!=off&pkg(gnome-base/libgnome)>=2.26&ini(domain)!=#-cl_remote_host-# diff --git a/client-profiles/40-cldx-10.2-10.4/.config/xfce4/panel/launcher-30.rc b/client-profiles/40-cldx-10.2-10.4/.config/xfce4/panel/launcher-30.rc index c16d166..9418716 100644 --- a/client-profiles/40-cldx-10.2-10.4/.config/xfce4/panel/launcher-30.rc +++ b/client-profiles/40-cldx-10.2-10.4/.config/xfce4/panel/launcher-30.rc @@ -6,8 +6,18 @@ ArrowPosition=0 [Entry 0] Name=Web Browser Comment=Surf the internet +#?pkg(www-client/chromium)!=# +Icon=chromium-browser +Exec=chromium +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# Icon=browser Exec=firefox +#pkg# +#?pkg(www-client/mozilla-firefox)==&pkg(www-client/chromium)==# +Icon=browser +Exec=exo-open --launch WebBrowser +#pkg# Path=/home/#-ur_login-# Terminal=false diff --git a/client-profiles/40-cldx-10.2-10.4/.local/share/applications/defaults.list b/client-profiles/40-cldx-10.2-10.4/.local/share/applications/defaults.list index 0a2f0ba..e9ce182 100644 --- a/client-profiles/40-cldx-10.2-10.4/.local/share/applications/defaults.list +++ b/client-profiles/40-cldx-10.2-10.4/.local/share/applications/defaults.list @@ -2,17 +2,18 @@ [Default Applications] 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/rss+xml=chromium-chromium.desktop;mozilla-firefox.desktop +application/rtf=writer.desktop +application/vnd.mozilla.xul+xml=chromium-chromium.desktop;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 +application/x-font-ttx=chromium-chromium.desktop;mozilla-firefox.desktop +application/x-ufraw=chromium-chromium.desktop;mozilla-firefox.desktop +application/xhtml+xml=chromium-chromium.desktop;mozilla-firefox.desktop +application/xml-external-parsed-entity=chromium-chromium.desktop;mozilla-firefox.desktop +application/xml=chromium-chromium.desktop;mozilla-firefox.desktop +application/xsd=chromium-chromium.desktop;mozilla-firefox.desktop +application/xslt+xml=chromium-chromium.desktop;mozilla-firefox.desktop audio/mp4=audacious2-gtkui.desktop audio/mpeg=audacious2-gtkui.desktop audio/x-flac=audacious2-gtkui.desktop @@ -38,7 +39,7 @@ 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/html=chromium-chromium.desktop;mozilla-firefox.desktop text/plain=mousepad.desktop video/x-msvideo=gnome-mplayer.desktop diff --git a/client-profiles/40-xfce-4.6/.config/xfce4/helpers.rc b/client-profiles/40-xfce-4.6/.config/xfce4/helpers.rc index d15c41a..0571fa7 100644 --- a/client-profiles/40-xfce-4.6/.config/xfce4/helpers.rc +++ b/client-profiles/40-xfce-4.6/.config/xfce4/helpers.rc @@ -1,3 +1,8 @@ +#?pkg(www-client/chromium)!=# +WebBrowser=chromium +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# WebBrowser=firefox +#pkg# MailReader=sylpheed-claws diff --git a/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-30.rc b/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-30.rc index c16d166..9418716 100644 --- a/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-30.rc +++ b/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-30.rc @@ -6,8 +6,18 @@ ArrowPosition=0 [Entry 0] Name=Web Browser Comment=Surf the internet +#?pkg(www-client/chromium)!=# +Icon=chromium-browser +Exec=chromium +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# Icon=browser Exec=firefox +#pkg# +#?pkg(www-client/mozilla-firefox)==&pkg(www-client/chromium)==# +Icon=browser +Exec=exo-open --launch WebBrowser +#pkg# Path=/home/#-ur_login-# Terminal=false diff --git a/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-32.rc b/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-32.rc index 73f71c2..48b5f92 100644 --- a/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-32.rc +++ b/client-profiles/40-xfce-4.6/.config/xfce4/panel/launcher-32.rc @@ -3,7 +3,12 @@ Name=IRC Chat Comment=XChat Icon=xchat +#?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# Path=/home/#-ur_login-# Terminal=false diff --git a/client-profiles/40-xfce-4.6/.local/share/applications/defaults.list b/client-profiles/40-xfce-4.6/.local/share/applications/defaults.list index 0a2f0ba..e9ce182 100644 --- a/client-profiles/40-xfce-4.6/.local/share/applications/defaults.list +++ b/client-profiles/40-xfce-4.6/.local/share/applications/defaults.list @@ -2,17 +2,18 @@ [Default Applications] 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/rss+xml=chromium-chromium.desktop;mozilla-firefox.desktop +application/rtf=writer.desktop +application/vnd.mozilla.xul+xml=chromium-chromium.desktop;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 +application/x-font-ttx=chromium-chromium.desktop;mozilla-firefox.desktop +application/x-ufraw=chromium-chromium.desktop;mozilla-firefox.desktop +application/xhtml+xml=chromium-chromium.desktop;mozilla-firefox.desktop +application/xml-external-parsed-entity=chromium-chromium.desktop;mozilla-firefox.desktop +application/xml=chromium-chromium.desktop;mozilla-firefox.desktop +application/xsd=chromium-chromium.desktop;mozilla-firefox.desktop +application/xslt+xml=chromium-chromium.desktop;mozilla-firefox.desktop audio/mp4=audacious2-gtkui.desktop audio/mpeg=audacious2-gtkui.desktop audio/x-flac=audacious2-gtkui.desktop @@ -38,7 +39,7 @@ 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/html=chromium-chromium.desktop;mozilla-firefox.desktop text/plain=mousepad.desktop video/x-msvideo=gnome-mplayer.desktop diff --git a/client-profiles/40-xfce-4.6/Desktop/README.desktop?os_root_type==livecd b/client-profiles/40-xfce-4.6/Desktop/README.desktop?os_root_type==livecd index d96b079..86a6115 100644 --- a/client-profiles/40-xfce-4.6/Desktop/README.desktop?os_root_type==livecd +++ b/client-profiles/40-xfce-4.6/Desktop/README.desktop?os_root_type==livecd @@ -7,10 +7,10 @@ Name=Readme Comment= Categories=Application; #?os_locale_language!=ru# -Exec=firefox /usr/calculate/install/doc/handbook.html +Exec=xdg-open /usr/calculate/install/doc/handbook.html #os_locale_language# #?os_locale_language==ru# -Exec=firefox /usr/calculate/install/doc/handbook-ru.html +Exec=xdg-open /usr/calculate/install/doc/handbook-ru.html #os_locale_language# Icon=html Terminal=false diff --git a/client-profiles/40-xfce-4.6/Desktop/calculate-community.desktop b/client-profiles/40-xfce-4.6/Desktop/calculate-community.desktop index 08f5769..5e64658 100644 --- a/client-profiles/40-xfce-4.6/Desktop/calculate-community.desktop +++ b/client-profiles/40-xfce-4.6/Desktop/calculate-community.desktop @@ -6,5 +6,10 @@ Type=Application Name=Calculate Linux Community Name[ru]=Сообщество Calculate Linux #изменим строку запуска +#?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/client-profiles/40-xfce-always/.calculate_directory b/client-profiles/40-xfce-always/.calculate_directory index a628783..9ca2624 100644 --- a/client-profiles/40-xfce-always/.calculate_directory +++ b/client-profiles/40-xfce-always/.calculate_directory @@ -1 +1 @@ -# Calculate ini(main.update)!=off&ini(update.xfce)!=off&pkg(xfce-base/xfdesktop)>=4.6&ini(domain)!=cl_remote_host +# Calculate ini(main.update)!=off&ini(update.xfce)!=off&pkg(xfce-base/xfdesktop)>=4.6&ini(domain)!=#-cl_remote_host-# diff --git a/client-profiles/90-bash-4.0/.bashrc b/client-profiles/80-bash-4.0/.bashrc similarity index 100% rename from client-profiles/90-bash-4.0/.bashrc rename to client-profiles/80-bash-4.0/.bashrc diff --git a/client-profiles/90-bash-4.0/.calculate/ini.env b/client-profiles/80-bash-4.0/.calculate/ini.env similarity index 100% rename from client-profiles/90-bash-4.0/.calculate/ini.env rename to client-profiles/80-bash-4.0/.calculate/ini.env diff --git a/client-profiles/90-bash-4.0/.calculate_directory b/client-profiles/80-bash-4.0/.calculate_directory similarity index 100% rename from client-profiles/90-bash-4.0/.calculate_directory rename to client-profiles/80-bash-4.0/.calculate_directory diff --git a/client-profiles/80-chromium-5.0/.calculate/ini.env b/client-profiles/80-chromium-5.0/.calculate/ini.env new file mode 100644 index 0000000..5908f2a --- /dev/null +++ b/client-profiles/80-chromium-5.0/.calculate/ini.env @@ -0,0 +1,7 @@ +# Calculate format=samba + +[ver] +chromium = 5.0 + +[update] +chromium = on diff --git a/client-profiles/80-chromium-5.0/.calculate_directory b/client-profiles/80-chromium-5.0/.calculate_directory new file mode 100644 index 0000000..4a011ac --- /dev/null +++ b/client-profiles/80-chromium-5.0/.calculate_directory @@ -0,0 +1 @@ +# Calculate ini(main.update)!=off&ini(update.chromium)!=off&ini(ver.chromium)==&pkg(www-client/chromium)>=5.0 diff --git a/client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/Cached Theme.pak b/client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/Cached Theme.pak new file mode 100644 index 0000000..179d05f Binary files /dev/null and b/client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/Cached Theme.pak differ diff --git a/client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA b/client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA new file mode 100644 index 0000000..e58e2d2 Binary files /dev/null and b/client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA differ diff --git a/client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA b/client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA new file mode 100644 index 0000000..c0e1abc Binary files /dev/null and b/client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA differ diff --git a/client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA b/client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA new file mode 100644 index 0000000..74e359a Binary files /dev/null and b/client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA differ diff --git a/client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA b/client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA new file mode 100644 index 0000000..7b191b6 Binary files /dev/null and b/client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA differ diff --git a/client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/manifest.json b/client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/manifest.json new file mode 100644 index 0000000..be93954 --- /dev/null +++ b/client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/manifest.json @@ -0,0 +1,32 @@ +{ + "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCndMu10pCnXVJNSCvmc8K0CXEZZ8DU2DNgt77nkTQ2flcGgmf4yCY5QAKHMv2K9mDos38iVIcUSxuUruIXdOuQIY5JZy7Bitb5WzHQ6UfWWqoc/tEpVYi/k/+8TvORflKfgbmNX2kxrbI7gxkaTssMLYrgbrlG3KlwI7k890T2KQIDAQAB", + "name": "Minimal", + "theme": { + "colors": { + "bookmark_text": [ 149, 149, 149 ], + "frame": [ 255, 255, 255 ], + "ntp_background": [ 255, 255, 255 ], + "ntp_link": [ 170, 170, 170 ], + "ntp_section": [ 235, 235, 235, 1 ], + "ntp_section_link": [ 149, 149, 149 ], + "ntp_section_text": [ 149, 149, 149 ], + "ntp_text": [ 149, 149, 149 ], + "tab_background_text": [ 149, 149, 149 ], + "tab_text": [ 149, 149, 149 ], + "toolbar": [ 255, 255, 255 ] + }, + "images": { + "theme_button_background": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA", + "theme_frame": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA", + "theme_tab_background": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA", + "theme_toolbar": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA" + }, + "properties": { + + }, + "tints": { + "buttons": [ 0.001, 0, 0.706 ] + } + }, + "version": "1.0" +} diff --git a/client-profiles/80-chromium-5.0/.config/chromium/Default/Preferences b/client-profiles/80-chromium-5.0/.config/chromium/Default/Preferences new file mode 100644 index 0000000..0614a8e --- /dev/null +++ b/client-profiles/80-chromium-5.0/.config/chromium/Default/Preferences @@ -0,0 +1,161 @@ +{ + "alternate_error_pages": { + "enabled": true + }, + "autofill": { + "auxiliary_profiles_enabled": false, + "default_profile": "", + "enabled": true, + "infobar_shown": true + }, + "bookmark_bar": { + "show_on_all_tabs": true + }, + "browser": { + "check_default_browser": false, + "clear_data": { + "browsing_history": true, + "cache": true, + "cookies": true, + "download_history": true, + "form_data": true, + "passwords": false, + "time_period": 0 + }, + "custom_chrome_frame": false, + "enable_spellchecking": true, + "ntp": { + "promo_image_remaining": -79, + "promo_line_remaining": -79 + }, + "show_home_button": true + }, + "content_settings_window": { + "last_tab_index": 4 + }, + "countryid_at_install": 21077, + "default_search_provider": { + "id": "2", + "name": "Google", + "prepopulate_id": "1", + "search_url": "{google:baseURL}search?{google:RLZ}{google:acceptedSuggestion}{google:originalQueryForSuggestion}sourceid=chrome&ie={inputEncoding}&q={searchTerms}", + "suggest_url": "{google:baseSuggestURL}search?client=chrome&hl={language}&q={searchTerms}" + }, + "devtools": { + "open_docked": false + }, + "dns_prefetching": { + "enabled": true + }, + "download": { + "directory_upgrade": true, + "extensions_to_open": "", + "prompt_for_download": false + }, + "extensions": { + "autoupdate": { + "last_check": "12918142274298271", + "next_check": "12918215676716661" + }, + "blacklistupdate": { + "lastpingday": "12918121200665425" + }, + "chrome_url_overrides": { + "bookmarks": [ "chrome-extension://eemcgdkfndhakfknompkggombfjjjeno/main.html" ] + }, + "settings": { + "hnfhcmjkebafbfikmbkhdpbmfpfjgiog": { + "lastpingday": "12918121199767875", + "location": 1, + "manifest": { + "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCndMu10pCnXVJNSCvmc8K0CXEZZ8DU2DNgt77nkTQ2flcGgmf4yCY5QAKHMv2K9mDos38iVIcUSxuUruIXdOuQIY5JZy7Bitb5WzHQ6UfWWqoc/tEpVYi/k/+8TvORflKfgbmNX2kxrbI7gxkaTssMLYrgbrlG3KlwI7k890T2KQIDAQAB", + "name": "Minimal", + "theme": { + "colors": { + "bookmark_text": [ 149, 149, 149 ], + "frame": [ 255, 255, 255 ], + "ntp_background": [ 255, 255, 255 ], + "ntp_link": [ 170, 170, 170 ], + "ntp_section": [ 235, 235, 235, 1 ], + "ntp_section_link": [ 149, 149, 149 ], + "ntp_section_text": [ 149, 149, 149 ], + "ntp_text": [ 149, 149, 149 ], + "tab_background_text": [ 149, 149, 149 ], + "tab_text": [ 149, 149, 149 ], + "toolbar": [ 255, 255, 255 ] + }, + "images": { + "theme_button_background": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA", + "theme_frame": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA", + "theme_tab_background": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA", + "theme_toolbar": "i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA" + }, + "tints": { + "buttons": [ 0.001, 0, 0.706 ] + } + }, + "version": "1.0" + }, + "path": "hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0", + "state": 1 + } + }, + "theme": { + "id": "hnfhcmjkebafbfikmbkhdpbmfpfjgiog", + "pack": "/home/#-ur_login-#/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/Cached Theme.pak", + "use_system": false + }, + "toolbarsize": -1, + "ui": { + "developer_mode": true + } + }, + "geolocation": { + "default_content_setting": 3 + }, + "homepage": "http://www.calculate-linux.ru/", + "homepage_is_newtabpage": false, + "intl": { + "accept_languages": "ru-RU,ru,en-US,en", + "charset_default": "windows-1251" + }, + "profile": { + "block_third_party_cookies": false, + "clear_site_data_on_exit": false, + "content_settings": { + "pref_version": 1 + }, + "exited_cleanly": true, + "password_manager_enabled": true, + "per_host_zoom_levels": { + "www.computerra.ru": 1 + } + }, + "safebrowsing": { + "enabled": true + }, + "search": { + "suggest_enabled": true + }, + "session": { + "restore_on_startup": 0 + }, + "sync": { + "autofill": true, + "bookmarks": true, + "has_setup_completed": true, + "last_synced_time": "12918205902976887", + "preferences": true, + "themes": true + }, + "translate": { + "enabled": true + }, + "translate_language_blacklist": [ "en" ], + "webkit": { + "webprefs": { + "inspector_settings": "lastActivePanel:string:scripts\n", + "uses_universal_detector": false + } + } +} diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/%gconf.xml b/client-profiles/80-chromium-5.0/.config/chromium/First Run similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/%gconf.xml rename to client-profiles/80-chromium-5.0/.config/chromium/First Run diff --git a/client-profiles/90-compiz-0.8.4/.calculate/ini.env b/client-profiles/80-compiz-0.8.4/.calculate/ini.env similarity index 100% rename from client-profiles/90-compiz-0.8.4/.calculate/ini.env rename to client-profiles/80-compiz-0.8.4/.calculate/ini.env diff --git a/client-profiles/90-compiz-0.8.4/.calculate_directory b/client-profiles/80-compiz-0.8.4/.calculate_directory similarity index 100% rename from client-profiles/90-compiz-0.8.4/.calculate_directory rename to client-profiles/80-compiz-0.8.4/.calculate_directory diff --git a/client-profiles/90-compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop b/client-profiles/80-compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop similarity index 65% rename from client-profiles/90-compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop rename to client-profiles/80-compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop index 343b95f..a8a9b99 100644 --- a/client-profiles/90-compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop +++ b/client-profiles/80-compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop @@ -1 +1 @@ -# Calculate format=kde link=/usr/share/applications/fusion-icon.desktop mirror pgk(fusion-icon)!= +# Calculate format=kde link=/usr/share/applications/fusion-icon.desktop mirror pkg(fusion-icon)!= diff --git a/client-profiles/90-compiz-0.8.4/.config/autostart/fusion-icon-remove.desktop b/client-profiles/80-compiz-0.8.4/.config/autostart/fusion-icon-remove.desktop similarity index 100% rename from client-profiles/90-compiz-0.8.4/.config/autostart/fusion-icon-remove.desktop rename to client-profiles/80-compiz-0.8.4/.config/autostart/fusion-icon-remove.desktop diff --git a/client-profiles/90-compiz-0.8.4/.config/compiz/compizconfig/config b/client-profiles/80-compiz-0.8.4/.config/compiz/compizconfig/config similarity index 100% rename from client-profiles/90-compiz-0.8.4/.config/compiz/compizconfig/config rename to client-profiles/80-compiz-0.8.4/.config/compiz/compizconfig/config diff --git a/client-profiles/90-compiz-0.8.4/.config/compiz/fusion-icon b/client-profiles/80-compiz-0.8.4/.config/compiz/fusion-icon similarity index 100% rename from client-profiles/90-compiz-0.8.4/.config/compiz/fusion-icon rename to client-profiles/80-compiz-0.8.4/.config/compiz/fusion-icon diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/general/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/general/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/general/allscreens/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/general/allscreens/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/animation/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/general/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/animation/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/general/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/animation/screen0/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/general/allscreens/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/animation/screen0/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/general/allscreens/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/general/allscreens/options/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/general/allscreens/options/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/general/allscreens/options/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/general/allscreens/options/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/allscreens/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/animation/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/allscreens/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/animation/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/move/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/animation/screen0/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/move/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/animation/screen0/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/animation/screen0/options/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/animation/screen0/options/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/animation/screen0/options/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/animation/screen0/options/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/move/allscreens/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/move/allscreens/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/place/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/allscreens/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/place/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/allscreens/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/allscreens/options/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/allscreens/options/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/allscreens/options/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/allscreens/options/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/place/screen0/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/move/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/place/screen0/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/move/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/scale/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/move/allscreens/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/scale/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/move/allscreens/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/move/allscreens/options/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/move/allscreens/options/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/move/allscreens/options/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/move/allscreens/options/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/scale/allscreens/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/place/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/scale/allscreens/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/place/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/snap/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/place/screen0/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/snap/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/place/screen0/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/place/screen0/options/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/place/screen0/options/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/place/screen0/options/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/place/screen0/options/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/snap/screen0/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/scale/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/snap/screen0/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/scale/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/scale/allscreens/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/scale/allscreens/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/scale/allscreens/options/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/scale/allscreens/options/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/scale/allscreens/options/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/scale/allscreens/options/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/screen0/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/snap/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/screen0/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/snap/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/snap/screen0/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/snap/screen0/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/snap/screen0/options/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/snap/screen0/options/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/snap/screen0/options/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/snap/screen0/options/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/allscreens/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/allscreens/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/wall/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/screen0/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/wall/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/screen0/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/screen0/options/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/screen0/options/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/screen0/options/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/screen0/options/%gconf.xml diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/wall/allscreens/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/wall/allscreens/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/%gconf.xml diff --git a/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/allscreens/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/allscreens/%gconf.xml new file mode 100644 index 0000000..e69de29 diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/allscreens/options/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/allscreens/options/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/allscreens/options/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/allscreens/options/%gconf.xml diff --git a/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/wall/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/wall/%gconf.xml new file mode 100644 index 0000000..e69de29 diff --git a/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/wall/allscreens/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/wall/allscreens/%gconf.xml new file mode 100644 index 0000000..e69de29 diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/wall/allscreens/options/%gconf.xml b/client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/wall/allscreens/options/%gconf.xml similarity index 100% rename from client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/wall/allscreens/options/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/wall/allscreens/options/%gconf.xml diff --git a/client-profiles/90-compiz-always/.calculate_directory b/client-profiles/80-compiz-always/.calculate_directory similarity index 100% rename from client-profiles/90-compiz-always/.calculate_directory rename to client-profiles/80-compiz-always/.calculate_directory diff --git a/client-profiles/90-compiz-always/.config/autostart/fusion-icon-autostart.desktop b/client-profiles/80-compiz-always/.config/autostart/fusion-icon-autostart.desktop similarity index 65% rename from client-profiles/90-compiz-always/.config/autostart/fusion-icon-autostart.desktop rename to client-profiles/80-compiz-always/.config/autostart/fusion-icon-autostart.desktop index 343b95f..a8a9b99 100644 --- a/client-profiles/90-compiz-always/.config/autostart/fusion-icon-autostart.desktop +++ b/client-profiles/80-compiz-always/.config/autostart/fusion-icon-autostart.desktop @@ -1 +1 @@ -# Calculate format=kde link=/usr/share/applications/fusion-icon.desktop mirror pgk(fusion-icon)!= +# Calculate format=kde link=/usr/share/applications/fusion-icon.desktop mirror pkg(fusion-icon)!= diff --git a/client-profiles/90-compiz-always/.config/autostart/fusion-icon-remove.desktop b/client-profiles/80-compiz-always/.config/autostart/fusion-icon-remove.desktop similarity index 100% rename from client-profiles/90-compiz-always/.config/autostart/fusion-icon-remove.desktop rename to client-profiles/80-compiz-always/.config/autostart/fusion-icon-remove.desktop diff --git a/client-profiles/90-compiz-always/.config/compiz/compizconfig/config b/client-profiles/80-compiz-always/.config/compiz/compizconfig/config similarity index 100% rename from client-profiles/90-compiz-always/.config/compiz/compizconfig/config rename to client-profiles/80-compiz-always/.config/compiz/compizconfig/config diff --git a/client-profiles/90-compiz-always/.config/compiz/fusion-icon b/client-profiles/80-compiz-always/.config/compiz/fusion-icon similarity index 100% rename from client-profiles/90-compiz-always/.config/compiz/fusion-icon rename to client-profiles/80-compiz-always/.config/compiz/fusion-icon diff --git a/client-profiles/90-fbreader-0.1/.FBReader/ui.xml b/client-profiles/80-fbreader-0.1/.FBReader/ui.xml similarity index 100% rename from client-profiles/90-fbreader-0.1/.FBReader/ui.xml rename to client-profiles/80-fbreader-0.1/.FBReader/ui.xml diff --git a/client-profiles/90-fbreader-0.1/.calculate/ini.env b/client-profiles/80-fbreader-0.1/.calculate/ini.env similarity index 100% rename from client-profiles/90-fbreader-0.1/.calculate/ini.env rename to client-profiles/80-fbreader-0.1/.calculate/ini.env diff --git a/client-profiles/90-fbreader-0.1/.calculate_directory b/client-profiles/80-fbreader-0.1/.calculate_directory similarity index 100% rename from client-profiles/90-fbreader-0.1/.calculate_directory rename to client-profiles/80-fbreader-0.1/.calculate_directory diff --git a/client-profiles/90-firefox-3.5/.calculate/ini.env b/client-profiles/80-firefox-3.5/.calculate/ini.env similarity index 100% rename from client-profiles/90-firefox-3.5/.calculate/ini.env rename to client-profiles/80-firefox-3.5/.calculate/ini.env diff --git a/client-profiles/90-firefox-3.5/.calculate_directory b/client-profiles/80-firefox-3.5/.calculate_directory similarity index 100% rename from client-profiles/90-firefox-3.5/.calculate_directory rename to client-profiles/80-firefox-3.5/.calculate_directory diff --git a/client-profiles/90-firefox-3.5/.local/share/applications/mozilla-firefox-3.5.desktop b/client-profiles/80-firefox-3.5/.local/share/applications/mozilla-firefox-3.5.desktop similarity index 100% rename from client-profiles/90-firefox-3.5/.local/share/applications/mozilla-firefox-3.5.desktop rename to client-profiles/80-firefox-3.5/.local/share/applications/mozilla-firefox-3.5.desktop diff --git a/client-profiles/90-firefox-3.5/.local/share/applications/mozilla-firefox-3.5.desktop.del b/client-profiles/80-firefox-3.5/.local/share/applications/mozilla-firefox-3.5.desktop.del similarity index 100% rename from client-profiles/90-firefox-3.5/.local/share/applications/mozilla-firefox-3.5.desktop.del rename to client-profiles/80-firefox-3.5/.local/share/applications/mozilla-firefox-3.5.desktop.del diff --git a/client-profiles/90-firefox-3.5/.local/share/applications/mozilla-firefox-3.6.desktop b/client-profiles/80-firefox-3.5/.local/share/applications/mozilla-firefox-3.6.desktop similarity index 100% rename from client-profiles/90-firefox-3.5/.local/share/applications/mozilla-firefox-3.6.desktop rename to client-profiles/80-firefox-3.5/.local/share/applications/mozilla-firefox-3.6.desktop diff --git a/client-profiles/90-firefox-3.5/.local/share/applications/mozilla-firefox-3.6.desktop.del b/client-profiles/80-firefox-3.5/.local/share/applications/mozilla-firefox-3.6.desktop.del similarity index 100% rename from client-profiles/90-firefox-3.5/.local/share/applications/mozilla-firefox-3.6.desktop.del rename to client-profiles/80-firefox-3.5/.local/share/applications/mozilla-firefox-3.6.desktop.del diff --git a/client-profiles/90-firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/.calculate_directory b/client-profiles/80-firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/.calculate_directory similarity index 100% rename from client-profiles/90-firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/.calculate_directory rename to client-profiles/80-firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/.calculate_directory diff --git a/client-profiles/90-firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/patterns_eng.ini b/client-profiles/80-firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/patterns_eng.ini similarity index 100% rename from client-profiles/90-firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/patterns_eng.ini rename to client-profiles/80-firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/patterns_eng.ini diff --git a/client-profiles/90-firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/patterns_rus.ini b/client-profiles/80-firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/patterns_rus.ini similarity index 100% rename from client-profiles/90-firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/patterns_rus.ini rename to client-profiles/80-firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/patterns_rus.ini diff --git a/client-profiles/90-firefox-3.5/.mozilla/firefox/calculate.default/mimeTypes.rdf b/client-profiles/80-firefox-3.5/.mozilla/firefox/calculate.default/mimeTypes.rdf similarity index 96% rename from client-profiles/90-firefox-3.5/.mozilla/firefox/calculate.default/mimeTypes.rdf rename to client-profiles/80-firefox-3.5/.mozilla/firefox/calculate.default/mimeTypes.rdf index a7764c0..4c6f96c 100644 --- a/client-profiles/90-firefox-3.5/.mozilla/firefox/calculate.default/mimeTypes.rdf +++ b/client-profiles/80-firefox-3.5/.mozilla/firefox/calculate.default/mimeTypes.rdf @@ -38,7 +38,8 @@ - + + + @@ -108,6 +112,10 @@ NC:handleInternal="false"> + + + @@ -205,10 +213,8 @@ - - - + NC:alwaysAsk="false"> + - + + + @@ -108,6 +112,10 @@ NC:handleInternal="false"> + + + @@ -205,10 +213,8 @@ - - - + NC:alwaysAsk="false"> + =3.2&pkg(kde-base/kdelibs)!= diff --git a/client-profiles/80-openoffice-3.2/.ooo3/user/registry/data/org/openoffice/Office/Common.xcu b/client-profiles/80-openoffice-3.2/.ooo3/user/registry/data/org/openoffice/Office/Common.xcu new file mode 100644 index 0000000..ffb894b --- /dev/null +++ b/client-profiles/80-openoffice-3.2/.ooo3/user/registry/data/org/openoffice/Office/Common.xcu @@ -0,0 +1,8 @@ + + + + + false + + + diff --git a/client-profiles/90-pidgin-2.6/.calculate/ini.env b/client-profiles/80-pidgin-2.6/.calculate/ini.env similarity index 100% rename from client-profiles/90-pidgin-2.6/.calculate/ini.env rename to client-profiles/80-pidgin-2.6/.calculate/ini.env diff --git a/client-profiles/90-pidgin-2.6/.calculate_directory b/client-profiles/80-pidgin-2.6/.calculate_directory similarity index 100% rename from client-profiles/90-pidgin-2.6/.calculate_directory rename to client-profiles/80-pidgin-2.6/.calculate_directory diff --git a/client-profiles/90-pidgin-2.6/.purple/accels b/client-profiles/80-pidgin-2.6/.purple/accels similarity index 100% rename from client-profiles/90-pidgin-2.6/.purple/accels rename to client-profiles/80-pidgin-2.6/.purple/accels diff --git a/client-profiles/90-pidgin-2.6/.purple/accounts.xml b/client-profiles/80-pidgin-2.6/.purple/accounts.xml similarity index 93% rename from client-profiles/90-pidgin-2.6/.purple/accounts.xml rename to client-profiles/80-pidgin-2.6/.purple/accounts.xml index fcaa12c..f71d0c8 100644 --- a/client-profiles/90-pidgin-2.6/.purple/accounts.xml +++ b/client-profiles/80-pidgin-2.6/.purple/accounts.xml @@ -12,6 +12,7 @@ #-sr_jabber_host-# 1 1 + #-sr_jabber_port-# 1 diff --git a/client-profiles/90-pidgin-2.6/.purple/gtkrc-2.0 b/client-profiles/80-pidgin-2.6/.purple/gtkrc-2.0 similarity index 100% rename from client-profiles/90-pidgin-2.6/.purple/gtkrc-2.0 rename to client-profiles/80-pidgin-2.6/.purple/gtkrc-2.0 diff --git a/client-profiles/90-pidgin-2.6/.purple/prefs.xml b/client-profiles/80-pidgin-2.6/.purple/prefs.xml similarity index 100% rename from client-profiles/90-pidgin-2.6/.purple/prefs.xml rename to client-profiles/80-pidgin-2.6/.purple/prefs.xml diff --git a/client-profiles/90-stardict-3.0/.calculate/ini.env b/client-profiles/80-stardict-3.0/.calculate/ini.env similarity index 100% rename from client-profiles/90-stardict-3.0/.calculate/ini.env rename to client-profiles/80-stardict-3.0/.calculate/ini.env diff --git a/client-profiles/90-stardict-3.0/.calculate_directory b/client-profiles/80-stardict-3.0/.calculate_directory similarity index 100% rename from client-profiles/90-stardict-3.0/.calculate_directory rename to client-profiles/80-stardict-3.0/.calculate_directory diff --git a/client-profiles/90-stardict-3.0/.local/share/applications/stardict.desktop b/client-profiles/80-stardict-3.0/.local/share/applications/stardict.desktop similarity index 100% rename from client-profiles/90-stardict-3.0/.local/share/applications/stardict.desktop rename to client-profiles/80-stardict-3.0/.local/share/applications/stardict.desktop diff --git a/client-profiles/90-stardict-3.0/.stardict/stardict.cfg b/client-profiles/80-stardict-3.0/.stardict/stardict.cfg similarity index 100% rename from client-profiles/90-stardict-3.0/.stardict/stardict.cfg rename to client-profiles/80-stardict-3.0/.stardict/stardict.cfg diff --git a/client-profiles/90-transmission-1.8/.calculate/ini.env b/client-profiles/80-transmission-1.8/.calculate/ini.env similarity index 100% rename from client-profiles/90-transmission-1.8/.calculate/ini.env rename to client-profiles/80-transmission-1.8/.calculate/ini.env diff --git a/client-profiles/90-transmission-1.8/.calculate_directory b/client-profiles/80-transmission-1.8/.calculate_directory similarity index 100% rename from client-profiles/90-transmission-1.8/.calculate_directory rename to client-profiles/80-transmission-1.8/.calculate_directory diff --git a/client-profiles/90-transmission-1.8/.config/transmission/settings.json b/client-profiles/80-transmission-1.8/.config/transmission/settings.json similarity index 100% rename from client-profiles/90-transmission-1.8/.config/transmission/settings.json rename to client-profiles/80-transmission-1.8/.config/transmission/settings.json diff --git a/client-profiles/90-vim-7.0/.calculate/ini.env b/client-profiles/80-vim-7.0/.calculate/ini.env similarity index 100% rename from client-profiles/90-vim-7.0/.calculate/ini.env rename to client-profiles/80-vim-7.0/.calculate/ini.env diff --git a/client-profiles/90-vim-7.0/.calculate_directory b/client-profiles/80-vim-7.0/.calculate_directory similarity index 100% rename from client-profiles/90-vim-7.0/.calculate_directory rename to client-profiles/80-vim-7.0/.calculate_directory diff --git a/client-profiles/90-vim-7.0/.vimrc b/client-profiles/80-vim-7.0/.vimrc similarity index 100% rename from client-profiles/90-vim-7.0/.vimrc rename to client-profiles/80-vim-7.0/.vimrc diff --git a/client-profiles/90-xchat-2.8/.calculate/ini.env b/client-profiles/80-xchat-2.8/.calculate/ini.env similarity index 100% rename from client-profiles/90-xchat-2.8/.calculate/ini.env rename to client-profiles/80-xchat-2.8/.calculate/ini.env diff --git a/client-profiles/90-xchat-2.8/.calculate_directory b/client-profiles/80-xchat-2.8/.calculate_directory similarity index 100% rename from client-profiles/90-xchat-2.8/.calculate_directory rename to client-profiles/80-xchat-2.8/.calculate_directory diff --git a/client-profiles/90-xchat-2.8/.xchat2/xchat.conf b/client-profiles/80-xchat-2.8/.xchat2/xchat.conf similarity index 100% rename from client-profiles/90-xchat-2.8/.xchat2/xchat.conf rename to client-profiles/80-xchat-2.8/.xchat2/xchat.conf diff --git a/client-profiles/90-xchat-always/.calculate_directory b/client-profiles/80-xchat-always/.calculate_directory similarity index 100% rename from client-profiles/90-xchat-always/.calculate_directory rename to client-profiles/80-xchat-always/.calculate_directory diff --git a/client-profiles/90-xchat-always/.xchat2/xchat.conf b/client-profiles/80-xchat-always/.xchat2/xchat.conf similarity index 100% rename from client-profiles/90-xchat-always/.xchat2/xchat.conf rename to client-profiles/80-xchat-always/.xchat2/xchat.conf diff --git a/client-profiles/90-xscreensaver-5.10/.calculate/ini.env b/client-profiles/80-xscreensaver-5.10/.calculate/ini.env similarity index 100% rename from client-profiles/90-xscreensaver-5.10/.calculate/ini.env rename to client-profiles/80-xscreensaver-5.10/.calculate/ini.env diff --git a/client-profiles/90-xscreensaver-5.10/.calculate_directory b/client-profiles/80-xscreensaver-5.10/.calculate_directory similarity index 100% rename from client-profiles/90-xscreensaver-5.10/.calculate_directory rename to client-profiles/80-xscreensaver-5.10/.calculate_directory diff --git a/client-profiles/90-xscreensaver-5.10/.xscreensaver b/client-profiles/80-xscreensaver-5.10/.xscreensaver similarity index 100% rename from client-profiles/90-xscreensaver-5.10/.xscreensaver rename to client-profiles/80-xscreensaver-5.10/.xscreensaver diff --git a/client-profiles/90-patch-2.1.16/.calculate/ini.env b/client-profiles/90-patch-2.1.16/.calculate/ini.env new file mode 100644 index 0000000..9e23097 --- /dev/null +++ b/client-profiles/90-patch-2.1.16/.calculate/ini.env @@ -0,0 +1,7 @@ +# Calculate format=samba + +[ver] +patch = 2.1.16 + +[update] +patch = on diff --git a/client-profiles/90-patch-2.1.16/.calculate_directory b/client-profiles/90-patch-2.1.16/.calculate_directory new file mode 100644 index 0000000..d27104f --- /dev/null +++ b/client-profiles/90-patch-2.1.16/.calculate_directory @@ -0,0 +1 @@ +# Calculate ini(main.update)!=off&ini(update.patch)!=off&ini(ver.patch)<2.1.16 diff --git a/client-profiles/90-patch-2.1.16/.config/xfce4/.calculate_directory b/client-profiles/90-patch-2.1.16/.config/xfce4/.calculate_directory new file mode 100644 index 0000000..bd49a23 --- /dev/null +++ b/client-profiles/90-patch-2.1.16/.config/xfce4/.calculate_directory @@ -0,0 +1,2 @@ +# Calculate pkg(xfce-base/xfdesktop)>=4.6 + diff --git a/client-profiles/90-patch-2.1.16/.config/xfce4/panel/launcher-32.rc b/client-profiles/90-patch-2.1.16/.config/xfce4/panel/launcher-32.rc new file mode 100644 index 0000000..6f25934 --- /dev/null +++ b/client-profiles/90-patch-2.1.16/.config/xfce4/panel/launcher-32.rc @@ -0,0 +1,9 @@ +# Calculate format=kde +[Entry 0] +#?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/client-profiles/90-patch-2.1.16/.kde4/.calculate_directory b/client-profiles/90-patch-2.1.16/.kde4/.calculate_directory new file mode 100644 index 0000000..3e641ea --- /dev/null +++ b/client-profiles/90-patch-2.1.16/.kde4/.calculate_directory @@ -0,0 +1 @@ +# Calculate pkg(kde-base/kdelibs)!= diff --git a/client-profiles/90-patch-2.1.16/.kde4/share/config/konversationrc b/client-profiles/90-patch-2.1.16/.kde4/share/config/konversationrc new file mode 100644 index 0000000..324e5c9 --- /dev/null +++ b/client-profiles/90-patch-2.1.16/.kde4/share/config/konversationrc @@ -0,0 +1,9 @@ +# Calculate format=kde pkg(net-irc/konversation)!= + +[Channel 0] +#?os_locale_language!=ru# +Name=#calculate +#os_locale_language# +#?os_locale_language==ru# +Name=#calculate-ru +#os_locale_language# diff --git a/client-profiles/90-patch-2.1.16/.kde4/share/config/kwinrc b/client-profiles/90-patch-2.1.16/.kde4/share/config/kwinrc new file mode 100644 index 0000000..a1e7295 --- /dev/null +++ b/client-profiles/90-patch-2.1.16/.kde4/share/config/kwinrc @@ -0,0 +1,5 @@ +# Calculate format=kde + +[Windows] +#уровень предотвращение перевода фокуса - никогда +FocusStealingPreventionLevel=0 diff --git a/client-profiles/90-patch-2.1.16/.kde4/share/config/kxkbrc b/client-profiles/90-patch-2.1.16/.kde4/share/config/kxkbrc new file mode 100644 index 0000000..ee71d0b --- /dev/null +++ b/client-profiles/90-patch-2.1.16/.kde4/share/config/kxkbrc @@ -0,0 +1,4 @@ +# Calculate format=kde +#Раскладка клавиатуры +[Layout] +Options=grp:caps_toggle,grp_led:scroll,terminate:ctrl_alt_bksp diff --git a/client-profiles/90-patch-2.1.16/.local/share/applications/calculate-community.desktop b/client-profiles/90-patch-2.1.16/.local/share/applications/calculate-community.desktop new file mode 100644 index 0000000..89303e8 --- /dev/null +++ b/client-profiles/90-patch-2.1.16/.local/share/applications/calculate-community.desktop @@ -0,0 +1,10 @@ +# Calculate format=kde pkg(gnome-base/libgnome)>=2.26 +[Desktop Entry] +#изменим строку запуска +#?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/client-profiles/90-patch-2.1.16/.mozilla/firefox/.calculate_directory b/client-profiles/90-patch-2.1.16/.mozilla/firefox/.calculate_directory new file mode 100644 index 0000000..ae19c3c --- /dev/null +++ b/client-profiles/90-patch-2.1.16/.mozilla/firefox/.calculate_directory @@ -0,0 +1,2 @@ +# Calculate pkg(www-client/mozilla-firefox)>=3.5 + diff --git a/client-profiles/90-patch-2.1.16/.mozilla/firefox/calculate.default/mimeTypes.rdf b/client-profiles/90-patch-2.1.16/.mozilla/firefox/calculate.default/mimeTypes.rdf new file mode 100644 index 0000000..4c6f96c --- /dev/null +++ b/client-profiles/90-patch-2.1.16/.mozilla/firefox/calculate.default/mimeTypes.rdf @@ -0,0 +1,292 @@ + + + + + + + xls + xla + xlb + xlc + xlm + xlt + xlw + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client-profiles/90-patch-2.1.16/Desktop/calculate-community.desktop b/client-profiles/90-patch-2.1.16/Desktop/calculate-community.desktop new file mode 100644 index 0000000..2ca2f30 --- /dev/null +++ b/client-profiles/90-patch-2.1.16/Desktop/calculate-community.desktop @@ -0,0 +1,9 @@ +# Calculate format=kde os_root_type==livecd&pkg(net-irc/xchat)>=2.8.6 +[Desktop Entry] +#?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/client-profiles/90-patch-2.1.17/.calculate/ini.env b/client-profiles/90-patch-2.1.17/.calculate/ini.env new file mode 100644 index 0000000..abdd724 --- /dev/null +++ b/client-profiles/90-patch-2.1.17/.calculate/ini.env @@ -0,0 +1,7 @@ +# Calculate format=samba + +[ver] +patch = 2.1.17 + +[update] +patch = on diff --git a/client-profiles/90-patch-2.1.17/.calculate_directory b/client-profiles/90-patch-2.1.17/.calculate_directory new file mode 100644 index 0000000..65c8a88 --- /dev/null +++ b/client-profiles/90-patch-2.1.17/.calculate_directory @@ -0,0 +1 @@ +# Calculate ini(main.update)!=off&ini(update.patch)!=off&ini(ver.patch)<2.1.17 diff --git a/client-profiles/90-patch-2.1.17/.gconf/.calculate_directory b/client-profiles/90-patch-2.1.17/.gconf/.calculate_directory new file mode 100644 index 0000000..05bf241 --- /dev/null +++ b/client-profiles/90-patch-2.1.17/.gconf/.calculate_directory @@ -0,0 +1,2 @@ +# Calculate pkg(gnome-base/libgnome)>=2.26 + diff --git a/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml b/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml new file mode 100644 index 0000000..e69de29 diff --git a/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml b/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml new file mode 100644 index 0000000..39e38a2 --- /dev/null +++ b/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml @@ -0,0 +1,15 @@ +# Calculate format=xml_gconf append=join + + + +
  • + grp grp:caps_toggle +
    • +
  • + terminate terminate:ctrl_alt_bksp +
    • +
  • + grp_led grp_led:scroll +
    • +     +     diff --git a/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br b/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br new file mode 100644 index 0000000..4199009 --- /dev/null +++ b/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br @@ -0,0 +1,12 @@ +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==pt_BR + + + +
  • + br +
    • +
  • + us +
    • +     +     diff --git a/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de b/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de new file mode 100644 index 0000000..79d7b74 --- /dev/null +++ b/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de @@ -0,0 +1,12 @@ +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==de_DE + + + +
  • + de +
    • +
  • + us +
    • +     +     diff --git a/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es b/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es new file mode 100644 index 0000000..08cdcde --- /dev/null +++ b/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es @@ -0,0 +1,12 @@ +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==es_ES + + + +
  • + es +
    • +
  • + us +
    • +     +     diff --git a/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr b/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr new file mode 100644 index 0000000..8df3122 --- /dev/null +++ b/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr @@ -0,0 +1,12 @@ +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==fr_FR + + + +
  • + fr +
    • +
  • + us +
    • +     +     diff --git a/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it b/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it new file mode 100644 index 0000000..32f2dd9 --- /dev/null +++ b/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it @@ -0,0 +1,12 @@ +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==it_IT + + + +
  • + it +
    • +
  • + us +
    • +     +     diff --git a/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl b/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl new file mode 100644 index 0000000..ade4a69 --- /dev/null +++ b/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl @@ -0,0 +1,12 @@ +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==pl_PL + + + +
  • + pl +
    • +
  • + us +
    • +     +     diff --git a/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru b/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru new file mode 100644 index 0000000..74604b1 --- /dev/null +++ b/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru @@ -0,0 +1,12 @@ +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==ru_RU + + + +
  • + us +
    • +
  • + ru +
    • +     +     diff --git a/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk b/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk new file mode 100644 index 0000000..f38ce17 --- /dev/null +++ b/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk @@ -0,0 +1,12 @@ +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==uk_UA + + + +
  • + us +
    • +
  • + ua +
    • +     +     diff --git a/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us b/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us new file mode 100644 index 0000000..4e2233b --- /dev/null +++ b/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us @@ -0,0 +1,9 @@ +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==en_US + + + +
  • + us +
    • +     +     diff --git a/client-profiles/90-patch-2.1.19/.calculate/ini.env b/client-profiles/90-patch-2.1.19/.calculate/ini.env new file mode 100644 index 0000000..00cc998 --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.calculate/ini.env @@ -0,0 +1,7 @@ +# Calculate format=samba + +[ver] +patch = 2.1.19 + +[update] +patch = on diff --git a/client-profiles/90-patch-2.1.19/.calculate_directory b/client-profiles/90-patch-2.1.19/.calculate_directory new file mode 100644 index 0000000..f492b18 --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.calculate_directory @@ -0,0 +1 @@ +# Calculate ini(main.update)!=off&ini(update.patch)!=off&ini(ver.patch)<2.1.19 diff --git a/client-profiles/90-patch-2.1.19/.config/xfce4/.calculate_directory b/client-profiles/90-patch-2.1.19/.config/xfce4/.calculate_directory new file mode 100644 index 0000000..e305e8e --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.config/xfce4/.calculate_directory @@ -0,0 +1 @@ +# Calculate pkg(xfce-base/xfdesktop)>=4.6 diff --git a/client-profiles/90-patch-2.1.19/.config/xfce4/helpers.rc b/client-profiles/90-patch-2.1.19/.config/xfce4/helpers.rc new file mode 100644 index 0000000..c60f227 --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.config/xfce4/helpers.rc @@ -0,0 +1,8 @@ +# Calculate format=procmail +#?pkg(www-client/chromium)!=# +WebBrowser=chromium +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# +WebBrowser=firefox +#pkg# + diff --git a/client-profiles/90-patch-2.1.19/.config/xfce4/panel/launcher-30.rc b/client-profiles/90-patch-2.1.19/.config/xfce4/panel/launcher-30.rc new file mode 100644 index 0000000..2b8b82a --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.config/xfce4/panel/launcher-30.rc @@ -0,0 +1,15 @@ +# Calculate format=kde +[Entry 0] +#?pkg(www-client/chromium)!=# +Icon=chromium-browser +Exec=chromium +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# +Icon=browser +Exec=firefox +#pkg# +#?pkg(www-client/mozilla-firefox)==&pkg(www-client/chromium)==# +Icon=browser +Exec=exo-open --launch WebBrowser +#pkg# + diff --git a/client-profiles/90-patch-2.1.19/.gconf/.calculate_directory b/client-profiles/90-patch-2.1.19/.gconf/.calculate_directory new file mode 100644 index 0000000..8d9572f --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.gconf/.calculate_directory @@ -0,0 +1 @@ +# Calculate pkg(gnome-base/libgnome)>=2.26 diff --git a/client-profiles/90-patch-2.1.19/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml b/client-profiles/90-patch-2.1.19/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml new file mode 100644 index 0000000..9d86083 --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml @@ -0,0 +1,12 @@ +# Calculate format=xml_gconf + + + +#?pkg(www-client/chromium)!=# + chromium-chromium.desktop +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# + mozilla-firefox.desktop +#pkg# + + diff --git a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/applications/browser/%gconf.xml b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/applications/browser/%gconf.xml new file mode 100644 index 0000000..501600c --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/applications/browser/%gconf.xml @@ -0,0 +1,12 @@ +# Calculate format=xml_gconf + + + +#?pkg(www-client/chromium)!=# + chromium +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# + firefox +#pkg# + + diff --git a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/about/%gconf.xml b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/about/%gconf.xml new file mode 100644 index 0000000..1d95e4c --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/about/%gconf.xml @@ -0,0 +1,12 @@ +# Calculate format=xml_gconf + + + +#?pkg(www-client/chromium)!=# + chromium %s +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# + firefox %s +#pkg# + + diff --git a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml new file mode 100644 index 0000000..d83de6f --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml @@ -0,0 +1,14 @@ +# Calculate format=xml_gconf + + + + + +#?pkg(www-client/chromium)!=# + chromium %s +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# + firefox %s +#pkg# + + diff --git a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml new file mode 100644 index 0000000..1d95e4c --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml @@ -0,0 +1,12 @@ +# Calculate format=xml_gconf + + + +#?pkg(www-client/chromium)!=# + chromium %s +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# + firefox %s +#pkg# + + diff --git a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/http/%gconf.xml b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/http/%gconf.xml new file mode 100644 index 0000000..1d95e4c --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/http/%gconf.xml @@ -0,0 +1,12 @@ +# Calculate format=xml_gconf + + + +#?pkg(www-client/chromium)!=# + chromium %s +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# + firefox %s +#pkg# + + diff --git a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/https/%gconf.xml b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/https/%gconf.xml new file mode 100644 index 0000000..1d95e4c --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/https/%gconf.xml @@ -0,0 +1,12 @@ +# Calculate format=xml_gconf + + + +#?pkg(www-client/chromium)!=# + chromium %s +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# + firefox %s +#pkg# + + diff --git a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml new file mode 100644 index 0000000..1d95e4c --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml @@ -0,0 +1,12 @@ +# Calculate format=xml_gconf + + + +#?pkg(www-client/chromium)!=# + chromium %s +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# + firefox %s +#pkg# + + diff --git a/client-profiles/90-patch-2.1.19/.gnome2/.calculate_directory b/client-profiles/90-patch-2.1.19/.gnome2/.calculate_directory new file mode 100644 index 0000000..8d9572f --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.gnome2/.calculate_directory @@ -0,0 +1 @@ +# Calculate pkg(gnome-base/libgnome)>=2.26 diff --git a/client-profiles/90-patch-2.1.19/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd b/client-profiles/90-patch-2.1.19/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd new file mode 100644 index 0000000..0615eef --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd @@ -0,0 +1,9 @@ +# Calculate format=kde + +[Desktop Entry] +#?os_locale_language!=ru# +Exec=xdg-open /usr/calculate/install/doc/handbook.html +#os_locale_language# +#?os_locale_language==ru# +Exec=xdg-open /usr/calculate/install/doc/handbook-ru.html +#os_locale_language# diff --git a/client-profiles/90-patch-2.1.19/.kde4/.calculate_directory b/client-profiles/90-patch-2.1.19/.kde4/.calculate_directory new file mode 100644 index 0000000..3f0dc89 --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.kde4/.calculate_directory @@ -0,0 +1,2 @@ +# Calculate pkg(kde-base/kdelibs)<4.5 + diff --git a/client-profiles/90-patch-2.1.19/.kde4/share/config/kdeglobals b/client-profiles/90-patch-2.1.19/.kde4/share/config/kdeglobals new file mode 100644 index 0000000..4d40d3b --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.kde4/share/config/kdeglobals @@ -0,0 +1,14 @@ +# Calculate format=kde + +[General] +# сделать chromium браузером по умолчанию, если он установлен +#?pkg(www-client/chromium)!=# +BrowserApplication[$e]=file:///usr/share/applications/chromium-chromium.desktop +#pkg# +# сделать mozilla firefox браузером по умолчанию, если он установлен +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# +BrowserApplication[$e]=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop +#pkg# +#?pkg(www-client/mozilla-firefox)==&pkg(www-client/chromium)==# +BrowserApplication[$e]=file:///usr/share/applications/kde4/konqbrowser.desktop +#pkg# diff --git a/client-profiles/90-patch-2.1.19/.kde4/share/config/plasma-desktop-appletsrc b/client-profiles/90-patch-2.1.19/.kde4/share/config/plasma-desktop-appletsrc new file mode 100644 index 0000000..0933353 --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.kde4/share/config/plasma-desktop-appletsrc @@ -0,0 +1,36 @@ +# Calculate format=plasma +#------------------------------------------------------------------------------ +#нижняя панель +#------------------------------------------------------------------------------ + +#-sum(cont,,2)-# +#-sum(bs,,40)-# +#-sum(sp,,4)-# +#-sum(height,,bs+sp)-# +#-sum(width,,height*15)-# + +[Containments][#-sum(cont,cont+1)-#] +desktop=-1 +formfactor=2 +geometry=0,0,#-sum(width,width)-#,#-sum(height,height)-# +immutability=1 +location=4 +plugin=panel +screen=0 +zvalue=150 + +[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,cont*100)-#] +geometry=#-sum(x,0)-#,0,#-sum(x,bs,x+bs)-#,#-sum(bs,bs)-# +immutability=1 +plugin=icon +zvalue=0 +[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] +#?pkg(www-client/chromium)!=# +Url=file:///usr/share/applications/chromium-chromium.desktop +#pkg# +#?pkg(www-client/mozilla-firefox)!=&pkg(www-client/chromium)==# +Url=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop +#pkg# +#?pkg(www-client/mozilla-firefox)==&pkg(www-client/chromium)==# +Url=file:///usr/share/applications/kde4/konqbrowser.desktop +#pkg# diff --git a/client-profiles/90-patch-2.1.19/.local/share/applications/defaults.list b/client-profiles/90-patch-2.1.19/.local/share/applications/defaults.list new file mode 100644 index 0000000..de73771 --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.local/share/applications/defaults.list @@ -0,0 +1,14 @@ +# Calculate format=compiz +[Default Applications] +application/rss+xml=chromium-chromium.desktop;mozilla-firefox.desktop +application/rtf=writer.desktop +application/vnd.mozilla.xul+xml=chromium-chromium.desktop;mozilla-firefox.desktop +application/x-font-ttx=chromium-chromium.desktop;mozilla-firefox.desktop +application/x-ufraw=chromium-chromium.desktop;mozilla-firefox.desktop +application/xhtml+xml=chromium-chromium.desktop;mozilla-firefox.desktop +application/xml-external-parsed-entity=chromium-chromium.desktop;mozilla-firefox.desktop +application/xml=chromium-chromium.desktop;mozilla-firefox.desktop +application/xsd=chromium-chromium.desktop;mozilla-firefox.desktop +application/xslt+xml=chromium-chromium.desktop;mozilla-firefox.desktop +text/html=chromium-chromium.desktop;mozilla-firefox.desktop + diff --git a/client-profiles/90-patch-2.1.19/.local/share/applications/mimeapps.list b/client-profiles/90-patch-2.1.19/.local/share/applications/mimeapps.list new file mode 100644 index 0000000..18b80b9 --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.local/share/applications/mimeapps.list @@ -0,0 +1,12 @@ +# Calculate format=compiz pkg(kdelibs)>=4.3 +[Added Associations] +application/rss+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/vnd.mozilla.xul+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/x-font-ttx=chromium-chromium.desktop;mozilla-firefox.desktop; +application/x-ufraw=chromium-chromium.desktop;mozilla-firefox.desktop; +application/xhtml+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xml-external-parsed-entity=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xsd=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xslt+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +text/html=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; diff --git a/client-profiles/90-patch-2.1.19/Desktop/README.desktop b/client-profiles/90-patch-2.1.19/Desktop/README.desktop new file mode 100644 index 0000000..dd85e09 --- /dev/null +++ b/client-profiles/90-patch-2.1.19/Desktop/README.desktop @@ -0,0 +1,9 @@ +# Calculate format=kde os_root_type==livecd chmod=0755 + +[Desktop Entry] +#?os_locale_language!=ru# +Exec=xdg-open /usr/calculate/install/doc/handbook.html +#os_locale_language# +#?os_locale_language==ru# +Exec=xdg-open /usr/calculate/install/doc/handbook-ru.html +#os_locale_language# diff --git a/pym/cl_client.py b/pym/cl_client.py index e15a1ee..91e1fe9 100644 --- a/pym/cl_client.py +++ b/pym/cl_client.py @@ -35,7 +35,7 @@ import subprocess from encrypt import encrypt from signal import SIGTERM -Version = "calculate-client 2.1.15" +Version = "calculate-client 2.1.19" tr = cl_base.lang() tr.setLanguage(sys.modules[__name__]) @@ -124,7 +124,7 @@ class GProgressBar(NoneProgressBar): def setMaximum(self,max): '''Установить максимальное значения для прогресса''' self.max = max - self.kmax = max / 100.0 + self.kmax = (max / 100.0) or 1.0 def setTitle(self,title): '''Установить описания прогресса''' @@ -232,7 +232,7 @@ org.kde.kdialog.ProgressDialog' os.system(env + '/usr/bin/qdbus %s %s maximum %d >/dev/null'\ %(self.kdialog,self.suffixSet, 100)) self.max = max - self.kmax = max / 100.0 + self.kmax = (max / 100.0) or 1.0 def setTitle(self,title): @@ -275,8 +275,6 @@ class RsyncProgressBar: при необходимости вывода progressbar ''' - # получение номера передаваемого файла из инф потока rsync - senderre = re.compile("\[sender\] i=(\d+) ", re.S) # получение номера получаемого файла из потока rsync receiverre = re.compile("recv_generator\(.+,([0-9]+)\)", re.S) pipe = None @@ -327,12 +325,6 @@ class RsyncProgressBar: s = self.pipe.stdout.readline() if len(s) == 0: break - q = self.senderre.search(s) - if q: - maximum = int(q.groups()[0]) - if self.maximum < maximum: - self.maximum = maximum - continue q = self.receiverre.search(s) if q: if not self.copyStarting: @@ -2867,6 +2859,8 @@ or ld_bind_dn or ld_bind_pw") --exclude="/.Xauthority" \ --exclude="/.thumbnails" \ --exclude="/.mozilla/firefox/*/Cache" \ +--exclude="/.cache" \ +--exclude="/.opera/cache" \ --filter="P /.googleearth" --filter="P /Home" --filter="P /Disks" \ --filter="P /.local/share/akonadi/db_data" --filter="P /.VirtualBox" \ --filter="P /.mozilla/firefox/calculate.default/urlclassifier3.sqlite" \ @@ -2876,7 +2870,9 @@ or ld_bind_dn or ld_bind_pw") --filter="P /.Xauthority" \ --filter="P /.thumbnails" \ --filter="P /.mozilla/firefox/*/Cache" \ ---filter="P /FTP" -a -x -v -v -v -v %s/ %s/' %(homeProfile,userHome) +--filter="P /.cache" \ +--filter="P /.opera/cache" \ +--filter="P /FTP" -a -x -v -v -v %s/ %s/' %(homeProfile,userHome) elif sync == "logout": if os.path.exists(userHome) and os.listdir(userHome) and\ os.path.exists(homeProfile): @@ -2891,7 +2887,9 @@ or ld_bind_dn or ld_bind_pw") --exclude="/.kde4/socket-*" --exclude="/.kde4/share/config/phonondevicesrc" \ --exclude="/.thumbnails" \ --exclude="/.mozilla/firefox/*/Cache" \ --a -x -v -v -v -v %s/ %s/'%(userHome,homeProfile) +--exclude="/.cache" \ +--exclude="/.opera/cache" \ +-a -x -v -v -v %s/ %s/'%(userHome,homeProfile) else: self.printERROR(_("Method syncUser: option sync=%s incorrect")\ %str(sync)) @@ -2921,11 +2919,11 @@ or ld_bind_dn or ld_bind_pw") if numfiles is False: if os.path.exists(configFileName): os.remove(configFileName) - numfiles = 1 + numfiles = 0 else: numfiles = int(numfiles) except: - numfiles = 1 + numfiles = 0 rsync.maximum = numfiles if progress: rsync.run() diff --git a/pym/cl_vars_client.py b/pym/cl_vars_client.py index 6bf060c..11210d5 100644 --- a/pym/cl_vars_client.py +++ b/pym/cl_vars_client.py @@ -138,7 +138,7 @@ class Data: cl_name = {'value':'calculate-client'} # версия программы - cl_ver = {'value':'2.1.15'} + cl_ver = {'value':'2.1.19'} # Режим работы клиента клиент # (local или имя хоста клиента) diff --git a/setup.py b/setup.py index ec63cef..d1f6dbb 100755 --- a/setup.py +++ b/setup.py @@ -102,7 +102,7 @@ class cl_install_data(install_data): setup( name = 'calculate-client', - version = "2.1.15", + version = "2.1.19", description = "Client for the calculate-server", author = "Mir Calculate Ltd.", author_email = "support@calculate.ru",