Merge branch 'master' of git.calculate.ru:calculate2/calculate-client

master
Самоукин Алексей 14 years ago
commit 499c3204a7

@ -3,7 +3,7 @@
<gconf>
<entry name="attached_toplevel_id" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>
#-pop(offsetx)-#
<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(offsetx,offsetx,offsetx+32)-#"/>
<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(offsetx,offsetx,offsetx+31)-#"/>
#-push(offsetx)-#
<entry name="use_menu_path" schema="/schemas/apps/panel/objects/use_menu_path"/>
<entry name="action_type" schema="/schemas/apps/panel/objects/action_type"/>

@ -3,7 +3,7 @@
<gconf>
<entry name="attached_toplevel_id" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>
#-pop(offsetx)-#
<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(offsetx,offsetx,offsetx+147)-#"/>
<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(offsetx,offsetx+1,offsetx+147)-#"/>
#-push(offsetx)-#
<entry name="use_menu_path" schema="/schemas/apps/panel/objects/use_menu_path"/>
<entry name="action_type" schema="/schemas/apps/panel/objects/action_type"/>

@ -8,17 +8,12 @@
<li type="string">
<stringvalue>101_home</stringvalue>
</li>
#?cl_remote_host!=#
<li type="string">
<stringvalue>102_disks</stringvalue>
</li>
#cl_remote_host#
#?cl_remote_host!=&cl_remote_ftp!=#
<li type="string">
<stringvalue>103_ftp</stringvalue>
</li>
#cl_remote_host#
#?cl_remote_host!=#
<li type="string">
<stringvalue>200_logout</stringvalue>

@ -0,0 +1 @@
# Calculate ini(main.update)!=off&ini(update.gnome)!=off&pkg(gnome-base/libgnome)>=2.26&ini(domain)!=cl_remote_host

@ -0,0 +1,24 @@
# Calculate format=xml_gconf cl_remote_host!=&cl_remote_ftp!=
<?xml version="1.0"?>
<gconf>
<entry name="attached_toplevel_id" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>
<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="64"/>
<entry name="use_menu_path" schema="/schemas/apps/panel/objects/use_menu_path"/>
<entry name="action_type" schema="/schemas/apps/panel/objects/action_type"/>
<entry name="toplevel_id" schema="/schemas/apps/panel/objects/toplevel_id" type="string">
<stringvalue>top_panel_screen0</stringvalue>
</entry>
<entry name="tooltip" schema="/schemas/apps/panel/objects/tooltip"/>
<entry name="use_custom_icon" schema="/schemas/apps/panel/objects/use_custom_icon"/>
<entry name="object_type" schema="/schemas/apps/panel/objects/object_type" type="string">
<stringvalue>launcher-object</stringvalue>
</entry>
<entry name="panel_right_stick" schema="/schemas/apps/panel/objects/panel_right_stick" type="bool" value="false"/>
<entry name="locked" schema="/schemas/apps/panel/objects/locked"/>
<entry name="custom_icon" schema="/schemas/apps/panel/objects/custom_icon"/>
<entry name="bonobo_iid" schema="/schemas/apps/panel/objects/bonobo_iid"/>
<entry name="launcher_location" schema="/schemas/apps/panel/objects/launcher_location" type="string">
<stringvalue>FTP.desktop</stringvalue>
</entry>
<entry name="menu_path" schema="/schemas/apps/panel/objects/menu_path"/>
</gconf>

@ -0,0 +1 @@
# Calculate append=remove name=%gconf.xml cl_remote_host!=&cl_remote_ftp==

@ -0,0 +1,10 @@
# Calculate format=samba cl_remote_host!=&cl_remote_ftp!=
[Desktop Entry]
Encoding=UTF-8
Version=1.0
Name=FTP
Comment=Browser FTP
Icon=update-manager
URL=file:///home/#-ur_login-#/FTP
Type=Link

@ -0,0 +1,2 @@
# Calculate append=remove name=FTP.desktop cl_remote_host!=&cl_remote_ftp==

@ -0,0 +1,3 @@
# Calculate os_root_type==livecd
<?xml version="1.0"?>
<directory><file name="calculate-community.desktop" icon_position="187,202" icon_scale="1" /><file name="gparted.desktop" icon_position="187,102" icon_scale="1" /><file name="README.desktop" icon_position="64,202" icon_scale="1" /><file name="calculate-install.desktop" icon_position="64,102" icon_scale="1" /></directory>

@ -0,0 +1,7 @@
<?xml version="1.0"?>
#?cl_remote_host==#
<directory><file name="home" timestamp="1267778829" icon_position="64,22" icon_scale="1" icon_position_timestamp="1267778829"/></directory>
#cl_remote_host#
#?cl_remote_host!=#
<directory><file name="Home.volume" icon_position="64,22" custom_icon="file:///usr/share/icons/gnome/scalable/places/user-home.svg"/><file name="FTP.volume" icon_position="220,22" custom_icon="file:///usr/share/icons/gnome/scalable/apps/update-manager.svg" icon_scale="1"/><file name="Disks.volume" icon_position="142,22" custom_icon="file:///usr/share/icons/gnome/scalable/places/folder-remote.svg" icon_scale="1"/></directory>
#cl_remote_host#

@ -0,0 +1,7 @@
# Calculate format=samba
[ver]
compiz = 0.8.4
[update]
compiz = on

@ -0,0 +1 @@
# Calculate ini(main.update)!=off&ini(update.compiz)!=off&ini(ver.compiz)==&pkg(x11-wm/compiz)>=0.8.4

@ -0,0 +1 @@
# Calculate format=kde link=/usr/share/applications/fusion-icon.desktop mirror pgk(fusion-icon)!=

@ -0,0 +1 @@
# Calculate append=remove name=fusion-icon-autostart pkg(x11-apps/fusion-icon)==

@ -0,0 +1,12 @@
# Calculate format=samba pkg(x11-apps/fusion-icon)!=
[compiz options]
indirect rendering = true
loose binding = false
[window manager]
#?hr_x11_composite==on#
active wm = compiz
#hr_x11_composite#
#?hr_x11_composite==off#
active wm = metacity
#hr_x11_composite#

@ -0,0 +1 @@
# Calculate ini(main.update)!=off&ini(update.compiz)!=off&pkg(x11-wm/compiz)>=0.8.4

@ -0,0 +1 @@
# Calculate format=kde link=/usr/share/applications/fusion-icon.desktop mirror pgk(fusion-icon)!=

@ -0,0 +1 @@
# Calculate append=remove name=fusion-icon-autostart pkg(x11-apps/fusion-icon)==

@ -0,0 +1,12 @@
# Calculate format=samba pkg(x11-apps/fusion-icon)!=
[compiz options]
indirect rendering = true
loose binding = false
[window manager]
#?hr_x11_composite==on#
active wm = compiz
#hr_x11_composite#
#?hr_x11_composite==off#
active wm = metacity
#hr_x11_composite#
Loading…
Cancel
Save