Merge branch with renaming Disks to Share.

This commit is contained in:
Mike Hiretsky 2010-08-13 12:10:32 +00:00
commit e33037fdbc
36 changed files with 193 additions and 30 deletions

View file

@ -14,7 +14,7 @@ ver = #-os_linux_ver-#
#?exists(~/.kde4)==&&exists(~/.gconf)==&&exists(~/.config)==#
[ver]
patch = 2.1.18
patch = 2.2.0.0
#exists#
[update]

View file

@ -28,7 +28,7 @@ url=desktop:/
#-sum(iconcx,,112)-#
#-sum(iconcy,,100)-#
#-sum(iconcount,,2)-#
savedPositions=1,7,Home.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,Disks.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,FTP.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,#-sum(iconx,,10)-##-sum(icony,,icony+iconcy)-#calculate-install.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,partitionmanager.desktop,#-sum(iconx,iconx,10)-#,#-sum(icony,icony,icony+iconcy)-#,README.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,calculate-community.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#
savedPositions=1,7,Home.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,Share.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,FTP.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,#-sum(iconx,,10)-##-sum(icony,,icony+iconcy)-#calculate-install.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,partitionmanager.desktop,#-sum(iconx,iconx,10)-#,#-sum(icony,icony,icony+iconcy)-#,README.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,calculate-community.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#
zvalue=0
sortColumn=-1
@ -93,7 +93,7 @@ immutability=1
plugin=icon
zvalue=0
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
Url=file:///home/#-ur_login-#/Disks
Url=file:///home/#-ur_login-#/Share
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
Order=#-sum(apporder,apporder+1)-#
#env#

View file

@ -1,8 +1,8 @@
# Calculate format=samba env(client.os_remote_auth)!=
[Desktop Entry]
Encoding=UTF-8
Name=Disks
Comment=Browser Disks
URL[$e]=$HOME/Disks
Name=Share
Comment=Browser Share
URL[$e]=$HOME/Share
Icon=folder-favorites
Type=Link

View file

@ -63,7 +63,7 @@ immutability=1
plugin=icon
zvalue=0
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
Url=file:///home/#-ur_login-#/Disks
Url=file:///home/#-ur_login-#/Share
#env#
#?env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)!=#
@ -193,7 +193,7 @@ immutability=1
plugin=icon
zvalue=0
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
Url=file:///home/#-ur_login-#/Disks
Url=file:///home/#-ur_login-#/Share
#env#
#?env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)!=#

View file

@ -28,7 +28,7 @@ wallpaperpluginmode=SingleImage
#-sum(iconcx,,112)-#
#-sum(iconcy,,100)-#
#-sum(iconcount,,2)-#
savedPositions=1,7,Home.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,Disks.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,FTP.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,#-sum(iconx,,10)-##-sum(icony,,icony+iconcy)-#calculate-install.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,partitionmanager.desktop,#-sum(iconx,iconx,10)-#,#-sum(icony,icony,icony+iconcy)-#,README.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,calculate-community.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#
savedPositions=1,7,Home.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,Share.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,FTP.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,#-sum(iconx,,10)-##-sum(icony,,icony+iconcy)-#calculate-install.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,partitionmanager.desktop,#-sum(iconx,iconx,10)-#,#-sum(icony,icony,icony+iconcy)-#,README.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,calculate-community.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#
zvalue=0
sortColumn=-1
@ -97,7 +97,7 @@ immutability=1
plugin=icon
zvalue=0
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
Url=file:///home/#-ur_login-#/Disks
Url=file:///home/#-ur_login-#/Share
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
Order=#-sum(apporder,apporder+1)-#
#env#

View file

@ -1,8 +1,8 @@
# Calculate format=samba env(client.os_remote_auth)!=
[Desktop Entry]
Encoding=UTF-8
Name=Disks
Comment=Browser Disks
URL[$e]=$HOME/Disks
Name=Share
Comment=Browser Share
URL[$e]=$HOME/Share
Icon=folder-favorites
Type=Link

View file

@ -9,7 +9,7 @@
#-sum(iconcx,,112)-#
#-sum(iconcy,,100)-#
#-sum(iconcount,,2)-#
savedPositions=1,7,Home.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,Disks.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,FTP.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,#-sum(iconx,,10)-##-sum(icony,,icony+iconcy)-#calculate-install.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,partitionmanager.desktop,#-sum(iconx,iconx,10)-#,#-sum(icony,icony,icony+iconcy)-#,README.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,calculate-community.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#
savedPositions=1,7,Home.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,Share.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,FTP.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,#-sum(iconx,,10)-##-sum(icony,,icony+iconcy)-#calculate-install.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,partitionmanager.desktop,#-sum(iconx,iconx,10)-#,#-sum(icony,icony,icony+iconcy)-#,README.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,calculate-community.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#
#------------------------------------------------------------------------------
#верхняя панель
@ -68,7 +68,7 @@ immutability=1
plugin=icon
zvalue=0
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
Url=file:///home/#-ur_login-#/Disks
Url=file:///home/#-ur_login-#/Share
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
Order=#-sum(apporder,apporder+1)-#
#env#

View file

@ -20,7 +20,7 @@
<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>Disks.desktop</stringvalue>
<stringvalue>Share.desktop</stringvalue>
</entry>
<entry name="menu_path" schema="/schemas/apps/panel/objects/menu_path"/>
</gconf>

View file

@ -3,8 +3,8 @@
[Desktop Entry]
Encoding=UTF-8
Version=1.0
Name=Disks
Comment=Browser Disks
Name=Share
Comment=Browser Share
Icon=folder-remote
URL=file:///home/#-ur_login-#/Disks
URL=file:///home/#-ur_login-#/Share
Type=Link

View file

@ -3,5 +3,5 @@
<directory><file name="home" timestamp="1267778829" icon_position="64,22" icon_scale="1" icon_position_timestamp="1267778829"/></directory>
#env#
#?env(client.os_remote_auth)!=#
<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>
<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="Share.volume" icon_position="142,22" custom_icon="file:///usr/share/icons/gnome/scalable/places/folder-remote.svg" icon_scale="1"/></directory>
#env#

View file

@ -3,5 +3,5 @@
<directory><file name="home" timestamp="1267778829" icon_position="64,22" icon_scale="1" icon_position_timestamp="1267778829"/></directory>
#env#
#?env(client.os_remote_auth)!=#
<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>
<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="Share.volume" icon_position="142,22" custom_icon="file:///usr/share/icons/gnome/scalable/places/folder-remote.svg" icon_scale="1"/></directory>
#env#

View file

@ -4,7 +4,7 @@ row=0
col=0
#?env(client.os_remote_auth)!=#
[Disks]
[Share]
row=0
col=1
#env#

View file

@ -4,7 +4,7 @@ row=0
col=0
#?env(client.os_remote_auth)!=#
[Disks]
[Share]
row=0
col=1
#env#

View file

@ -4,9 +4,9 @@ MoveFirst=false
ArrowPosition=0
[Entry 0]
Name=Disks
Comment=Browser Disks
Name=Share
Comment=Browser Share
Icon=folder-remote
Exec=thunar /home/#-ur_login-#/Disks
Exec=thunar /home/#-ur_login-#/Share
Terminal=false

View file

@ -3,10 +3,10 @@
Version=1.0
Encoding=UTF-8
Type=Application
Name=Disks
Comment=Browser Disks
Name=Share
Comment=Browser Share
Categories=Application;
Exec=thunar /home/#-ur_login-#/Disks
Exec=thunar /home/#-ur_login-#/Share
Icon=folder-remote
Terminal=false
StartupNotify=false

View file

@ -3,7 +3,7 @@
row=0
col=0
[Disks]
[Share]
row=0
col=1

View file

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

View file

@ -0,0 +1 @@
# Calculate append=skip belong(calculate-desktop)!=&&ini(main.update)!=off&&ini(update.patch)!=off&&ini(ver.patch)<2.2.0.0

View file

@ -0,0 +1 @@
# Calculate belong(xfdesktop)!=&&ini(main.update)!=off&&ini(update.xfce)!=off&&ini(ver.xfce)==&&pkg(xfce-base/xfdesktop)>=4.6

View file

@ -0,0 +1,15 @@
# Calculate format=samba append=replace
[Home]
row=0
col=0
[Share]
row=0
col=1
#?server(ftp.host)!=#
[FTP]
row=0
col=2
#server#

View file

@ -0,0 +1,12 @@
# Calculate format=kde
[Global]
MoveFirst=false
ArrowPosition=0
[Entry 0]
Name=Share
Comment=Browser Share
Icon=folder-remote
Exec=thunar /home/#-ur_login-#/Share
Terminal=false

View file

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

View file

@ -0,0 +1,7 @@
# Calculate format=xml_gconf
<?xml version="1.0"?>
<gconf>
<entry name="launcher_location" schema="/schemas/apps/panel/objects/launcher_location" type="string">
<stringvalue>Share.desktop</stringvalue>
</entry>
</gconf>

View file

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

View file

@ -0,0 +1 @@
# Calculate format=samba env(client.os_remote_auth)!= append=remove

View file

@ -0,0 +1,10 @@
# Calculate format=samba env(client.os_remote_auth)!=
[Desktop Entry]
Encoding=UTF-8
Version=1.0
Name=Share
Comment=Browser Share
Icon=folder-remote
URL=file:///home/#-ur_login-#/Share
Type=Link

View file

@ -0,0 +1 @@
# Calculate belong(kdelibs)!=&&ini(main.update)!=off&&ini(update.kde)!=off&&ini(ver.kde)==&&pkg(kde-base/kdelibs)!=

View file

@ -0,0 +1,74 @@
# Calculate format=plasma env(client.os_remote_auth)!=
#------------------------------------------------------------------------------
#рабочий стол
#------------------------------------------------------------------------------
[Containments][#-sum(cont,1)-#]
#-sum(iconx,,10)-#
#-sum(icony,,10)-#
#-sum(iconcx,,112)-#
#-sum(iconcy,,100)-#
#-sum(iconcount,,2)-#
savedPositions=1,7,Home.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,Share.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,FTP.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,#-sum(iconx,,10)-##-sum(icony,,icony+iconcy)-#calculate-install.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,partitionmanager.desktop,#-sum(iconx,iconx,10)-#,#-sum(icony,icony,icony+iconcy)-#,README.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#,calculate-community.desktop,#-sum(iconx,iconx,iconx+iconcx)-#,#-sum(icony,icony)-#
#------------------------------------------------------------------------------
#верхняя панель
#------------------------------------------------------------------------------
#-sum(panel,,31)-#
#-sum(apporder,,0)-#
[Containments][#-sum(cont,cont+1)-#]
desktop=-1
formfactor=2
geometry=0,0,#-os_x11_width-#,#-sum(panel,panel)-#
immutability=1
location=3
plugin=panel
screen=0
zvalue=150
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,cont*100)-#]
immutability=1
plugin=simplelauncher
zvalue=0
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
icon=kde
#?env(client.os_remote_auth)==#
views=Applications,RunCommand,Leave
#env#
#?env(client.os_remote_auth)!=#
views=Applications,RunCommand,SwitchUser,LockScreen,Logout
#env#
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
Order=#-sum(apporder,apporder)-#
#?env(client.os_remote_auth)==#
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
immutability=1
plugin=icon
zvalue=0
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
Url=file:///home/#-ur_login-#
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
Order=#-sum(apporder,apporder+1)-#
#env#
#?env(client.os_remote_auth)!=#
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
immutability=1
plugin=icon
zvalue=0
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
Url=file:///home/#-ur_login-#/Home
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
Order=#-sum(apporder,apporder+1)-#
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
immutability=1
plugin=icon
zvalue=0
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
Url=file:///home/#-ur_login-#/Share
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
Order=#-sum(apporder,apporder+1)-#
#env#

View file

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

View file

@ -0,0 +1,7 @@
<?xml version="1.0"?>
#?env(client.os_remote_auth)==#
<directory><file name="home" timestamp="1267778829" icon_position="64,22" icon_scale="1" icon_position_timestamp="1267778829"/></directory>
#env#
#?env(client.os_remote_auth)!=#
<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="Share.volume" icon_position="142,22" custom_icon="file:///usr/share/icons/gnome/scalable/places/folder-remote.svg" icon_scale="1"/></directory>
#env#

View file

@ -0,0 +1 @@
# Calculate append=skip belong(kdelibs)!=&&ini(main.update)!=off&&ini(update.kde)!=off&&ini(ver.kde)==&&pkg(kde-base/kdelibs)!=

View file

@ -0,0 +1 @@
# Calculate format=samba env(client.os_remote_auth)!= append=remove

View file

@ -0,0 +1,8 @@
# Calculate format=samba env(client.os_remote_auth)!=
[Desktop Entry]
Encoding=UTF-8
Name=Share
Comment=Browser Share
URL[$e]=$HOME/Share
Icon=folder-favorites
Type=Link

View file

@ -0,0 +1 @@
# Calculate append=skip belong(xfdesktop)!=&&ini(main.update)!=off&&ini(update.xfce)!=off&&ini(ver.xfce)==&&pkg(xfce-base/xfdesktop)>=4.6

View file

@ -0,0 +1 @@
# Calculate format=samba env(client.os_remote_auth)!= append=remove

View file

@ -0,0 +1,12 @@
# Calculate format=samba env(client.os_remote_auth)!=
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Type=Application
Name=Share
Comment=Browser Share
Categories=Application;
Exec=thunar /home/#-ur_login-#/Share
Icon=folder-remote
Terminal=false
StartupNotify=false