From 15afdf07ec67466fe9a8930367005dbaa8724a86 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: Thu, 25 Mar 2010 17:44:11 +0300 Subject: [PATCH] add some vars in ini.svn, extract template for setup konversation --- .../00-new_templates/.calculate/ini.env | 4 ++ client-profiles/01-init/.calculate/ini.env | 3 +- .../02-system-always/.calculate/ini.env | 7 ++ .../02-system-always/.calculate_directory | 1 + .../applications/mozilla-firefox-3.6.desktop | 5 -- .../.kde4/share/config/konversation.notifyrc | 18 ----- .../.kde4/share/config/konversationrc | 72 ------------------- .../.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 .../90-konversation-1.2/.calculate_directory | 1 + .../.kde4/share/config/konversation.notifyrc | 0 .../.kde4/share/config/konversationrc | 1 - .../.calculate_directory | 1 + .../.kde4/share/config/konversationrc | 4 ++ .../.calculate/ini.env | 0 .../.calculate_directory | 0 .../.purple/accels | 0 .../.purple/accounts.xml | 0 .../.purple/prefs.xml | 0 .../99-system-always/.calculate/ini.env | 6 ++ 23 files changed, 26 insertions(+), 97 deletions(-) create mode 100644 client-profiles/02-system-always/.calculate/ini.env create mode 100644 client-profiles/02-system-always/.calculate_directory delete mode 100644 client-profiles/20-kde-4.3/.local/share/applications/mozilla-firefox-3.6.desktop delete mode 100644 client-profiles/20-kde-4.4/.kde4/share/config/konversation.notifyrc delete mode 100644 client-profiles/20-kde-4.4/.kde4/share/config/konversationrc rename client-profiles/{10-kde-always => 20-kde-always}/.calculate_directory (100%) rename client-profiles/{10-kde-always => 20-kde-always}/.local/share/applications/mozilla-firefox-3.5.desktop (100%) rename client-profiles/{10-kde-always => 20-kde-always}/.local/share/applications/mozilla-firefox-3.5.desktop.del (100%) rename client-profiles/{10-kde-always => 20-kde-always}/.local/share/applications/mozilla-firefox-3.6.desktop (100%) rename client-profiles/{10-kde-always => 20-kde-always}/.local/share/applications/mozilla-firefox-3.6.desktop.del (100%) create mode 100644 client-profiles/90-konversation-1.2/.calculate_directory rename client-profiles/{20-kde-4.3 => 90-konversation-1.2}/.kde4/share/config/konversation.notifyrc (100%) rename client-profiles/{20-kde-4.3 => 90-konversation-1.2}/.kde4/share/config/konversationrc (97%) create mode 100644 client-profiles/90-konversation-always/.calculate_directory create mode 100644 client-profiles/90-konversation-always/.kde4/share/config/konversationrc rename client-profiles/{80-pidgin-2.6 => 90-pidgin-2.6}/.calculate/ini.env (100%) rename client-profiles/{80-pidgin-2.6 => 90-pidgin-2.6}/.calculate_directory (100%) rename client-profiles/{80-pidgin-2.6 => 90-pidgin-2.6}/.purple/accels (100%) rename client-profiles/{80-pidgin-2.6 => 90-pidgin-2.6}/.purple/accounts.xml (100%) rename client-profiles/{80-pidgin-2.6 => 90-pidgin-2.6}/.purple/prefs.xml (100%) create mode 100644 client-profiles/99-system-always/.calculate/ini.env diff --git a/client-profiles/00-new_templates/.calculate/ini.env b/client-profiles/00-new_templates/.calculate/ini.env index eb2f787..8275691 100644 --- a/client-profiles/00-new_templates/.calculate/ini.env +++ b/client-profiles/00-new_templates/.calculate/ini.env @@ -12,6 +12,7 @@ pidgin = 2.6 vim = 7.2 mc = 4.7 firefox = 3.5 +konversation = 1.2 [update] #?load(ver,~/.zzz-calculate.kde)!=# @@ -25,6 +26,9 @@ pidgin = on vim = on mc = on firefox = on +konversation = on [main] update = on +system = #-os_linux_shortname-# +ver = #-os_linux_ver-# diff --git a/client-profiles/01-init/.calculate/ini.env b/client-profiles/01-init/.calculate/ini.env index b93a69a..e52f8cf 100644 --- a/client-profiles/01-init/.calculate/ini.env +++ b/client-profiles/01-init/.calculate/ini.env @@ -9,4 +9,5 @@ update = off #?exists(~/.kde4)==&exists(~/.gconf)==&exists(~/.config)==# update = on #exists# - +system = #-os_linux_shortname-# +ver = #-os_linux_ver-# diff --git a/client-profiles/02-system-always/.calculate/ini.env b/client-profiles/02-system-always/.calculate/ini.env new file mode 100644 index 0000000..1c442d9 --- /dev/null +++ b/client-profiles/02-system-always/.calculate/ini.env @@ -0,0 +1,7 @@ +# Calculate format=samba + +[main] +system = #-os_linux_shortname-# +ver = #-os_linux_ver-# +#Set up flag updated system +newsystem = on diff --git a/client-profiles/02-system-always/.calculate_directory b/client-profiles/02-system-always/.calculate_directory new file mode 100644 index 0000000..a296234 --- /dev/null +++ b/client-profiles/02-system-always/.calculate_directory @@ -0,0 +1 @@ +# Calculate ini(system)!=#-os_linux_shortname-#||ini(ver)!=#-os_linux_ver-# diff --git a/client-profiles/20-kde-4.3/.local/share/applications/mozilla-firefox-3.6.desktop b/client-profiles/20-kde-4.3/.local/share/applications/mozilla-firefox-3.6.desktop deleted file mode 100644 index aa31384..0000000 --- a/client-profiles/20-kde-4.3/.local/share/applications/mozilla-firefox-3.6.desktop +++ /dev/null @@ -1,5 +0,0 @@ -# Calculate format=kde link=/usr/share/applications/mozilla-firefox-3.6.desktop mirror -[Desktop Entry] -Name=Internet Browser -Icon=applications-internet -StartupNotify=false diff --git a/client-profiles/20-kde-4.4/.kde4/share/config/konversation.notifyrc b/client-profiles/20-kde-4.4/.kde4/share/config/konversation.notifyrc deleted file mode 100644 index e936e80..0000000 --- a/client-profiles/20-kde-4.4/.kde4/share/config/konversation.notifyrc +++ /dev/null @@ -1,18 +0,0 @@ -# Calculate format=kde -[Event/dcc_incoming] -Action=Sound|Popup|Taskbar -Sound=file:///usr/share/sounds/Kopete_Received.ogg - -[Event/message] -Action=Taskbar - -[Event/nick] -Action=Taskbar - -[Event/query] -Action=Sound|Popup|Taskbar -Sound=file:///usr/share/sounds/Kopete_Event.ogg - -[Event/queryMessage] -Action=Sound|Popup|Taskbar -Sound=file:///usr/share/sounds/Kopete_Event.ogg diff --git a/client-profiles/20-kde-4.4/.kde4/share/config/konversationrc b/client-profiles/20-kde-4.4/.kde4/share/config/konversationrc deleted file mode 100644 index 83a203e..0000000 --- a/client-profiles/20-kde-4.4/.kde4/share/config/konversationrc +++ /dev/null @@ -1,72 +0,0 @@ -# Calculate format=kde -[$Version] -update_info=konversation.upd:1.1-rememberline,konversation.upd:1.1-markerlines,konversation.upd:0.20-customfonts,konversation.upd:0.20-quickbuttons,konversation.upd:0.19-notifylists,konversation.upd:0.19-appearance,konversation.upd:0.19-browser,konversation.upd:0.19-flags,konversation.upd:0.19-highlightcolors,konversation.upd:0.19-osdcolors,konversation.upd:0.19-sortorder,konversation.upd:0.19-colors,konversation.upd:0.19-generaloptions,konversation.upd:0.19-cleanup-themes,konversation.upd:0.19-cleanup-notifylist,konversation.upd:0.19-cleanup-dcc,konversation.upd:0.19-cleanup-colors,konversation.upd:0.19-cleanup-hilightlist,konversation.upd:0.19-cleanup-notificationmessages,konversation.upd:0.19-cleanup-ledcolors,konversation.upd:0.19-cleanup-kmditaskbar,konversation.upd:0.19-channelsplitter - -[Channel 0] -Name=#calculate -Password= - -[Identity 0] -#?os_root_type==hdd&hr_virtual==# -Ident=#-os_linux_shortname-# -#os_root_type# -#?os_root_type!=hdd&hr_virtual==# -Ident=Live#-os_linux_shortname-# -#os_root_type# -#?os_root_type==hdd&hr_virtual!=# -Ident=#-os_linux_shortname-#|#-hr_virtual-# -#os_root_type# -#?os_root_type!=hdd&hr_virtual!=# -Ident=Live#-os_linux_shortname-#|#-hr_virtual-# -#os_root_type# -Name=Default Identity -Nicknames=#-case(capitalize,ur_login)-#-#-os_locale_language-#,#-case(capitalize,ur_login)-##-rnd(num,2)-#-#-os_locale_language-#,#-case(capitalize,ur_login)-##-rnd(num,2)-#-#-os_locale_language-# -Realname=#-os_linux_name-# #-os_linux_ver-# #-os_linux_subname-# - -[Flags] -# расположить закладки наверху -TabPlacement=Top -# автоматически показывать новые каналы -BringToFront=true -# средняя кнопка закрывает вкладку -MiddleClickClose=true - -[General Options] -# отображать иконку в трее -ShowTrayIcon=true -# оповещать о сообщении с канала -TrayNotify=true -# оповещать только о персональных сообщениях -TrayNotifyOnlyOwnNick=true - -[Path Settings] -# директория для принимаемых файлов -DccPath=file:///home/#-ur_login-# -# директория для логов -LogfilePath=file:///home/#-ur_login-#/.kde4/share/apps/konversation/logs - -[Server 0] -Port=8001 -SSLEnabled=false -Server=irc.freenode.net -Password= - -[Notification Messages] -# не задавать вопрос при сворачивании кнопкой закрыть -HideOnCloseInfo=false -# не задавать вопрос при выходе -systemtrayquitKonversation=false - -[ServerGroup 0] -AutoConnect=true -AutoJoinChannels=Channel 0 -EnableNotifications=true -Expanded=true -Identity=Default Identity -Name=Freenode -ServerList=Server 0 - -[Tab Notifications] -# цвет личных сообщний при оповещении -TabNotificationsPrivateColor=255,0,255 - diff --git a/client-profiles/10-kde-always/.calculate_directory b/client-profiles/20-kde-always/.calculate_directory similarity index 100% rename from client-profiles/10-kde-always/.calculate_directory rename to client-profiles/20-kde-always/.calculate_directory diff --git a/client-profiles/10-kde-always/.local/share/applications/mozilla-firefox-3.5.desktop b/client-profiles/20-kde-always/.local/share/applications/mozilla-firefox-3.5.desktop similarity index 100% rename from client-profiles/10-kde-always/.local/share/applications/mozilla-firefox-3.5.desktop rename to client-profiles/20-kde-always/.local/share/applications/mozilla-firefox-3.5.desktop diff --git a/client-profiles/10-kde-always/.local/share/applications/mozilla-firefox-3.5.desktop.del b/client-profiles/20-kde-always/.local/share/applications/mozilla-firefox-3.5.desktop.del similarity index 100% rename from client-profiles/10-kde-always/.local/share/applications/mozilla-firefox-3.5.desktop.del rename to client-profiles/20-kde-always/.local/share/applications/mozilla-firefox-3.5.desktop.del diff --git a/client-profiles/10-kde-always/.local/share/applications/mozilla-firefox-3.6.desktop b/client-profiles/20-kde-always/.local/share/applications/mozilla-firefox-3.6.desktop similarity index 100% rename from client-profiles/10-kde-always/.local/share/applications/mozilla-firefox-3.6.desktop rename to client-profiles/20-kde-always/.local/share/applications/mozilla-firefox-3.6.desktop diff --git a/client-profiles/10-kde-always/.local/share/applications/mozilla-firefox-3.6.desktop.del b/client-profiles/20-kde-always/.local/share/applications/mozilla-firefox-3.6.desktop.del similarity index 100% rename from client-profiles/10-kde-always/.local/share/applications/mozilla-firefox-3.6.desktop.del rename to client-profiles/20-kde-always/.local/share/applications/mozilla-firefox-3.6.desktop.del diff --git a/client-profiles/90-konversation-1.2/.calculate_directory b/client-profiles/90-konversation-1.2/.calculate_directory new file mode 100644 index 0000000..589e6e0 --- /dev/null +++ b/client-profiles/90-konversation-1.2/.calculate_directory @@ -0,0 +1 @@ +# Calculate ini(main.update)!=off&ini(update.konversation)!=off&ini(ver.konversation)==&pkg(net-irc/konversation)>=1.2 diff --git a/client-profiles/20-kde-4.3/.kde4/share/config/konversation.notifyrc b/client-profiles/90-konversation-1.2/.kde4/share/config/konversation.notifyrc similarity index 100% rename from client-profiles/20-kde-4.3/.kde4/share/config/konversation.notifyrc rename to client-profiles/90-konversation-1.2/.kde4/share/config/konversation.notifyrc diff --git a/client-profiles/20-kde-4.3/.kde4/share/config/konversationrc b/client-profiles/90-konversation-1.2/.kde4/share/config/konversationrc similarity index 97% rename from client-profiles/20-kde-4.3/.kde4/share/config/konversationrc rename to client-profiles/90-konversation-1.2/.kde4/share/config/konversationrc index 83a203e..1c1bab0 100644 --- a/client-profiles/20-kde-4.3/.kde4/share/config/konversationrc +++ b/client-profiles/90-konversation-1.2/.kde4/share/config/konversationrc @@ -21,7 +21,6 @@ Ident=Live#-os_linux_shortname-#|#-hr_virtual-# #os_root_type# Name=Default Identity Nicknames=#-case(capitalize,ur_login)-#-#-os_locale_language-#,#-case(capitalize,ur_login)-##-rnd(num,2)-#-#-os_locale_language-#,#-case(capitalize,ur_login)-##-rnd(num,2)-#-#-os_locale_language-# -Realname=#-os_linux_name-# #-os_linux_ver-# #-os_linux_subname-# [Flags] # расположить закладки наверху diff --git a/client-profiles/90-konversation-always/.calculate_directory b/client-profiles/90-konversation-always/.calculate_directory new file mode 100644 index 0000000..e9feda7 --- /dev/null +++ b/client-profiles/90-konversation-always/.calculate_directory @@ -0,0 +1 @@ +# Calculate ini(main.update)!=off&ini(update.konversation)!=off&pkg(net-irc/konversation)>0 diff --git a/client-profiles/90-konversation-always/.kde4/share/config/konversationrc b/client-profiles/90-konversation-always/.kde4/share/config/konversationrc new file mode 100644 index 0000000..5fb0441 --- /dev/null +++ b/client-profiles/90-konversation-always/.kde4/share/config/konversationrc @@ -0,0 +1,4 @@ +# Calculate format=kde + +[Identity 0] +Realname=#-os_linux_name-# #-os_linux_ver-# #-os_linux_subname-# diff --git a/client-profiles/80-pidgin-2.6/.calculate/ini.env b/client-profiles/90-pidgin-2.6/.calculate/ini.env similarity index 100% rename from client-profiles/80-pidgin-2.6/.calculate/ini.env rename to client-profiles/90-pidgin-2.6/.calculate/ini.env diff --git a/client-profiles/80-pidgin-2.6/.calculate_directory b/client-profiles/90-pidgin-2.6/.calculate_directory similarity index 100% rename from client-profiles/80-pidgin-2.6/.calculate_directory rename to client-profiles/90-pidgin-2.6/.calculate_directory diff --git a/client-profiles/80-pidgin-2.6/.purple/accels b/client-profiles/90-pidgin-2.6/.purple/accels similarity index 100% rename from client-profiles/80-pidgin-2.6/.purple/accels rename to client-profiles/90-pidgin-2.6/.purple/accels diff --git a/client-profiles/80-pidgin-2.6/.purple/accounts.xml b/client-profiles/90-pidgin-2.6/.purple/accounts.xml similarity index 100% rename from client-profiles/80-pidgin-2.6/.purple/accounts.xml rename to client-profiles/90-pidgin-2.6/.purple/accounts.xml diff --git a/client-profiles/80-pidgin-2.6/.purple/prefs.xml b/client-profiles/90-pidgin-2.6/.purple/prefs.xml similarity index 100% rename from client-profiles/80-pidgin-2.6/.purple/prefs.xml rename to client-profiles/90-pidgin-2.6/.purple/prefs.xml diff --git a/client-profiles/99-system-always/.calculate/ini.env b/client-profiles/99-system-always/.calculate/ini.env new file mode 100644 index 0000000..2629267 --- /dev/null +++ b/client-profiles/99-system-always/.calculate/ini.env @@ -0,0 +1,6 @@ +# Calculate format=samba +[main] +#?ini(newsystem)==on# +#Delete flag updating system +!newsystem = +#ini#