From 5a4f40b66afbea0fd52a3c7d2bba55537a3a8e23 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, 29 Mar 2010 17:09:58 +0400 Subject: [PATCH 1/2] Add xchat profile. --- .../00-new_templates/.calculate/ini.env | 8 ++- .../40-xfce-4.6/.xchat2/xchat.conf | 50 ------------------- .../.FBReader/ui.xml | 0 .../.calculate/ini.env | 2 +- .../.calculate_directory | 2 +- .../90-xchat-2.8/.calculate/ini.env | 7 +++ .../90-xchat-2.8/.calculate_directory | 1 + .../.xchat2/xchat.conf | 0 .../90-xchat-always/.calculate_directory | 1 + .../90-xchat-always/.xchat2/xchat.conf | 2 + 10 files changed, 19 insertions(+), 54 deletions(-) delete mode 100644 client-profiles/40-xfce-4.6/.xchat2/xchat.conf rename client-profiles/{90-fbreader-0.12 => 90-fbreader-0.1}/.FBReader/ui.xml (100%) rename client-profiles/{90-fbreader-0.12 => 90-fbreader-0.1}/.calculate/ini.env (77%) rename client-profiles/{90-fbreader-0.12 => 90-fbreader-0.1}/.calculate_directory (58%) create mode 100644 client-profiles/90-xchat-2.8/.calculate/ini.env create mode 100644 client-profiles/90-xchat-2.8/.calculate_directory rename client-profiles/{30-gnome-2.6 => 90-xchat-2.8}/.xchat2/xchat.conf (100%) create mode 100644 client-profiles/90-xchat-always/.calculate_directory create mode 100644 client-profiles/90-xchat-always/.xchat2/xchat.conf diff --git a/client-profiles/00-new_templates/.calculate/ini.env b/client-profiles/00-new_templates/.calculate/ini.env index 8275691..ee04ffb 100644 --- a/client-profiles/00-new_templates/.calculate/ini.env +++ b/client-profiles/00-new_templates/.calculate/ini.env @@ -4,29 +4,33 @@ #?load(ver,~/.zzz-calculate.kde)!=# kde = #-load(ver,~/.zzz-calculate.kde)-# kmail = #-load(ver,~/.zzz-calculate.kde)-# +konversation = 1.2 #load# #?load(ver,~/.zzz-calculate.xfce)!=# xfce = #-load(ver,~/.zzz-calculate.xfce)-# pidgin = 2.6 +xchat = 2.8 #load# vim = 7.2 mc = 4.7 firefox = 3.5 -konversation = 1.2 +fbreader = 0.1 [update] #?load(ver,~/.zzz-calculate.kde)!=# kde = on kmail = on +konversation = on #load# #?load(ver,~/.zzz-calculate.xfce)!=# xfce = on pidgin = on +xchat = on #load# vim = on mc = on firefox = on -konversation = on +fbreader = on [main] update = on diff --git a/client-profiles/40-xfce-4.6/.xchat2/xchat.conf b/client-profiles/40-xfce-4.6/.xchat2/xchat.conf deleted file mode 100644 index 084dd8c..0000000 --- a/client-profiles/40-xfce-4.6/.xchat2/xchat.conf +++ /dev/null @@ -1,50 +0,0 @@ -# Calculate format=procmail -#не задавать вопрос при выходе -gui_quit_dialog = 0 -#отображать иконку в трее -gui_tray = 1 -#при закрытии оставаться в трее -gui_tray_flags = 1 -#не показывать список сетей при запуске -gui_slist_skip = 1 -#не показывать диалог выбора канала -gui_join_dialog=0 -#оπовещать о сообщении с канала -input_tray_chans = 1 -#директория для принимаемых файлов -dcc_dir = /home/#-ur_login-# -irc_nick1 = #-case(capitalize,ur_login)-#-#-os_locale_language-# -irc_nick2 = #-case(capitalize,ur_login)-##-rnd(num,2)-#-#-os_locale_language-# -irc_nick3 = #-case(capitalize,ur_login)-##-rnd(num,2)-#-#-os_locale_language-# -irc_real_name = #-os_linux_name-# #-os_linux_ver-# #-os_linux_subname-# -#?os_root_type==hdd&hr_virtual==# -irc_user_name = #-os_linux_shortname-# -#os_root_type# -#?os_root_type!=hdd&hr_virtual==# -irc_user_name = Live#-os_linux_shortname-# -#os_root_type# -#?os_root_type==hdd&hr_virtual!=# -irc_user_name = #-os_linux_shortname-#|#-hr_virtual-# -#os_root_type# -#?os_root_type!=hdd&hr_virtual!=# -irc_user_name = Live#-os_linux_shortname-#|#-hr_virtual-# -#os_root_type# -text_font = Droid Sans Mono 10 -irc_part_reason = Leaving -irc_quit_reason = Leaving -away_reason = I'm busy -#звуки -sound_command = play -sound_dir = /usr/share/sounds -#всплывающие окна для личных сообщний -input_balloon_priv = 1 -#подсветка для личных сообщений -input_flash_priv = 1 -#пульсирующий значек для личных сообщний -input_tray_priv = 1 -#подсветка для сообщений с упоминанием ника -input_flash_hilight = 1 -#пульсирующий значек для сообщений с упоминанием ника -input_tray_hilight = 1 -#отключить пульсирующий значек для общих сообщений на канале -input_tray_chans = 0 diff --git a/client-profiles/90-fbreader-0.12/.FBReader/ui.xml b/client-profiles/90-fbreader-0.1/.FBReader/ui.xml similarity index 100% rename from client-profiles/90-fbreader-0.12/.FBReader/ui.xml rename to client-profiles/90-fbreader-0.1/.FBReader/ui.xml diff --git a/client-profiles/90-fbreader-0.12/.calculate/ini.env b/client-profiles/90-fbreader-0.1/.calculate/ini.env similarity index 77% rename from client-profiles/90-fbreader-0.12/.calculate/ini.env rename to client-profiles/90-fbreader-0.1/.calculate/ini.env index 24bef66..1a191d6 100644 --- a/client-profiles/90-fbreader-0.12/.calculate/ini.env +++ b/client-profiles/90-fbreader-0.1/.calculate/ini.env @@ -1,7 +1,7 @@ # Calculate format=samba [ver] -fbreader = 0.12 +fbreader = 0.1 [update] fbreader = on diff --git a/client-profiles/90-fbreader-0.12/.calculate_directory b/client-profiles/90-fbreader-0.1/.calculate_directory similarity index 58% rename from client-profiles/90-fbreader-0.12/.calculate_directory rename to client-profiles/90-fbreader-0.1/.calculate_directory index 0ab37a2..38aa48c 100644 --- a/client-profiles/90-fbreader-0.12/.calculate_directory +++ b/client-profiles/90-fbreader-0.1/.calculate_directory @@ -1 +1 @@ -# Calculate ini(main.update)!=off&ini(update.fbreader)!=off&ini(ver.fbreader)==&pkg(app-text/fbreader)>=0.12 +# Calculate ini(main.update)!=off&ini(update.fbreader)!=off&ini(ver.fbreader)==&pkg(app-text/fbreader)>=0.1 diff --git a/client-profiles/90-xchat-2.8/.calculate/ini.env b/client-profiles/90-xchat-2.8/.calculate/ini.env new file mode 100644 index 0000000..16cdcdd --- /dev/null +++ b/client-profiles/90-xchat-2.8/.calculate/ini.env @@ -0,0 +1,7 @@ +# Calculate format=samba + +[ver] +xchat = 2.8 + +[update] +xchat = on diff --git a/client-profiles/90-xchat-2.8/.calculate_directory b/client-profiles/90-xchat-2.8/.calculate_directory new file mode 100644 index 0000000..23de2dd --- /dev/null +++ b/client-profiles/90-xchat-2.8/.calculate_directory @@ -0,0 +1 @@ +# Calculate ini(main.update)!=off&ini(update.xchat)!=off&ini(ver.xchat)==&pkg(net-irc/xchat)>=2.8 diff --git a/client-profiles/30-gnome-2.6/.xchat2/xchat.conf b/client-profiles/90-xchat-2.8/.xchat2/xchat.conf similarity index 100% rename from client-profiles/30-gnome-2.6/.xchat2/xchat.conf rename to client-profiles/90-xchat-2.8/.xchat2/xchat.conf diff --git a/client-profiles/90-xchat-always/.calculate_directory b/client-profiles/90-xchat-always/.calculate_directory new file mode 100644 index 0000000..3febb2a --- /dev/null +++ b/client-profiles/90-xchat-always/.calculate_directory @@ -0,0 +1 @@ +# Calculate ini(main.update)!=off&ini(update.xchat)!=off&pkg(net-irc/xchat)>0&ini(newsystem)==on diff --git a/client-profiles/90-xchat-always/.xchat2/xchat.conf b/client-profiles/90-xchat-always/.xchat2/xchat.conf new file mode 100644 index 0000000..ecd3b48 --- /dev/null +++ b/client-profiles/90-xchat-always/.xchat2/xchat.conf @@ -0,0 +1,2 @@ +# Calculate format=procmail +irc_real_name = #-os_linux_name-# #-os_linux_ver-# #-os_linux_subname-# From 1fa0891128cb6d74b4ebb5c07dfb6d6945ca3db8 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, 29 Mar 2010 17:15:36 +0400 Subject: [PATCH 2/2] Add stardict template. --- .../00-new_templates/.calculate/ini.env | 2 ++ .../20-kde-always/.calculate_directory | 2 +- .../40-xfce-4.6/.stardict/stardict.cfg | 16 ---------------- .../90-konversation-always/.calculate_directory | 2 +- .../90-stardict-3.0/.calculate/ini.env | 7 +++++++ .../90-stardict-3.0/.calculate_directory | 1 + .../.stardict/stardict.cfg | 0 .../90-xchat-always/.calculate_directory | 2 +- 8 files changed, 13 insertions(+), 19 deletions(-) delete mode 100644 client-profiles/40-xfce-4.6/.stardict/stardict.cfg create mode 100644 client-profiles/90-stardict-3.0/.calculate/ini.env create mode 100644 client-profiles/90-stardict-3.0/.calculate_directory rename client-profiles/{30-gnome-2.6 => 90-stardict-3.0}/.stardict/stardict.cfg (100%) diff --git a/client-profiles/00-new_templates/.calculate/ini.env b/client-profiles/00-new_templates/.calculate/ini.env index ee04ffb..94f0a7f 100644 --- a/client-profiles/00-new_templates/.calculate/ini.env +++ b/client-profiles/00-new_templates/.calculate/ini.env @@ -10,6 +10,7 @@ konversation = 1.2 xfce = #-load(ver,~/.zzz-calculate.xfce)-# pidgin = 2.6 xchat = 2.8 +stardict = 3.0 #load# vim = 7.2 mc = 4.7 @@ -26,6 +27,7 @@ konversation = on xfce = on pidgin = on xchat = on +stardict = on #load# vim = on mc = on diff --git a/client-profiles/20-kde-always/.calculate_directory b/client-profiles/20-kde-always/.calculate_directory index d476574..d8cfc5d 100644 --- a/client-profiles/20-kde-always/.calculate_directory +++ b/client-profiles/20-kde-always/.calculate_directory @@ -1 +1 @@ -# Calculate ini(main.update)!=off&ini(update.kde)!=off&pkg(kde-base/kdelibs)>0 +# Calculate ini(main.update)!=off&ini(update.kde)!=off&pkg(kde-base/kdelibs)>4.3 diff --git a/client-profiles/40-xfce-4.6/.stardict/stardict.cfg b/client-profiles/40-xfce-4.6/.stardict/stardict.cfg deleted file mode 100644 index 0934bc0..0000000 --- a/client-profiles/40-xfce-4.6/.stardict/stardict.cfg +++ /dev/null @@ -1,16 +0,0 @@ -[/apps/stardict/preferences/dictionary] -#сканировать, только если модификатор нажат -only_scan_while_modifier_key=true - -[/apps/stardict/preferences/network] -#включить сетевые словари -enable_netdict=false - -[/apps/stardict/manage_dictionaries] -#отключим пустой китайский словарь -dict_config_xml= - -[/apps/stardict/preferences/main_window] -#прятать главное окно при старте -hide_on_startup=true - diff --git a/client-profiles/90-konversation-always/.calculate_directory b/client-profiles/90-konversation-always/.calculate_directory index f784f7e..18f284e 100644 --- a/client-profiles/90-konversation-always/.calculate_directory +++ b/client-profiles/90-konversation-always/.calculate_directory @@ -1 +1 @@ -# Calculate ini(main.update)!=off&ini(update.konversation)!=off&pkg(net-irc/konversation)>0&ini(newsystem)==on +# Calculate ini(main.update)!=off&ini(update.konversation)!=off&pkg(net-irc/konversation)>1.2&ini(newsystem)==on diff --git a/client-profiles/90-stardict-3.0/.calculate/ini.env b/client-profiles/90-stardict-3.0/.calculate/ini.env new file mode 100644 index 0000000..bf4cfbd --- /dev/null +++ b/client-profiles/90-stardict-3.0/.calculate/ini.env @@ -0,0 +1,7 @@ +# Calculate format=samba + +[ver] +stardict = 3.0 + +[update] +stardict = on diff --git a/client-profiles/90-stardict-3.0/.calculate_directory b/client-profiles/90-stardict-3.0/.calculate_directory new file mode 100644 index 0000000..7d58ec1 --- /dev/null +++ b/client-profiles/90-stardict-3.0/.calculate_directory @@ -0,0 +1 @@ +# Calculate ini(main.update)!=off&ini(update.stardict)!=off&ini(ver.stardict)==&pkg(app-editors/stardict)>=3.0 diff --git a/client-profiles/30-gnome-2.6/.stardict/stardict.cfg b/client-profiles/90-stardict-3.0/.stardict/stardict.cfg similarity index 100% rename from client-profiles/30-gnome-2.6/.stardict/stardict.cfg rename to client-profiles/90-stardict-3.0/.stardict/stardict.cfg diff --git a/client-profiles/90-xchat-always/.calculate_directory b/client-profiles/90-xchat-always/.calculate_directory index 3febb2a..702ae44 100644 --- a/client-profiles/90-xchat-always/.calculate_directory +++ b/client-profiles/90-xchat-always/.calculate_directory @@ -1 +1 @@ -# Calculate ini(main.update)!=off&ini(update.xchat)!=off&pkg(net-irc/xchat)>0&ini(newsystem)==on +# Calculate ini(main.update)!=off&ini(update.xchat)!=off&pkg(net-irc/xchat)>2.8&ini(newsystem)==on