From 06ec0f7c110495d98c655a744327fbf9b6e357a0 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Thu, 15 Apr 2010 15:32:53 +0400 Subject: [PATCH 01/26] Add patch template --- .../00-new_templates/.calculate/ini.env | 1 + client-profiles/01-init/.calculate/ini.env | 6 + .../20-kde-4.3-4.4/.kde4/share/config/kwinrc | 2 + .../20-kde-4.3-4.4/.kde4/share/config/kxkbrc | 4 + .../20-kde-4.4/.kde4/share/config/kwinrc | 2 + .../applications/calculate-community.desktop | 5 + .../Desktop/calculate-community.desktop | 5 + .../.config/xfce4/panel/launcher-32.rc | 5 + .../Desktop/calculate-community.desktop | 5 + .../{90-bash-4.0 => 80-bash-4.0}/.bashrc | 0 .../.calculate/ini.env | 0 .../.calculate_directory | 0 .../.calculate/ini.env | 0 .../.calculate_directory | 0 .../autostart/fusion-icon-autostart.desktop | 0 .../autostart/fusion-icon-remove.desktop | 0 .../.config/compiz/compizconfig/config | 0 .../.config/compiz/fusion-icon | 0 .../.gconf/%gconf.xml | 0 .../.gconf/apps/%gconf.xml | 0 .../.gconf/apps/compiz/%gconf.xml | 0 .../.gconf/apps/compiz/general/%gconf.xml | 0 .../apps/compiz/general/allscreens/%gconf.xml | 0 .../general/allscreens/options/%gconf.xml | 0 .../.gconf/apps/compiz/plugins/%gconf.xml | 0 .../apps/compiz/plugins/animation/%gconf.xml | 0 .../plugins/animation/screen0/%gconf.xml | 0 .../animation/screen0/options/%gconf.xml | 0 .../apps/compiz/plugins/decoration/%gconf.xml | 0 .../plugins/decoration/allscreens/%gconf.xml | 0 .../decoration/allscreens/options/%gconf.xml | 0 .../apps/compiz/plugins/move/%gconf.xml | 0 .../compiz/plugins/move/allscreens/%gconf.xml | 0 .../move/allscreens/options/%gconf.xml | 0 .../apps/compiz/plugins/place/%gconf.xml | 0 .../compiz/plugins/place/screen0/%gconf.xml | 0 .../plugins/place/screen0/options/%gconf.xml | 0 .../apps/compiz/plugins/scale/%gconf.xml | 0 .../plugins/scale/allscreens/%gconf.xml | 0 .../scale/allscreens/options/%gconf.xml | 0 .../apps/compiz/plugins/snap/%gconf.xml | 0 .../compiz/plugins/snap/screen0/%gconf.xml | 0 .../plugins/snap/screen0/options/%gconf.xml | 0 .../compiz/plugins/staticswitcher/%gconf.xml | 0 .../plugins/staticswitcher/screen0/%gconf.xml | 0 .../staticswitcher/screen0/options/%gconf.xml | 0 .../apps/compiz/plugins/vpswitch/%gconf.xml | 0 .../plugins/vpswitch/allscreens/%gconf.xml | 0 .../vpswitch/allscreens/options/%gconf.xml | 0 .../apps/compiz/plugins/wall/%gconf.xml | 0 .../compiz/plugins/wall/allscreens/%gconf.xml | 0 .../wall/allscreens/options/%gconf.xml | 0 .../.calculate_directory | 0 .../autostart/fusion-icon-autostart.desktop | 0 .../autostart/fusion-icon-remove.desktop | 0 .../.config/compiz/compizconfig/config | 0 .../.config/compiz/fusion-icon | 0 .../.FBReader/ui.xml | 0 .../.calculate/ini.env | 0 .../.calculate_directory | 0 .../.calculate/ini.env | 0 .../.calculate_directory | 0 .../applications/mozilla-firefox-3.5.desktop | 0 .../mozilla-firefox-3.5.desktop.del | 0 .../applications/mozilla-firefox-3.6.desktop | 0 .../mozilla-firefox-3.6.desktop.del | 0 .../adblockplus/.calculate_directory | 0 .../adblockplus/patterns_eng.ini | 0 .../adblockplus/patterns_rus.ini | 0 .../firefox/calculate.default/mimeTypes.rdf | 16 +- .../firefox/calculate.default/prefs.js | 0 .../.mozilla/firefox/profiles.ini | 0 .../.calculate_directory | 0 .../applications/mozilla-firefox-3.5.desktop | 0 .../mozilla-firefox-3.5.desktop.del | 0 .../applications/mozilla-firefox-3.6.desktop | 0 .../mozilla-firefox-3.6.desktop.del | 0 .../firefox/calculate.default/mimeTypes.rdf | 16 +- .../.calculate/ini.env | 0 .../.calculate_directory | 0 .../.local/share/applications/gimp.desktop | 0 .../.calculate/ini.env | 0 .../.calculate_directory | 0 .../.kde4/share/config/konversation.notifyrc | 0 .../.kde4/share/config/konversationrc | 5 + .../.calculate_directory | 0 .../.kde4/share/config/konversationrc | 0 .../.calculate/ini.env | 0 .../.calculate_directory | 0 .../{90-mc-4.7 => 80-mc-4.7}/.mc/ini | 0 .../80-openoffice-3.2/.calculate/ini.env | 7 + .../80-openoffice-3.2/.calculate_directory | 1 + .../data/org/openoffice/Office/Common.xcu | 8 + .../.calculate/ini.env | 0 .../.calculate_directory | 0 .../.purple/accels | 0 .../.purple/accounts.xml | 0 .../.purple/gtkrc-2.0 | 0 .../.purple/prefs.xml | 0 .../.calculate/ini.env | 0 .../.calculate_directory | 0 .../share/applications/stardict.desktop | 0 .../.stardict/stardict.cfg | 0 .../.calculate/ini.env | 0 .../.calculate_directory | 0 .../.config/transmission/settings.json | 0 .../.calculate/ini.env | 0 .../.calculate_directory | 0 .../{90-vim-7.0 => 80-vim-7.0}/.vimrc | 0 .../.calculate/ini.env | 0 .../.calculate_directory | 0 .../.xchat2/xchat.conf | 0 .../.calculate_directory | 0 .../.xchat2/xchat.conf | 0 .../.calculate/ini.env | 0 .../.calculate_directory | 0 .../.xscreensaver | 0 .../90-patch-2.1.16/.calculate/ini.env | 7 + .../90-patch-2.1.16/.calculate_directory | 1 + .../.config/xfce4/panel/launcher-32.rc | 9 + .../.kde4/.calculate_directory | 1 + .../.kde4/share/config/konversationrc | 9 + .../90-patch-2.1.16/.kde4/share/config/kwinrc | 5 + .../90-patch-2.1.16/.kde4/share/config/kxkbrc | 4 + .../applications/calculate-community.desktop | 10 + .../firefox/calculate.default/mimeTypes.rdf | 292 ++++++++++++++++++ .../Desktop/calculate-community.desktop | 9 + 127 files changed, 425 insertions(+), 10 deletions(-) create mode 100644 client-profiles/20-kde-4.3-4.4/.kde4/share/config/kxkbrc rename client-profiles/{90-bash-4.0 => 80-bash-4.0}/.bashrc (100%) rename client-profiles/{90-bash-4.0 => 80-bash-4.0}/.calculate/ini.env (100%) rename client-profiles/{90-bash-4.0 => 80-bash-4.0}/.calculate_directory (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.calculate/ini.env (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.calculate_directory (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.config/autostart/fusion-icon-autostart.desktop (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.config/autostart/fusion-icon-remove.desktop (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.config/compiz/compizconfig/config (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.config/compiz/fusion-icon (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/general/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/general/allscreens/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/general/allscreens/options/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/animation/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/animation/screen0/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/animation/screen0/options/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/decoration/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/decoration/allscreens/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/decoration/allscreens/options/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/move/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/move/allscreens/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/move/allscreens/options/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/place/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/place/screen0/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/place/screen0/options/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/scale/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/scale/allscreens/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/scale/allscreens/options/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/snap/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/snap/screen0/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/snap/screen0/options/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/staticswitcher/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/staticswitcher/screen0/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/staticswitcher/screen0/options/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/vpswitch/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/vpswitch/allscreens/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/vpswitch/allscreens/options/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/wall/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/wall/allscreens/%gconf.xml (100%) rename client-profiles/{90-compiz-0.8.4 => 80-compiz-0.8.4}/.gconf/apps/compiz/plugins/wall/allscreens/options/%gconf.xml (100%) rename client-profiles/{90-compiz-always => 80-compiz-always}/.calculate_directory (100%) rename client-profiles/{90-compiz-always => 80-compiz-always}/.config/autostart/fusion-icon-autostart.desktop (100%) rename client-profiles/{90-compiz-always => 80-compiz-always}/.config/autostart/fusion-icon-remove.desktop (100%) rename client-profiles/{90-compiz-always => 80-compiz-always}/.config/compiz/compizconfig/config (100%) rename client-profiles/{90-compiz-always => 80-compiz-always}/.config/compiz/fusion-icon (100%) rename client-profiles/{90-fbreader-0.1 => 80-fbreader-0.1}/.FBReader/ui.xml (100%) rename client-profiles/{90-fbreader-0.1 => 80-fbreader-0.1}/.calculate/ini.env (100%) rename client-profiles/{90-fbreader-0.1 => 80-fbreader-0.1}/.calculate_directory (100%) rename client-profiles/{90-firefox-3.5 => 80-firefox-3.5}/.calculate/ini.env (100%) rename client-profiles/{90-firefox-3.5 => 80-firefox-3.5}/.calculate_directory (100%) rename client-profiles/{90-firefox-3.5 => 80-firefox-3.5}/.local/share/applications/mozilla-firefox-3.5.desktop (100%) rename client-profiles/{90-firefox-3.5 => 80-firefox-3.5}/.local/share/applications/mozilla-firefox-3.5.desktop.del (100%) rename client-profiles/{90-firefox-3.5 => 80-firefox-3.5}/.local/share/applications/mozilla-firefox-3.6.desktop (100%) rename client-profiles/{90-firefox-3.5 => 80-firefox-3.5}/.local/share/applications/mozilla-firefox-3.6.desktop.del (100%) rename client-profiles/{90-firefox-3.5 => 80-firefox-3.5}/.mozilla/firefox/calculate.default/adblockplus/.calculate_directory (100%) rename client-profiles/{90-firefox-3.5 => 80-firefox-3.5}/.mozilla/firefox/calculate.default/adblockplus/patterns_eng.ini (100%) rename client-profiles/{90-firefox-3.5 => 80-firefox-3.5}/.mozilla/firefox/calculate.default/adblockplus/patterns_rus.ini (100%) rename client-profiles/{90-firefox-3.5 => 80-firefox-3.5}/.mozilla/firefox/calculate.default/mimeTypes.rdf (96%) rename client-profiles/{90-firefox-3.5 => 80-firefox-3.5}/.mozilla/firefox/calculate.default/prefs.js (100%) rename client-profiles/{90-firefox-3.5 => 80-firefox-3.5}/.mozilla/firefox/profiles.ini (100%) rename client-profiles/{90-firefox-always => 80-firefox-always}/.calculate_directory (100%) rename client-profiles/{90-firefox-always => 80-firefox-always}/.local/share/applications/mozilla-firefox-3.5.desktop (100%) rename client-profiles/{90-firefox-always => 80-firefox-always}/.local/share/applications/mozilla-firefox-3.5.desktop.del (100%) rename client-profiles/{90-firefox-always => 80-firefox-always}/.local/share/applications/mozilla-firefox-3.6.desktop (100%) rename client-profiles/{90-firefox-always => 80-firefox-always}/.local/share/applications/mozilla-firefox-3.6.desktop.del (100%) rename client-profiles/{90-firefox-always => 80-firefox-always}/.mozilla/firefox/calculate.default/mimeTypes.rdf (96%) rename client-profiles/{90-gimp-2.6 => 80-gimp-2.6}/.calculate/ini.env (100%) rename client-profiles/{90-gimp-2.6 => 80-gimp-2.6}/.calculate_directory (100%) rename client-profiles/{90-gimp-2.6 => 80-gimp-2.6}/.local/share/applications/gimp.desktop (100%) rename client-profiles/{90-konversation-1.2 => 80-konversation-1.2}/.calculate/ini.env (100%) rename client-profiles/{90-konversation-1.2 => 80-konversation-1.2}/.calculate_directory (100%) rename client-profiles/{90-konversation-1.2 => 80-konversation-1.2}/.kde4/share/config/konversation.notifyrc (100%) rename client-profiles/{90-konversation-1.2 => 80-konversation-1.2}/.kde4/share/config/konversationrc (96%) rename client-profiles/{90-konversation-always => 80-konversation-always}/.calculate_directory (100%) rename client-profiles/{90-konversation-always => 80-konversation-always}/.kde4/share/config/konversationrc (100%) rename client-profiles/{90-mc-4.7 => 80-mc-4.7}/.calculate/ini.env (100%) rename client-profiles/{90-mc-4.7 => 80-mc-4.7}/.calculate_directory (100%) rename client-profiles/{90-mc-4.7 => 80-mc-4.7}/.mc/ini (100%) create mode 100644 client-profiles/80-openoffice-3.2/.calculate/ini.env create mode 100644 client-profiles/80-openoffice-3.2/.calculate_directory create mode 100644 client-profiles/80-openoffice-3.2/.ooo3/user/registry/data/org/openoffice/Office/Common.xcu rename client-profiles/{90-pidgin-2.6 => 80-pidgin-2.6}/.calculate/ini.env (100%) rename client-profiles/{90-pidgin-2.6 => 80-pidgin-2.6}/.calculate_directory (100%) rename client-profiles/{90-pidgin-2.6 => 80-pidgin-2.6}/.purple/accels (100%) rename client-profiles/{90-pidgin-2.6 => 80-pidgin-2.6}/.purple/accounts.xml (100%) rename client-profiles/{90-pidgin-2.6 => 80-pidgin-2.6}/.purple/gtkrc-2.0 (100%) rename client-profiles/{90-pidgin-2.6 => 80-pidgin-2.6}/.purple/prefs.xml (100%) rename client-profiles/{90-stardict-3.0 => 80-stardict-3.0}/.calculate/ini.env (100%) rename client-profiles/{90-stardict-3.0 => 80-stardict-3.0}/.calculate_directory (100%) rename client-profiles/{90-stardict-3.0 => 80-stardict-3.0}/.local/share/applications/stardict.desktop (100%) rename client-profiles/{90-stardict-3.0 => 80-stardict-3.0}/.stardict/stardict.cfg (100%) rename client-profiles/{90-transmission-1.8 => 80-transmission-1.8}/.calculate/ini.env (100%) rename client-profiles/{90-transmission-1.8 => 80-transmission-1.8}/.calculate_directory (100%) rename client-profiles/{90-transmission-1.8 => 80-transmission-1.8}/.config/transmission/settings.json (100%) rename client-profiles/{90-vim-7.0 => 80-vim-7.0}/.calculate/ini.env (100%) rename client-profiles/{90-vim-7.0 => 80-vim-7.0}/.calculate_directory (100%) rename client-profiles/{90-vim-7.0 => 80-vim-7.0}/.vimrc (100%) rename client-profiles/{90-xchat-2.8 => 80-xchat-2.8}/.calculate/ini.env (100%) rename client-profiles/{90-xchat-2.8 => 80-xchat-2.8}/.calculate_directory (100%) rename client-profiles/{90-xchat-2.8 => 80-xchat-2.8}/.xchat2/xchat.conf (100%) rename client-profiles/{90-xchat-always => 80-xchat-always}/.calculate_directory (100%) rename client-profiles/{90-xchat-always => 80-xchat-always}/.xchat2/xchat.conf (100%) rename client-profiles/{90-xscreensaver-5.10 => 80-xscreensaver-5.10}/.calculate/ini.env (100%) rename client-profiles/{90-xscreensaver-5.10 => 80-xscreensaver-5.10}/.calculate_directory (100%) rename client-profiles/{90-xscreensaver-5.10 => 80-xscreensaver-5.10}/.xscreensaver (100%) create mode 100644 client-profiles/90-patch-2.1.16/.calculate/ini.env create mode 100644 client-profiles/90-patch-2.1.16/.calculate_directory create mode 100644 client-profiles/90-patch-2.1.16/.config/xfce4/panel/launcher-32.rc create mode 100644 client-profiles/90-patch-2.1.16/.kde4/.calculate_directory create mode 100644 client-profiles/90-patch-2.1.16/.kde4/share/config/konversationrc create mode 100644 client-profiles/90-patch-2.1.16/.kde4/share/config/kwinrc create mode 100644 client-profiles/90-patch-2.1.16/.kde4/share/config/kxkbrc create mode 100644 client-profiles/90-patch-2.1.16/.local/share/applications/calculate-community.desktop create mode 100644 client-profiles/90-patch-2.1.16/.mozilla/firefox/calculate.default/mimeTypes.rdf create mode 100644 client-profiles/90-patch-2.1.16/Desktop/calculate-community.desktop diff --git a/client-profiles/00-new_templates/.calculate/ini.env b/client-profiles/00-new_templates/.calculate/ini.env index e32d1f2..a49837b 100644 --- a/client-profiles/00-new_templates/.calculate/ini.env +++ b/client-profiles/00-new_templates/.calculate/ini.env @@ -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..8a18b22 100644 --- a/client-profiles/01-init/.calculate/ini.env +++ b/client-profiles/01-init/.calculate/ini.env @@ -8,6 +8,12 @@ update = off #if profile is empty #?exists(~/.kde4)==&exists(~/.gconf)==&exists(~/.config)==# update = on +patch = on #exists# system = #-os_linux_shortname-# ver = #-os_linux_ver-# + +#?exists(~/.kde4)==&exists(~/.gconf)==&exists(~/.config)==# +[ver] +patch = 2.1.16 +#exists# 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.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/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/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/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/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/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/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 100% 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 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/%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/%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/%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/%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/%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/%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/general/%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/general/%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/general/allscreens/%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/general/allscreens/%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/%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/%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/animation/%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/animation/%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/animation/screen0/%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/animation/screen0/%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/decoration/%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/decoration/%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/decoration/allscreens/%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/decoration/allscreens/%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/move/%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/move/%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/move/allscreens/%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/move/allscreens/%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/place/%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/place/%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/place/screen0/%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/place/screen0/%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/scale/%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/scale/%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/scale/allscreens/%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/scale/allscreens/%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/snap/%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/snap/%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/snap/screen0/%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/snap/screen0/%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/staticswitcher/%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/staticswitcher/%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/staticswitcher/screen0/%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/staticswitcher/screen0/%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/vpswitch/%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/vpswitch/%gconf.xml rename to client-profiles/80-compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/%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/vpswitch/allscreens/%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/vpswitch/allscreens/%gconf.xml 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/90-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 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/wall/%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/wall/allscreens/%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/wall/allscreens/%gconf.xml 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 100% 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 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 100% rename from client-profiles/90-pidgin-2.6/.purple/accounts.xml rename to client-profiles/80-pidgin-2.6/.purple/accounts.xml 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/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..93cbc37 --- /dev/null +++ b/client-profiles/90-patch-2.1.16/.kde4/share/config/konversationrc @@ -0,0 +1,9 @@ +# Calculate 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..7eccf76 --- /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)!= +[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.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..5424f41 --- /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 +[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# + From 4ea71e4feb237d7f5b91b42defd2806878823a96 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Thu, 15 Apr 2010 15:56:00 +0400 Subject: [PATCH 02/26] Fix patch template --- .../90-patch-2.1.16/.config/xfce4/.calculate_directory | 2 ++ .../90-patch-2.1.16/.kde4/share/config/konversationrc | 2 +- .../.local/share/applications/calculate-community.desktop | 2 +- .../90-patch-2.1.16/.mozilla/firefox/.calculate_directory | 2 ++ .../90-patch-2.1.16/Desktop/calculate-community.desktop | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 client-profiles/90-patch-2.1.16/.config/xfce4/.calculate_directory create mode 100644 client-profiles/90-patch-2.1.16/.mozilla/firefox/.calculate_directory 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/.kde4/share/config/konversationrc b/client-profiles/90-patch-2.1.16/.kde4/share/config/konversationrc index 93cbc37..324e5c9 100644 --- a/client-profiles/90-patch-2.1.16/.kde4/share/config/konversationrc +++ b/client-profiles/90-patch-2.1.16/.kde4/share/config/konversationrc @@ -1,4 +1,4 @@ -# Calculate pkg(net-irc/konversation)!= +# Calculate format=kde pkg(net-irc/konversation)!= [Channel 0] #?os_locale_language!=ru# 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 index 7eccf76..89303e8 100644 --- 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 @@ -1,4 +1,4 @@ -# Calculate format=kde pkg(gnome-base/libgnome)!= +# Calculate format=kde pkg(gnome-base/libgnome)>=2.26 [Desktop Entry] #изменим строку запуска #?os_locale_language!=ru# 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/Desktop/calculate-community.desktop b/client-profiles/90-patch-2.1.16/Desktop/calculate-community.desktop index 5424f41..2ca2f30 100644 --- a/client-profiles/90-patch-2.1.16/Desktop/calculate-community.desktop +++ b/client-profiles/90-patch-2.1.16/Desktop/calculate-community.desktop @@ -1,4 +1,4 @@ -# Calculate format=kde os_root_type==livecd +# 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" From 48e7229c49ac084a4033aa4a40aa366c9b478729 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Fri, 16 Apr 2010 11:53:10 +0400 Subject: [PATCH 03/26] Fix ini.env --- client-profiles/01-init/.calculate/ini.env | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/client-profiles/01-init/.calculate/ini.env b/client-profiles/01-init/.calculate/ini.env index 8a18b22..3587458 100644 --- a/client-profiles/01-init/.calculate/ini.env +++ b/client-profiles/01-init/.calculate/ini.env @@ -8,7 +8,6 @@ update = off #if profile is empty #?exists(~/.kde4)==&exists(~/.gconf)==&exists(~/.config)==# update = on -patch = on #exists# system = #-os_linux_shortname-# ver = #-os_linux_ver-# @@ -17,3 +16,8 @@ ver = #-os_linux_ver-# [ver] patch = 2.1.16 #exists# + +[update] +#?exists(~/.kde4)==&exists(~/.gconf)==&exists(~/.config)==# +patch = on +#exists# From 5da207043b91f96631d9fc04af73d84931dfab77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Fri, 16 Apr 2010 12:23:35 +0400 Subject: [PATCH 04/26] Increase version --- pym/cl_client.py | 2 +- pym/cl_vars_client.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/cl_client.py b/pym/cl_client.py index 9025322..8ef0d56 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.16" tr = cl_base.lang() tr.setLanguage(sys.modules[__name__]) diff --git a/pym/cl_vars_client.py b/pym/cl_vars_client.py index 6bf060c..6b4860c 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.16'} # Режим работы клиента клиент # (local или имя хоста клиента) diff --git a/setup.py b/setup.py index ec63cef..508989f 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.16", description = "Client for the calculate-server", author = "Mir Calculate Ltd.", author_email = "support@calculate.ru", From 36efa0f14d34b539448114ec14c141360ce08fe8 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Tue, 20 Apr 2010 13:48:14 +0400 Subject: [PATCH 05/26] Add personal user keyboard settings to gnome user profile --- .../gnome/peripherals/keyboard/kbd/%gconf.xml | 23 +++++++++++++++++++ .../peripherals/keyboard/kbd/%gconf.xml.br | 12 ++++++++++ .../peripherals/keyboard/kbd/%gconf.xml.de | 12 ++++++++++ .../peripherals/keyboard/kbd/%gconf.xml.es | 12 ++++++++++ .../peripherals/keyboard/kbd/%gconf.xml.fr | 12 ++++++++++ .../peripherals/keyboard/kbd/%gconf.xml.it | 12 ++++++++++ .../peripherals/keyboard/kbd/%gconf.xml.pl | 12 ++++++++++ .../peripherals/keyboard/kbd/%gconf.xml.ru | 12 ++++++++++ .../peripherals/keyboard/kbd/%gconf.xml.uk | 12 ++++++++++ .../peripherals/keyboard/kbd/%gconf.xml.us | 9 ++++++++ .../90-patch-2.1.17/.calculate/ini.env | 7 ++++++ .../90-patch-2.1.17/.calculate_directory | 1 + .../.gconf/.calculate_directory | 2 ++ .../gnome/peripherals/keyboard/kbd/%gconf.xml | 23 +++++++++++++++++++ .../peripherals/keyboard/kbd/%gconf.xml.br | 12 ++++++++++ .../peripherals/keyboard/kbd/%gconf.xml.de | 12 ++++++++++ .../peripherals/keyboard/kbd/%gconf.xml.es | 12 ++++++++++ .../peripherals/keyboard/kbd/%gconf.xml.fr | 12 ++++++++++ .../peripherals/keyboard/kbd/%gconf.xml.it | 12 ++++++++++ .../peripherals/keyboard/kbd/%gconf.xml.pl | 12 ++++++++++ .../peripherals/keyboard/kbd/%gconf.xml.ru | 12 ++++++++++ .../peripherals/keyboard/kbd/%gconf.xml.uk | 12 ++++++++++ .../peripherals/keyboard/kbd/%gconf.xml.us | 9 ++++++++ 23 files changed, 266 insertions(+) create mode 100644 client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml create mode 100644 client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br create mode 100644 client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de create mode 100644 client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es create mode 100644 client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr create mode 100644 client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it create mode 100644 client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl create mode 100644 client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru create mode 100644 client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk create mode 100644 client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us create mode 100644 client-profiles/90-patch-2.1.17/.calculate/ini.env create mode 100644 client-profiles/90-patch-2.1.17/.calculate_directory create mode 100644 client-profiles/90-patch-2.1.17/.gconf/.calculate_directory create mode 100644 client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml create mode 100644 client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br create mode 100644 client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de create mode 100644 client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es create mode 100644 client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr create mode 100644 client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it create mode 100644 client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl create mode 100644 client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru create mode 100644 client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk create mode 100644 client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us 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..c9210f5 --- /dev/null +++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml @@ -0,0 +1,23 @@ +# Calculate format=xml_gconf + + + +
  • + grp grp:caps_toggle +
    • +
  • + terminate terminate:ctrl_alt_bksp +
    • +
  • + grp_led grp_led:scroll +
    • +     + +
  • + us +
    • +
  • + ru +
    • +     +     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..cd54758 --- /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_xkb==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..fb008e5 --- /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_xkb==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..711dda2 --- /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_xkb==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..5d236ee --- /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_xkb==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..c441fff --- /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_xkb==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..4c9caea --- /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_xkb==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..1269f02 --- /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_xkb==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..8b5c3ba --- /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_xkb==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..1bed1d1 --- /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_xkb==en_US + + + +
  • + us +
    • +     +     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/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..c9210f5 --- /dev/null +++ b/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml @@ -0,0 +1,23 @@ +# Calculate format=xml_gconf + + + +
  • + grp grp:caps_toggle +
    • +
  • + terminate terminate:ctrl_alt_bksp +
    • +
  • + grp_led grp_led:scroll +
    • +     + +
  • + us +
    • +
  • + ru +
    • +     +     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..cd54758 --- /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_xkb==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..fb008e5 --- /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_xkb==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..711dda2 --- /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_xkb==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..5d236ee --- /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_xkb==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..c441fff --- /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_xkb==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..4c9caea --- /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_xkb==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..1269f02 --- /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_xkb==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..8b5c3ba --- /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_xkb==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..1bed1d1 --- /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_xkb==en_US + + + +
  • + us +
    • +     +     From 8fe10ace414c89a609fe74532efabd22e7fdd0b2 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Tue, 20 Apr 2010 13:53:44 +0400 Subject: [PATCH 06/26] Fix gnome keyboard settings --- .../desktop/gnome/peripherals/keyboard/kbd/%gconf.xml | 10 +--------- .../desktop/gnome/peripherals/keyboard/kbd/%gconf.xml | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) 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 index c9210f5..39e38a2 100644 --- 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 @@ -1,4 +1,4 @@ -# Calculate format=xml_gconf +# Calculate format=xml_gconf append=join @@ -12,12 +12,4 @@ grp_led grp_led:scroll - -
  • - us -
    • -
  • - ru -
    • -     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 index c9210f5..39e38a2 100644 --- 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 @@ -1,4 +1,4 @@ -# Calculate format=xml_gconf +# Calculate format=xml_gconf append=join @@ -12,12 +12,4 @@ grp_led grp_led:scroll - -
  • - us -
    • -
  • - ru -
    • -     From 4808fd2d4b38b8426acc0148bda63baae68465c1 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Tue, 20 Apr 2010 15:15:07 +0400 Subject: [PATCH 07/26] Fix gnome template --- .../.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml | 0 .../.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br | 2 +- .../.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de | 2 +- .../.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es | 2 +- .../.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr | 2 +- .../.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it | 2 +- .../.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl | 2 +- .../.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru | 2 +- .../.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk | 2 +- .../.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us | 2 +- .../.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml | 0 .../.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br | 2 +- .../.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de | 2 +- .../.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es | 2 +- .../.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr | 2 +- .../.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it | 2 +- .../.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl | 2 +- .../.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru | 2 +- .../.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk | 2 +- .../.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us | 2 +- 20 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml create mode 100644 client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml new file mode 100644 index 0000000..e69de29 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 index cd54758..4199009 100644 --- 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 @@ -1,4 +1,4 @@ -# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_xkb==pt_BR +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==pt_BR 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 index fb008e5..79d7b74 100644 --- 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 @@ -1,4 +1,4 @@ -# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_xkb==de_DE +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==de_DE 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 index 711dda2..08cdcde 100644 --- 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 @@ -1,4 +1,4 @@ -# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_xkb==es_ES +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==es_ES 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 index 5d236ee..8df3122 100644 --- 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 @@ -1,4 +1,4 @@ -# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_xkb==fr_FR +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==fr_FR 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 index c441fff..32f2dd9 100644 --- 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 @@ -1,4 +1,4 @@ -# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_xkb==it_IT +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==it_IT 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 index 4c9caea..ade4a69 100644 --- 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 @@ -1,4 +1,4 @@ -# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_xkb==pl_PL +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==pl_PL 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 index 1269f02..74604b1 100644 --- 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 @@ -1,4 +1,4 @@ -# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_xkb==ru_RU +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==ru_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 index 8b5c3ba..f38ce17 100644 --- 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 @@ -1,4 +1,4 @@ -# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_xkb==uk_UA +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==uk_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 index 1bed1d1..4e2233b 100644 --- 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 @@ -1,4 +1,4 @@ -# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_xkb==en_US +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==en_US 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.br b/client-profiles/90-patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br index cd54758..4199009 100644 --- 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 @@ -1,4 +1,4 @@ -# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_xkb==pt_BR +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==pt_BR 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 index fb008e5..79d7b74 100644 --- 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 @@ -1,4 +1,4 @@ -# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_xkb==de_DE +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==de_DE 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 index 711dda2..08cdcde 100644 --- 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 @@ -1,4 +1,4 @@ -# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_xkb==es_ES +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==es_ES 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 index 5d236ee..8df3122 100644 --- 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 @@ -1,4 +1,4 @@ -# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_xkb==fr_FR +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==fr_FR 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 index c441fff..32f2dd9 100644 --- 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 @@ -1,4 +1,4 @@ -# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_xkb==it_IT +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==it_IT 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 index 4c9caea..ade4a69 100644 --- 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 @@ -1,4 +1,4 @@ -# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_xkb==pl_PL +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==pl_PL 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 index 1269f02..74604b1 100644 --- 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 @@ -1,4 +1,4 @@ -# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_xkb==ru_RU +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==ru_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 index 8b5c3ba..f38ce17 100644 --- 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 @@ -1,4 +1,4 @@ -# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_xkb==uk_UA +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==uk_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 index 1bed1d1..4e2233b 100644 --- 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 @@ -1,4 +1,4 @@ -# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_xkb==en_US +# Calculate name=%gconf.xml format=xml_gconf append=join os_locale_lang==en_US From 2afde8e1713328a9f5a567ad649d3659dcb03e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Tue, 20 Apr 2010 15:30:42 +0400 Subject: [PATCH 08/26] Increase version --- pym/cl_client.py | 2 +- pym/cl_vars_client.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/cl_client.py b/pym/cl_client.py index 8ef0d56..b00c874 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.16" +Version = "calculate-client 2.1.17" tr = cl_base.lang() tr.setLanguage(sys.modules[__name__]) diff --git a/pym/cl_vars_client.py b/pym/cl_vars_client.py index 6b4860c..7c3cd97 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.16'} + cl_ver = {'value':'2.1.17'} # Режим работы клиента клиент # (local или имя хоста клиента) diff --git a/setup.py b/setup.py index 508989f..6fed49f 100755 --- a/setup.py +++ b/setup.py @@ -102,7 +102,7 @@ class cl_install_data(install_data): setup( name = 'calculate-client', - version = "2.1.16", + version = "2.1.17", description = "Client for the calculate-server", author = "Mir Calculate Ltd.", author_email = "support@calculate.ru", From c32a1f5c565928436e7fd96d73696701856db888 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Mon, 26 Apr 2010 09:28:36 +0400 Subject: [PATCH 09/26] Exclude path from sync: .cache, .opera/cache --- pym/cl_client.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pym/cl_client.py b/pym/cl_client.py index b00c874..f1cdea1 100644 --- a/pym/cl_client.py +++ b/pym/cl_client.py @@ -2867,6 +2867,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,6 +2878,8 @@ or ld_bind_dn or ld_bind_pw") --filter="P /.Xauthority" \ --filter="P /.thumbnails" \ --filter="P /.mozilla/firefox/*/Cache" \ +--filter="P /.cache" \ +--filter="P /.opera/cache" \ --filter="P /FTP" -a -x -v -v -v -v %s/ %s/' %(homeProfile,userHome) elif sync == "logout": if os.path.exists(userHome) and os.listdir(userHome) and\ @@ -2891,6 +2895,8 @@ or ld_bind_dn or ld_bind_pw") --exclude="/.kde4/socket-*" --exclude="/.kde4/share/config/phonondevicesrc" \ --exclude="/.thumbnails" \ --exclude="/.mozilla/firefox/*/Cache" \ +--exclude="/.cache" \ +--exclude="/.opera/cache" \ -a -x -v -v -v -v %s/ %s/'%(userHome,homeProfile) else: self.printERROR(_("Method syncUser: option sync=%s incorrect")\ From a6eda0e9782b68168b353cfe629e62eb619ae0db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D1=80=D0=B0=D1=86=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?= =?UTF-8?q?=D0=B9=20=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80?= Date: Mon, 26 Apr 2010 16:14:16 +0400 Subject: [PATCH 10/26] Russian-language site has changed. --- .../20-kde-4.3/.kde4/share/apps/konqueror/profiles/webbrowsing | 2 +- client-profiles/20-kde-4.3/.kde4/share/config/konquerorrc | 2 +- .../20-kde-4.4/.kde4/share/apps/konqueror/profiles/webbrowsing | 2 +- client-profiles/20-kde-4.4/.kde4/share/config/konquerorrc | 2 +- .../80-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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/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.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/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/80-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js b/client-profiles/80-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js index 50f6aff..7af7017 100644 --- a/client-profiles/80-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js +++ b/client-profiles/80-firefox-3.5/.mozilla/firefox/calculate.default/prefs.js @@ -7,7 +7,7 @@ user_pref("browser.shell.checkDefaultBrowser", false); #домашняя страница user_pref("browser.startup.homepage", "http://www.calculate-linux.org"); #?os_locale_language==ru# -user_pref("browser.startup.homepage", "http://www.calculate-linux.org/ru"); +user_pref("browser.startup.homepage", "http://www.calculate-linux.ru"); #os_locale_language# #версия последнего браузера, открывшего текущий профиль (нужно чтобы не отправлял на сайт firefox) user_pref("browser.startup.homepage_override.mstone", "rv:1.9.2"); From bbe4a118f1e0f5f253fd2113396cb79972bd080f Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Thu, 29 Apr 2010 10:03:00 +0400 Subject: [PATCH 11/26] Fix syntax error. Add signature to evolution. --- .../30-evolution-2.6/.evolution/signatures/default | 1 + .../.gconf/apps/evolution/mail/%gconf.xml | 7 +++++++ .../autostart/fusion-icon-autostart.desktop | 2 +- .../top_panel_screen0/background/%gconf.xml | 14 +++++++------- .../.gconf/desktop/gnome/background/%gconf.xml | 4 ++-- .../.gconf/desktop/gnome/session/%gconf.xml | 2 +- .../autostart/fusion-icon-autostart.desktop | 2 +- .../autostart/fusion-icon-autostart.desktop | 2 +- pym/cl_client.py | 2 +- pym/cl_vars_client.py | 2 +- setup.py | 2 +- 11 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 client-profiles/30-evolution-2.6/.evolution/signatures/default diff --git a/client-profiles/30-evolution-2.6/.evolution/signatures/default b/client-profiles/30-evolution-2.6/.evolution/signatures/default new file mode 100644 index 0000000..0bf0d57 --- /dev/null +++ b/client-profiles/30-evolution-2.6/.evolution/signatures/default @@ -0,0 +1 @@ +#-ur_signature-# 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..a89cd21 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,6 +4,13 @@ #-pop(mtime)-# #-pop(pid)-# #-pop(serial)-# + +
  • + <?xml version="1.0"?> +<signature name="Default" uid="1272518216.11676.0@mhiretskiy" 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-# 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/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/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/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/80-compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop b/client-profiles/80-compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop index 343b95f..a8a9b99 100644 --- a/client-profiles/80-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/80-compiz-always/.config/autostart/fusion-icon-autostart.desktop b/client-profiles/80-compiz-always/.config/autostart/fusion-icon-autostart.desktop index 343b95f..a8a9b99 100644 --- a/client-profiles/80-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/pym/cl_client.py b/pym/cl_client.py index f1cdea1..ef97e83 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.17" +Version = "calculate-client 2.1.18" tr = cl_base.lang() tr.setLanguage(sys.modules[__name__]) diff --git a/pym/cl_vars_client.py b/pym/cl_vars_client.py index 7c3cd97..beb5cb4 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.17'} + cl_ver = {'value':'2.1.18'} # Режим работы клиента клиент # (local или имя хоста клиента) diff --git a/setup.py b/setup.py index 6fed49f..d1e2cb7 100755 --- a/setup.py +++ b/setup.py @@ -102,7 +102,7 @@ class cl_install_data(install_data): setup( name = 'calculate-client', - version = "2.1.17", + version = "2.1.18", description = "Client for the calculate-server", author = "Mir Calculate Ltd.", author_email = "support@calculate.ru", From fc5a45bcd9d63f12eabd59db87769c8de3c38e5b Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Thu, 29 Apr 2010 11:51:07 +0400 Subject: [PATCH 12/26] Fix evolution signature --- .../30-evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 a89cd21..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 @@ -7,7 +7,7 @@
  • <?xml version="1.0"?> -<signature name="Default" uid="1272518216.11676.0@mhiretskiy" auto="false" format="text/plain"><filename>/home/#-ur_login-#/.evolution/signatures/default</filename></signature> +<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>
    • @@ -17,7 +17,7 @@
  • <?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>
    • From 23139053f8b5a8ad060e3cabfc6edef3f758e524 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Thu, 29 Apr 2010 11:59:17 +0400 Subject: [PATCH 13/26] Clear signature for evolution --- client-profiles/30-evolution-2.6/.evolution/signatures/default | 1 - 1 file changed, 1 deletion(-) diff --git a/client-profiles/30-evolution-2.6/.evolution/signatures/default b/client-profiles/30-evolution-2.6/.evolution/signatures/default index 0bf0d57..e69de29 100644 --- a/client-profiles/30-evolution-2.6/.evolution/signatures/default +++ b/client-profiles/30-evolution-2.6/.evolution/signatures/default @@ -1 +0,0 @@ -#-ur_signature-# From 63697756a2d26ded21b1f8e2147fe62aee50dc04 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Thu, 29 Apr 2010 12:11:45 +0400 Subject: [PATCH 14/26] Fix ft proxies --- client-profiles/80-pidgin-2.6/.purple/accounts.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/client-profiles/80-pidgin-2.6/.purple/accounts.xml b/client-profiles/80-pidgin-2.6/.purple/accounts.xml index fcaa12c..ada833f 100644 --- a/client-profiles/80-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 From 102a55487e80b6f55c58e05f92a4de28ae8dfa61 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Thu, 29 Apr 2010 13:28:20 +0400 Subject: [PATCH 15/26] Fix purple settings --- client-profiles/80-pidgin-2.6/.purple/accounts.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-profiles/80-pidgin-2.6/.purple/accounts.xml b/client-profiles/80-pidgin-2.6/.purple/accounts.xml index ada833f..f71d0c8 100644 --- a/client-profiles/80-pidgin-2.6/.purple/accounts.xml +++ b/client-profiles/80-pidgin-2.6/.purple/accounts.xml @@ -12,7 +12,7 @@ #-sr_jabber_host-# 1 1 - + #-sr_jabber_port-# 1 From f142737659ef6d883a40bd9735f384d849fd48da Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Tue, 4 May 2010 11:19:20 +0400 Subject: [PATCH 16/26] Fix templates IssueID #153 --- .../20-kde-always/.kde4/share/config/plasma-desktop-appletsrc | 2 +- client-profiles/30-gnome-always/.calculate_directory | 2 +- client-profiles/40-xfce-always/.calculate_directory | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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/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-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-# From 36d4299f2368fc4f3cd56f32c444e86d89aaf12f Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Thu, 13 May 2010 14:50:58 +0400 Subject: [PATCH 17/26] Add settings for chromium --- .../.kde4/share/config/kdeglobals | 8 +- .../share/config/plasma-desktop-appletsrc | 7 +- .../.local/share/applications/mimeapps.list | 20 +-- .../20-kde-4.3-4.4/Desktop/README.desktop | 4 +- .../20-kde-4.3/.kde4/share/config/kdeglobals | 7 +- .../share/config/plasma-desktop-appletsrc | 7 +- .../.local/share/applications/mimeapps.list | 20 +-- .../20-kde-4.4/.kde4/share/config/kdeglobals | 7 +- .../share/config/plasma-desktop-appletsrc | 7 +- .../.local/share/applications/mimeapps.list | 20 +-- .../20-kde-4.4/Desktop/README.desktop | 4 +- .../300_webbrowser/%gconf.xml | 5 + .../gnome/applications/browser/%gconf.xml | 5 + .../gnome/url-handlers/about/%gconf.xml | 5 + .../gnome/url-handlers/chrome/%gconf.xml | 5 + .../desktop/gnome/url-handlers/ftp/%gconf.xml | 5 + .../gnome/url-handlers/http/%gconf.xml | 5 + .../gnome/url-handlers/https/%gconf.xml | 5 + .../gnome/url-handlers/unknown/%gconf.xml | 5 + .../README.desktop?os_root_type==livecd | 4 +- .../30-gnome-2.6/Desktop/README.desktop | 4 +- .../.config/xfce4/panel/launcher-30.rc | 10 ++ .../.local/share/applications/defaults.list | 20 +-- .../40-xfce-4.6/.config/xfce4/helpers.rc | 5 + .../.config/xfce4/panel/launcher-30.rc | 10 ++ .../.local/share/applications/defaults.list | 20 +-- .../README.desktop?os_root_type==livecd | 4 +- .../80-chromium-5.0/.calculate/ini.env | 7 + .../80-chromium-5.0/.calculate_directory | 1 + .../1.0/Cached Theme.pak | Bin 0 -> 86440 bytes .../i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA | Bin 0 -> 234 bytes .../i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA | Bin 0 -> 574 bytes .../i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA | Bin 0 -> 106 bytes .../i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA | Bin 0 -> 854 bytes .../1.0/manifest.json | 32 ++++ .../.config/chromium/Default/Preferences | 161 ++++++++++++++++++ .../.config/chromium/First Run | 0 .../90-patch-2.1.19/.calculate/ini.env | 7 + .../90-patch-2.1.19/.calculate_directory | 1 + .../.config/xfce4/.calculate_directory | 1 + .../90-patch-2.1.19/.config/xfce4/helpers.rc | 8 + .../.config/xfce4/panel/launcher-30.rc | 15 ++ .../.gconf/.calculate_directory | 1 + .../panel/objects/300_webbrowser/%gconf.xml | 12 ++ .../gnome/applications/browser/%gconf.xml | 12 ++ .../gnome/peripherals/keyboard/%gconf.xml | 0 .../gnome/peripherals/keyboard/kbd/%gconf.xml | 15 ++ .../peripherals/keyboard/kbd/%gconf.xml.br | 12 ++ .../peripherals/keyboard/kbd/%gconf.xml.de | 12 ++ .../peripherals/keyboard/kbd/%gconf.xml.es | 12 ++ .../peripherals/keyboard/kbd/%gconf.xml.fr | 12 ++ .../peripherals/keyboard/kbd/%gconf.xml.it | 12 ++ .../peripherals/keyboard/kbd/%gconf.xml.pl | 12 ++ .../peripherals/keyboard/kbd/%gconf.xml.ru | 12 ++ .../peripherals/keyboard/kbd/%gconf.xml.uk | 12 ++ .../peripherals/keyboard/kbd/%gconf.xml.us | 9 + .../gnome/url-handlers/about/%gconf.xml | 12 ++ .../gnome/url-handlers/chrome/%gconf.xml | 14 ++ .../desktop/gnome/url-handlers/ftp/%gconf.xml | 12 ++ .../gnome/url-handlers/http/%gconf.xml | 12 ++ .../gnome/url-handlers/https/%gconf.xml | 12 ++ .../gnome/url-handlers/unknown/%gconf.xml | 12 ++ .../.gnome2/.calculate_directory | 1 + .../README.desktop?os_root_type==livecd | 9 + .../.kde4/.calculate_directory | 2 + .../.kde4/.kde4/share/config/kdeglobals | 14 ++ .../share/config/plasma-desktop-appletsrc | 36 ++++ .../.kde4/Desktop/README.desktop | 19 +++ .../.local/share/applications/defaults.list | 13 ++ .../.local/share/applications/mimeapps.list | 12 ++ .../90-patch-2.1.19/Desktop/README.desktop | 9 + 71 files changed, 723 insertions(+), 72 deletions(-) create mode 100644 client-profiles/80-chromium-5.0/.calculate/ini.env create mode 100644 client-profiles/80-chromium-5.0/.calculate_directory create mode 100644 client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/Cached Theme.pak create mode 100644 client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA create mode 100644 client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA create mode 100644 client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA create mode 100644 client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA create mode 100644 client-profiles/80-chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/manifest.json create mode 100644 client-profiles/80-chromium-5.0/.config/chromium/Default/Preferences create mode 100644 client-profiles/80-chromium-5.0/.config/chromium/First Run create mode 100644 client-profiles/90-patch-2.1.19/.calculate/ini.env create mode 100644 client-profiles/90-patch-2.1.19/.calculate_directory create mode 100644 client-profiles/90-patch-2.1.19/.config/xfce4/.calculate_directory create mode 100644 client-profiles/90-patch-2.1.19/.config/xfce4/helpers.rc create mode 100644 client-profiles/90-patch-2.1.19/.config/xfce4/panel/launcher-30.rc create mode 100644 client-profiles/90-patch-2.1.19/.gconf/.calculate_directory create mode 100644 client-profiles/90-patch-2.1.19/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml create mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/applications/browser/%gconf.xml create mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml create mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml create mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br create mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de create mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es create mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr create mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it create mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl create mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru create mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk create mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us create mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/about/%gconf.xml create mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml create mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml create mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/http/%gconf.xml create mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/https/%gconf.xml create mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml create mode 100644 client-profiles/90-patch-2.1.19/.gnome2/.calculate_directory create mode 100644 client-profiles/90-patch-2.1.19/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd create mode 100644 client-profiles/90-patch-2.1.19/.kde4/.calculate_directory create mode 100644 client-profiles/90-patch-2.1.19/.kde4/.kde4/share/config/kdeglobals create mode 100644 client-profiles/90-patch-2.1.19/.kde4/.kde4/share/config/plasma-desktop-appletsrc create mode 100644 client-profiles/90-patch-2.1.19/.kde4/Desktop/README.desktop create mode 100644 client-profiles/90-patch-2.1.19/.local/share/applications/defaults.list create mode 100644 client-profiles/90-patch-2.1.19/.local/share/applications/mimeapps.list create mode 100644 client-profiles/90-patch-2.1.19/Desktop/README.desktop 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/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/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/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/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/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/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/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/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/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/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..5741a48 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,17 @@ [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/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 +38,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/.local/share/applications/defaults.list b/client-profiles/40-xfce-4.6/.local/share/applications/defaults.list index 0a2f0ba..5741a48 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,17 @@ [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/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 +38,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/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 0000000000000000000000000000000000000000..179d05fdaa9f116a1bddb434d86cb88fde5f494a GIT binary patch literal 86440 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c0e1abc489757b5ba5cda86b6ce90b4e74e7ad3f GIT binary patch literal 574 zcmeAS@N?(olHy`uVBq!ia0vp^F+hBYgAGU?4_*F&fq{wD)5S5QV$Rze7kgVAcvu}B zp3L8vx@pDF1=>x)uQRXRu{Ex4t@QiPSRY)l=0U{4jZMj{$GQ4MWwb5AAOhvv|Hpdj zBKQae*OuE}JA|oWpUFlsWCLItUSF2Weu!klYn>xeFiSvcthh1t{rYeauBHyf+;A=w zyRSudY=yY@Ucs7HR6mqkK$TVzopr02P|`h5!Hn literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..74e359aa8081193f4868153f6b6df5902c0474bc GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzLr)jSkcif|=L{Jc40sN2So3El s+YzqC{XPe(a_jkKpSA?5K>`kwblO~47~Y4RYygRRy85}Sb4q9e04)xvLG`FVdQ&MBb@ E07CbFlK=n! literal 0 HcmV?d00001 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/80-chromium-5.0/.config/chromium/First Run b/client-profiles/80-chromium-5.0/.config/chromium/First Run new file mode 100644 index 0000000..e69de29 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/peripherals/keyboard/%gconf.xml b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml new file mode 100644 index 0000000..e69de29 diff --git a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml new file mode 100644 index 0000000..39e38a2 --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.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.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br b/client-profiles/90-patch-2.1.19/.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.19/.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.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de b/client-profiles/90-patch-2.1.19/.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.19/.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.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es b/client-profiles/90-patch-2.1.19/.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.19/.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.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr b/client-profiles/90-patch-2.1.19/.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.19/.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.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it b/client-profiles/90-patch-2.1.19/.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.19/.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.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl b/client-profiles/90-patch-2.1.19/.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.19/.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.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru b/client-profiles/90-patch-2.1.19/.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.19/.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.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk b/client-profiles/90-patch-2.1.19/.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.19/.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.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us b/client-profiles/90-patch-2.1.19/.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.19/.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/.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/.kde4/share/config/kdeglobals b/client-profiles/90-patch-2.1.19/.kde4/.kde4/share/config/kdeglobals new file mode 100644 index 0000000..4d40d3b --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.kde4/.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/.kde4/share/config/plasma-desktop-appletsrc b/client-profiles/90-patch-2.1.19/.kde4/.kde4/share/config/plasma-desktop-appletsrc new file mode 100644 index 0000000..146897f --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.kde4/.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/.kde4/Desktop/README.desktop b/client-profiles/90-patch-2.1.19/.kde4/Desktop/README.desktop new file mode 100644 index 0000000..9f0c37b --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.kde4/Desktop/README.desktop @@ -0,0 +1,19 @@ +# Calculate os_root_type==livecd chmod=0755 +#!/usr/bin/env xdg-open + +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Type=Application +Name=Readme +Comment= +Categories=Application; +#?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# +Icon=text-html +Terminal=false +StartupNotify=false 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..a8da424 --- /dev/null +++ b/client-profiles/90-patch-2.1.19/.local/share/applications/defaults.list @@ -0,0 +1,13 @@ +# Calculate format=compiz +[Default Applications] +application/rss+xml=chromium-chromium.desktop;mozilla-firefox.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# From 75312f0e460dd4824c730079f66d7fa32f1eeef3 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Thu, 13 May 2010 14:52:28 +0400 Subject: [PATCH 18/26] Fix 01-init template --- client-profiles/01-init/.calculate/ini.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-profiles/01-init/.calculate/ini.env b/client-profiles/01-init/.calculate/ini.env index 3587458..b98d3c8 100644 --- a/client-profiles/01-init/.calculate/ini.env +++ b/client-profiles/01-init/.calculate/ini.env @@ -14,7 +14,7 @@ ver = #-os_linux_ver-# #?exists(~/.kde4)==&exists(~/.gconf)==&exists(~/.config)==# [ver] -patch = 2.1.16 +patch = 2.1.19 #exists# [update] From be310dd3a108a25e82cb84d4e9f6ee4d7ecb6cb0 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Thu, 13 May 2010 15:15:37 +0400 Subject: [PATCH 19/26] rm gconf from patch --- .../gnome/peripherals/keyboard/%gconf.xml | 0 .../gnome/peripherals/keyboard/kbd/%gconf.xml | 15 --------------- .../peripherals/keyboard/kbd/%gconf.xml.br | 12 ------------ .../peripherals/keyboard/kbd/%gconf.xml.de | 12 ------------ .../peripherals/keyboard/kbd/%gconf.xml.es | 12 ------------ .../peripherals/keyboard/kbd/%gconf.xml.fr | 12 ------------ .../peripherals/keyboard/kbd/%gconf.xml.it | 12 ------------ .../peripherals/keyboard/kbd/%gconf.xml.pl | 12 ------------ .../peripherals/keyboard/kbd/%gconf.xml.ru | 12 ------------ .../peripherals/keyboard/kbd/%gconf.xml.uk | 12 ------------ .../peripherals/keyboard/kbd/%gconf.xml.us | 9 --------- .../.kde4/Desktop/README.desktop | 19 ------------------- 12 files changed, 139 deletions(-) delete mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml delete mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml delete mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br delete mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de delete mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es delete mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr delete mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it delete mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl delete mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru delete mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk delete mode 100644 client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us delete mode 100644 client-profiles/90-patch-2.1.19/.kde4/Desktop/README.desktop diff --git a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml deleted file mode 100644 index e69de29..0000000 diff --git a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml deleted file mode 100644 index 39e38a2..0000000 --- a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml +++ /dev/null @@ -1,15 +0,0 @@ -# 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.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br deleted file mode 100644 index 4199009..0000000 --- a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br +++ /dev/null @@ -1,12 +0,0 @@ -# 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.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de deleted file mode 100644 index 79d7b74..0000000 --- a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de +++ /dev/null @@ -1,12 +0,0 @@ -# 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.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es deleted file mode 100644 index 08cdcde..0000000 --- a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es +++ /dev/null @@ -1,12 +0,0 @@ -# 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.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr deleted file mode 100644 index 8df3122..0000000 --- a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr +++ /dev/null @@ -1,12 +0,0 @@ -# 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.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it deleted file mode 100644 index 32f2dd9..0000000 --- a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it +++ /dev/null @@ -1,12 +0,0 @@ -# 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.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl deleted file mode 100644 index ade4a69..0000000 --- a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl +++ /dev/null @@ -1,12 +0,0 @@ -# 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.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru deleted file mode 100644 index 74604b1..0000000 --- a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru +++ /dev/null @@ -1,12 +0,0 @@ -# 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.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk deleted file mode 100644 index f38ce17..0000000 --- a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk +++ /dev/null @@ -1,12 +0,0 @@ -# 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.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us b/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us deleted file mode 100644 index 4e2233b..0000000 --- a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us +++ /dev/null @@ -1,9 +0,0 @@ -# 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/.kde4/Desktop/README.desktop b/client-profiles/90-patch-2.1.19/.kde4/Desktop/README.desktop deleted file mode 100644 index 9f0c37b..0000000 --- a/client-profiles/90-patch-2.1.19/.kde4/Desktop/README.desktop +++ /dev/null @@ -1,19 +0,0 @@ -# Calculate os_root_type==livecd chmod=0755 -#!/usr/bin/env xdg-open - -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Type=Application -Name=Readme -Comment= -Categories=Application; -#?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# -Icon=text-html -Terminal=false -StartupNotify=false From 00d438f84691029834967f17711474878068f7d6 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Thu, 13 May 2010 15:18:39 +0400 Subject: [PATCH 20/26] Fix kde patch 2.1.19 --- .../90-patch-2.1.19/.kde4/{.kde4 => }/share/config/kdeglobals | 0 .../.kde4/{.kde4 => }/share/config/plasma-desktop-appletsrc | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename client-profiles/90-patch-2.1.19/.kde4/{.kde4 => }/share/config/kdeglobals (100%) rename client-profiles/90-patch-2.1.19/.kde4/{.kde4 => }/share/config/plasma-desktop-appletsrc (100%) diff --git a/client-profiles/90-patch-2.1.19/.kde4/.kde4/share/config/kdeglobals b/client-profiles/90-patch-2.1.19/.kde4/share/config/kdeglobals similarity index 100% rename from client-profiles/90-patch-2.1.19/.kde4/.kde4/share/config/kdeglobals rename to client-profiles/90-patch-2.1.19/.kde4/share/config/kdeglobals diff --git a/client-profiles/90-patch-2.1.19/.kde4/.kde4/share/config/plasma-desktop-appletsrc b/client-profiles/90-patch-2.1.19/.kde4/share/config/plasma-desktop-appletsrc similarity index 100% rename from client-profiles/90-patch-2.1.19/.kde4/.kde4/share/config/plasma-desktop-appletsrc rename to client-profiles/90-patch-2.1.19/.kde4/share/config/plasma-desktop-appletsrc From 2cae654c6b6d4bdf8236cea6e32aaff62db51915 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Thu, 13 May 2010 15:25:00 +0400 Subject: [PATCH 21/26] Fix plasma-desktop-appletsrc for patch 2.1.19 --- .../90-patch-2.1.19/.kde4/share/config/plasma-desktop-appletsrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 146897f..0933353 100644 --- 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 @@ -9,7 +9,7 @@ #-sum(height,,bs+sp)-# #-sum(width,,height*15)-# -[Containments][-#-sum(cont,cont+1)-#] +[Containments][#-sum(cont,cont+1)-#] desktop=-1 formfactor=2 geometry=0,0,#-sum(width,width)-#,#-sum(height,height)-# From 114a41337ada89ddb3adfd4c83f047e8bf1bed2e Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Thu, 13 May 2010 15:26:07 +0400 Subject: [PATCH 22/26] Increase version --- pym/cl_client.py | 2 +- pym/cl_vars_client.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/cl_client.py b/pym/cl_client.py index ef97e83..44d4ab3 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.18" +Version = "calculate-client 2.1.19" tr = cl_base.lang() tr.setLanguage(sys.modules[__name__]) diff --git a/pym/cl_vars_client.py b/pym/cl_vars_client.py index beb5cb4..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.18'} + cl_ver = {'value':'2.1.19'} # Режим работы клиента клиент # (local или имя хоста клиента) diff --git a/setup.py b/setup.py index d1e2cb7..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.18", + version = "2.1.19", description = "Client for the calculate-server", author = "Mir Calculate Ltd.", author_email = "support@calculate.ru", From b229d9c726ee675615f9e72a1ec0051bbe88ef0c Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Wed, 19 May 2010 15:27:13 +0400 Subject: [PATCH 23/26] Fix execution rsync for progress bar. --- pym/cl_client.py | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pym/cl_client.py b/pym/cl_client.py index 44d4ab3..7bdc345 100644 --- a/pym/cl_client.py +++ b/pym/cl_client.py @@ -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: @@ -2880,7 +2872,7 @@ or ld_bind_dn or ld_bind_pw") --filter="P /.mozilla/firefox/*/Cache" \ --filter="P /.cache" \ --filter="P /.opera/cache" \ ---filter="P /FTP" -a -x -v -v -v -v %s/ %s/' %(homeProfile,userHome) +--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): @@ -2897,7 +2889,7 @@ or ld_bind_dn or ld_bind_pw") --exclude="/.mozilla/firefox/*/Cache" \ --exclude="/.cache" \ --exclude="/.opera/cache" \ --a -x -v -v -v -v %s/ %s/'%(userHome,homeProfile) +-a -x -v -v -v %s/ %s/'%(userHome,homeProfile) else: self.printERROR(_("Method syncUser: option sync=%s incorrect")\ %str(sync)) @@ -2927,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() From bd39217098854f6e66680e5a193f26cd0ea4cc76 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Wed, 19 May 2010 16:08:12 +0400 Subject: [PATCH 24/26] Fix kmax calculating --- pym/cl_client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pym/cl_client.py b/pym/cl_client.py index 7bdc345..a2987ac 100644 --- a/pym/cl_client.py +++ b/pym/cl_client.py @@ -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): '''Установить описания прогресса''' From ca5fec1058eac7bbf49d2f92270055687dd539a4 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Tue, 25 May 2010 16:08:26 +0400 Subject: [PATCH 25/26] Fix application/rtf default application --- .../40-cldx-10.2-10.4/.local/share/applications/defaults.list | 1 + .../40-xfce-4.6/.local/share/applications/defaults.list | 1 + .../90-patch-2.1.19/.local/share/applications/defaults.list | 1 + 3 files changed, 3 insertions(+) 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 5741a48..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 @@ -3,6 +3,7 @@ application/illustrator=gimp.desktop application/pdf=evince.desktop;gimp.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 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 5741a48..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 @@ -3,6 +3,7 @@ application/illustrator=gimp.desktop application/pdf=evince.desktop;gimp.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 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 index a8da424..de73771 100644 --- 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 @@ -1,6 +1,7 @@ # 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 From 6027078ea92b9fd452df4b0a75d11d93c5bc6e48 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Fri, 28 May 2010 09:28:14 +0400 Subject: [PATCH 26/26] Fix using function of load for new_template --- client-profiles/00-new_templates/.calculate/ini.env | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client-profiles/00-new_templates/.calculate/ini.env b/client-profiles/00-new_templates/.calculate/ini.env index a49837b..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