calculate
/
calculate-utils-3-desktop
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git.calculate.ru:calculate-desktop

Browse Source
master3.3
Mike Hiretsky 14 years ago
parent 34ec558456 ee1297779c
commit 856c7c5285
17 changed files with 48 additions and 38 deletions
Show Stats Download Patch File Download Diff File

24
desktop/user/20-kde/kde-4.3-4.4/.kde4/share/config/plasma-desktop-appletsrc
Unescape View File

@ -55,16 +55,16 @@ plugin=simplelauncher
zvalue=0 zvalue=0
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration] [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
icon=kde icon=kde
#?cl_remote_host==# #?env(client.os_remote_auth)==#
views=Applications,RunCommand,Leave views=Applications,RunCommand,Leave
#cl_remote_host# #env#
#?cl_remote_host!=# #?env(client.os_remote_auth)!=#
views=Applications,RunCommand,SwitchUser,LockScreen,Logout views=Applications,RunCommand,SwitchUser,LockScreen,Logout
#cl_remote_host# #env#
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
Order=#-sum(apporder,apporder)-# Order=#-sum(apporder,apporder)-#
#?cl_remote_host==# #?env(client.os_remote_auth)==#
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
immutability=1 immutability=1
!geometry=del !geometry=del
@ -74,9 +74,9 @@ zvalue=0
Url=file:///home/#-ur_login-# Url=file:///home/#-ur_login-#
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
Order=#-sum(apporder,apporder+1)-# Order=#-sum(apporder,apporder+1)-#
#cl_remote_host# #env#
#?cl_remote_host!=# #?env(client.os_remote_auth)!=#
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
immutability=1 immutability=1
!geometry=del !geometry=del
@ -96,9 +96,9 @@ zvalue=0
Url=file:///home/#-ur_login-#/Disks Url=file:///home/#-ur_login-#/Disks
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
Order=#-sum(apporder,apporder+1)-# Order=#-sum(apporder,apporder+1)-#
#cl_remote_host# #env#
#?cl_remote_host!=&&cl_remote_ftp!=# #?env(client.os_remote_auth)!=&&server(ftp.host)!=#
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
immutability=1 immutability=1
!geometry=del !geometry=del
@ -108,10 +108,10 @@ zvalue=0
Url=file:///home/#-ur_login-#/FTP Url=file:///home/#-ur_login-#/FTP
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation] [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
Order=#-sum(apporder,apporder+1)-# Order=#-sum(apporder,apporder+1)-#
#cl_remote_host# #env#
#?cl_remote_ftp==# #?server(ftp.host)==#
[Containments][#-sum(cont,cont)-#][Applets][!#-sum(app,app+1)-#] [Containments][#-sum(cont,cont)-#][Applets][!#-sum(app,app+1)-#]
#cl_remote_ftp# #env#
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#] [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
immutability=1 immutability=1

2
desktop/user/20-kde/kde-4.3-4.4/Desktop/FTP.desktop
Unescape View File

@ -1,4 +1,4 @@
# Calculate format=samba env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)!= # Calculate format=samba env(client.os_remote_auth)!=&&server(ftp.host)!=
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
Name=FTP Name=FTP

2
desktop/user/20-kde/kde-4.3/.config/autostart/kopete.desktop
Unescape View File

@ -1,2 +1,2 @@
# Calculate format=kde link=/usr/share/applications/kde4/kopete.desktop mirror env(client.os_remote_auth)!=&&env(client.sr_jabber_host)!= # Calculate format=kde link=/usr/share/applications/kde4/kopete.desktop mirror env(client.os_remote_auth)!=&&server(jabber.host)!=
#добавим Kopete в автозагрузку если настроен локальный Jabber сервер #добавим Kopete в автозагрузку если настроен локальный Jabber сервер

4
desktop/user/20-kde/kde-4.3/.kde4/share/config/emaildefaults
Unescape View File

@ -6,5 +6,5 @@ Profile=Default
[PROFILE_Default] [PROFILE_Default]
EmailAddress=#-ur_mail-# EmailAddress=#-ur_mail-#
FullName=#-ur_fullname-# FullName=#-ur_fullname-#
Organization=#-env(client.ur_organization)-# Organization=#-server(mail.organization)-#
OutgoingServer=#-env(client.sr_mail_host)-# OutgoingServer=#-server(mail.host)-#

6
desktop/user/20-kde/kde-4.3/.kde4/share/config/emailidentities
Unescape View File

@ -7,14 +7,14 @@ Default Identity=1
#?os_locale_language==ru# #?os_locale_language==ru#
Dictionary=Русский Dictionary=Русский
#os_locale_language# #os_locale_language#
#?env(client.os_remote_auth)!=&&env(client.sr_mail_type)==imap# #?env(client.os_remote_auth)!=&&server(mail.type)==imap#
Drafts=.1.directory/Drafts Drafts=.1.directory/Drafts
Fcc=.1.directory/Sent Fcc=.1.directory/Sent
#env# #env#
Email Address=#-ur_mail-# Email Address=#-ur_mail-#
Identity=Default Identity=Default
Inline Signature=#-env(client.ur_signature)-# Inline Signature=#-server(mail.signature)-#
Name=#-ur_fullname-# Name=#-ur_fullname-#
Organization=#-env(client.ur_organization)-# Organization=#-server(mail.organization)-#
Signature Type=inline Signature Type=inline
uoid=1 uoid=1

8
desktop/user/20-kde/kde-4.3/.kde4/share/config/kmailrc
Unescape View File

@ -1,6 +1,6 @@
# Calculate format=kde # Calculate format=kde
#создадим учетную запись #создадим учетную запись
#?env(client.os_remote_auth)!=&&env(client.sr_mail_type)==imap# #?env(client.os_remote_auth)!=&&server(mail.type)==imap#
[Account 1] [Account 1]
#автоматически очищать удаленные сообщения #автоматически очищать удаленные сообщения
auto-expunge=true auto-expunge=true
@ -12,11 +12,11 @@ Type=Imap
auth=* auth=*
#периодическая проверка почты #периодическая проверка почты
check-interval=5 check-interval=5
host=#-env(client.sr_mail_host)-# host=#-server(mail.host)-#
#загружать вложения по требованию #загружать вложения по требованию
loadondemand=true loadondemand=true
login=#-ur_login-# login=#-ur_login-#
port=#-env(client.sr_mail_port)-# port=#-server(mail.port)-#
trash=.1.directory/Trash trash=.1.directory/Trash
use-tls=true use-tls=true
@ -35,7 +35,7 @@ isOpen=true
SystemTrayEnabled=true SystemTrayEnabled=true
#режим отображения значка #режим отображения значка
SystemTrayPolicy=ShowAlways SystemTrayPolicy=ShowAlways
#?env(client.os_remote_auth)!=&&env(client.sr_mail_type)==imap# #?env(client.os_remote_auth)!=&&server(mail.type)==imap#
#количество учётных записей #количество учётных записей
accounts=1 accounts=1
#проверять почту при запуске #проверять почту при запуске

8
desktop/user/20-kde/kde-4.3/.kde4/share/config/kopeterc
Unescape View File

@ -1,13 +1,13 @@
# Calculate format=kde append=replace # Calculate format=kde append=replace
#?env(client.os_remote_auth)!=&&env(client.sr_jabber_host)!=# #?env(client.os_remote_auth)!=&&server(jabber.host)!=#
[Account_JabberProtocol_#-ur_jid-#] [Account_JabberProtocol_#-ur_jid-#]
AccountId=#-ur_jid-# AccountId=#-ur_jid-#
AllowPlainTextPassword=true AllowPlainTextPassword=true
CustomServer=true CustomServer=true
Port=#-env(client.sr_jabber_port)-# Port=#-server(jabber.port)-#
Protocol=JabberProtocol Protocol=JabberProtocol
RememberPassword=true RememberPassword=true
Server=#-env(client.sr_jabber_host)-# Server=#-server(jabber.host)-#
UseSSL=true UseSSL=true
#env# #env#
@ -72,7 +72,7 @@ Width 1680=500
Width 1920=500 Width 1920=500
[Notification Messages] [Notification Messages]
#?env(client.os_remote_auth)!=&&env(client.sr_jabber_host)!=# #?env(client.os_remote_auth)!=&&server(jabber.host)!=#
#выдавать предупреждение при проверке сертификата защищенного соединения #выдавать предупреждение при проверке сертификата защищенного соединения
KopeteTLSWarning#-ur_jid_host-#InvalidCertSelfSigned=false KopeteTLSWarning#-ur_jid_host-#InvalidCertSelfSigned=false
#env# #env#

4
desktop/user/20-kde/kde-4.3/.kde4/share/config/mailtransports
Unescape View File

@ -1,11 +1,11 @@
# Calculate format=kde # Calculate format=kde
#настройка отправки писем kmail #настройка отправки писем kmail
#?env(client.sr_mail_host)!=&&env(client.os_remote_auth)!=# #?env(client.os_remote_auth)!=&&server(mail.host)!=#
[General] [General]
default-transport=1 default-transport=1
[Transport 1] [Transport 1]
host=#-env(client.sr_mail_host)-# host=#-server(mail.host)-#
id=1 id=1
name=SMTP name=SMTP
#env# #env#

BIN
desktop/user/20-kde/kde-4.4/.kde4/share/apps/kwallet/kdewallet.kwl
View File

Binary file not shown.

2
desktop/user/20-kde/kde-4.4/.kde4/share/config/kopeterc
Unescape View File

@ -74,7 +74,7 @@ Width 1920=500
[Notification Messages] [Notification Messages]
#?env(client.os_remote_auth)!=&&server(jabber.host)!=# #?env(client.os_remote_auth)!=&&server(jabber.host)!=#
#выдавать предупреждение при проверке сертификата защищенного соединения #выдавать предупреждение при проверке сертификата защищенного соединения
KopeteTLSWarning#-replace('as@','',ur_jid)-#InvalidCertSelfSigned=false KopeteTLSWarning#-ur_jid_host-#InvalidCertSelfSigned=false
#env# #env#
#предупреждать что программа остается запущенной при закрытии главного окна #предупреждать что программа остается запущенной при закрытии главного окна
hideOnCloseInfo=false hideOnCloseInfo=false

2
desktop/user/20-kde/kde-4.4/Desktop/Home-remote.desktop
Unescape View File

@ -1,4 +1,4 @@
# Calculate name=Home.desktop format=samba env(client.os_remote_auth)!= append=replace # Calculate append=replace name=Home.desktop format=samba env(client.os_remote_auth)!=
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
Name=Home Name=Home

6
desktop/user/60-application/pidgin-2.6/.purple/accounts.xml
Unescape View File

@ -1,4 +1,4 @@
# Calculate env(client.os_remote_auth)!=&&env(client.sr_jabber_host)!= # Calculate env(client.os_remote_auth)!=&&server(jabber.host)!=
<?xml version='1.0' encoding='UTF-8' ?> <?xml version='1.0' encoding='UTF-8' ?>
<account version='1.0'> <account version='1.0'>
@ -9,11 +9,11 @@
<settings> <settings>
<setting name='require_tls' type='bool'>1</setting> <setting name='require_tls' type='bool'>1</setting>
<setting name='check-mail' type='bool'>0</setting> <setting name='check-mail' type='bool'>0</setting>
<setting name='connect_server' type='string'>#-env(client.sr_jabber_host)-#</setting> <setting name='connect_server' type='string'>#-server(jabber.host)-#</setting>
<setting name='old_ssl' type='bool'>1</setting> <setting name='old_ssl' type='bool'>1</setting>
<setting name='auth_plain_in_clear' type='bool'>1</setting> <setting name='auth_plain_in_clear' type='bool'>1</setting>
<setting name='ft_proxies' type='string'> </setting> <setting name='ft_proxies' type='string'> </setting>
<setting name='port' type='int'>#-env(client.sr_jabber_port)-#</setting> <setting name='port' type='int'>#-server(jabber.port)-#</setting>
<setting name='custom_smileys' type='bool'>1</setting> <setting name='custom_smileys' type='bool'>1</setting>
</settings> </settings>
<settings ui='gtk-gaim'> <settings ui='gtk-gaim'>

2
desktop/user/80-patches/patch-2.1.16/.calculate_directory
Unescape View File

@ -1 +1 @@
# Calculate append=skip ini(main.update)!=off&&ini(update.patch)!=off&&ini(ver.patch)<2.1.16 # Calculate append=skip ini(ver.patch)<2.1.16

2
desktop/user/80-patches/patch-2.1.17/.calculate_directory
Unescape View File

@ -1 +1 @@
# Calculate append=skip ini(main.update)!=off&&ini(update.patch)!=off&&ini(ver.patch)<2.1.17 # Calculate append=skip ini(ver.patch)<2.1.17

2
desktop/user/80-patches/patch-2.1.19/.calculate_directory
Unescape View File

@ -1 +1 @@
# Calculate append=skip ini(main.update)!=off&&ini(update.patch)!=off&&ini(ver.patch)<2.1.19 # Calculate append=skip ini(ver.patch)<2.1.19

7
pym/cl_fill_desktop.py
Unescape View File

@ -216,3 +216,10 @@ class fillVars(glob_attr):
else: else:
return "vesa" return "vesa"
def get_ur_jid_host(self):
"""Host Jabber пользователя"""
userJid = self.Get("ur_jid")
if userJid:
return userJid.partition('@')[2]
return ""

5
pym/cl_vars_desktop.py
Unescape View File

@ -50,7 +50,7 @@ class Data:
# Почтовый адрес пользователя # Почтовый адрес пользователя
ur_mail = {'mode':"r"} ur_mail = {'mode':"r"}
#Разрешение X по вертикали #Разрешение X по вертикали
hr_x11_height = {'mode':"w"} hr_x11_height = {'mode':"w"}
@ -72,4 +72,7 @@ class Data:
# Включен ли композитный режим видеокарты on/off # Включен ли композитный режим видеокарты on/off
hr_x11_composite = {} hr_x11_composite = {}
# Host Jabber пользователя
ur_jid_host = {'mode':"w"}

Write Preview
Loading…
Cancel
Save