diff --git a/client-profiles/20-kde-4.3-4.4/.local/share/applications/mimeapps.list b/client-profiles/20-kde-4.3-4.4/.local/share/applications/mimeapps.list index b77d4d7..53be7ec 100644 --- a/client-profiles/20-kde-4.3-4.4/.local/share/applications/mimeapps.list +++ b/client-profiles/20-kde-4.3-4.4/.local/share/applications/mimeapps.list @@ -1,26 +1,12 @@ # Calculate format=compiz [Added Associations] -#?pkg(www-client/mozilla-firefox)>=3.5&pkg(www-client/mozilla-firefox)<3.6# -application/rss+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/vnd.mozilla.xul+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/x-font-ttx=mozilla-firefox-3.5.desktop; -application/x-ufraw=mozilla-firefox-3.5.desktop; -application/xhtml+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xml-external-parsed-entity=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xsd=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xslt+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -text/html=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -#pkg# -#?pkg(www-client/mozilla-firefox)>=3.6# -application/rss+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/vnd.mozilla.xul+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/x-font-ttx=mozilla-firefox-3.6.desktop; -application/x-ufraw=mozilla-firefox-3.6.desktop; -application/xhtml+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xml-external-parsed-entity=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xsd=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xslt+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -text/html=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -#pkg# +application/rss+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/vnd.mozilla.xul+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/x-font-ttx=mozilla-firefox.desktop; +application/x-ufraw=mozilla-firefox.desktop; +application/xhtml+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xml-external-parsed-entity=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xsd=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xslt+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +text/html=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; diff --git a/client-profiles/20-kde-4.3/.local/share/applications/mimeapps.list b/client-profiles/20-kde-4.3/.local/share/applications/mimeapps.list index 279b698..53be7ec 100644 --- a/client-profiles/20-kde-4.3/.local/share/applications/mimeapps.list +++ b/client-profiles/20-kde-4.3/.local/share/applications/mimeapps.list @@ -1,25 +1,12 @@ +# Calculate format=compiz [Added Associations] -#?pkg(www-client/mozilla-firefox)>=3.5&pkg(www-client/mozilla-firefox)<3.6# -application/rss+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/vnd.mozilla.xul+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/x-font-ttx=mozilla-firefox-3.5.desktop; -application/x-ufraw=mozilla-firefox-3.5.desktop; -application/xhtml+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xml-external-parsed-entity=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xsd=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xslt+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -text/html=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -#pkg# -#?pkg(www-client/mozilla-firefox)>=3.6# -application/rss+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/vnd.mozilla.xul+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/x-font-ttx=mozilla-firefox-3.6.desktop; -application/x-ufraw=mozilla-firefox-3.6.desktop; -application/xhtml+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xml-external-parsed-entity=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xsd=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xslt+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -text/html=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -#pkg# +application/rss+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/vnd.mozilla.xul+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/x-font-ttx=mozilla-firefox.desktop; +application/x-ufraw=mozilla-firefox.desktop; +application/xhtml+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xml-external-parsed-entity=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xsd=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xslt+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +text/html=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; diff --git a/client-profiles/20-kde-4.4/.local/share/applications/mimeapps.list b/client-profiles/20-kde-4.4/.local/share/applications/mimeapps.list index 279b698..53be7ec 100644 --- a/client-profiles/20-kde-4.4/.local/share/applications/mimeapps.list +++ b/client-profiles/20-kde-4.4/.local/share/applications/mimeapps.list @@ -1,25 +1,12 @@ +# Calculate format=compiz [Added Associations] -#?pkg(www-client/mozilla-firefox)>=3.5&pkg(www-client/mozilla-firefox)<3.6# -application/rss+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/vnd.mozilla.xul+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/x-font-ttx=mozilla-firefox-3.5.desktop; -application/x-ufraw=mozilla-firefox-3.5.desktop; -application/xhtml+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xml-external-parsed-entity=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xsd=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xslt+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -text/html=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -#pkg# -#?pkg(www-client/mozilla-firefox)>=3.6# -application/rss+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/vnd.mozilla.xul+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/x-font-ttx=mozilla-firefox-3.6.desktop; -application/x-ufraw=mozilla-firefox-3.6.desktop; -application/xhtml+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xml-external-parsed-entity=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xsd=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xslt+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -text/html=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -#pkg# +application/rss+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/vnd.mozilla.xul+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/x-font-ttx=mozilla-firefox.desktop; +application/x-ufraw=mozilla-firefox.desktop; +application/xhtml+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xml-external-parsed-entity=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xsd=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +application/xslt+xml=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; +text/html=mozilla-firefox.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; diff --git a/client-profiles/20-kde-always/Desktop/FTP.desktop.remove b/client-profiles/20-kde-always/Desktop/FTP.desktop.remove index 111ea2c..11ff407 100644 --- a/client-profiles/20-kde-always/Desktop/FTP.desktop.remove +++ b/client-profiles/20-kde-always/Desktop/FTP.desktop.remove @@ -1,8 +1 @@ -# Calculate append=remove name=FTP.desktop format=kde cl_remote_host!=&cl_remote_ftp== -[Desktop Entry] -Encoding=UTF-8 -Name=FTP -Comment=Browser FTP -URL[$e]=$HOME/FTP -Icon=folder-downloads -Type=Link +# Calculate append=remove name=FTP.desktop cl_remote_host!=&cl_remote_ftp== diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml index 7804447..fa72565 100644 --- a/client-profiles/30-gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml +++ b/client-profiles/30-gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml @@ -3,7 +3,7 @@ #-pop(offsetx)-# - + #-push(offsetx)-# diff --git a/client-profiles/30-gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml b/client-profiles/30-gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml index 445d13c..ea76523 100644 --- a/client-profiles/30-gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml +++ b/client-profiles/30-gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml @@ -2,7 +2,7 @@ - + diff --git a/client-profiles/40-cldx-10.2-10.4/.config/xfce4/panel/panels.xml b/client-profiles/40-cldx-10.2-10.4/.config/xfce4/panel/panels.xml index abb3c46..49b629b 100644 --- a/client-profiles/40-cldx-10.2-10.4/.config/xfce4/panel/panels.xml +++ b/client-profiles/40-cldx-10.2-10.4/.config/xfce4/panel/panels.xml @@ -1,4 +1,4 @@ - +# Calculate append=replace diff --git a/client-profiles/40-cldx-10.2-10.4/.local/share/applications/defaults.list b/client-profiles/40-cldx-10.2-10.4/.local/share/applications/defaults.list index 8515814..0a2f0ba 100644 --- a/client-profiles/40-cldx-10.2-10.4/.local/share/applications/defaults.list +++ b/client-profiles/40-cldx-10.2-10.4/.local/share/applications/defaults.list @@ -1,2 +1,44 @@ +# Calculate format=compiz [Default Applications] -application/pdf=epdfview.desktop +application/illustrator=gimp.desktop +application/pdf=evince.desktop;gimp.desktop +application/rss+xml=mozilla-firefox.desktop +application/vnd.mozilla.xul+xml=mozilla-firefox.desktop +application/vnd.oasis.opendocument.spreadsheet=calc.desktop +application/vnd.oasis.opendocument.text=writer.desktop +application/x-font-ttx=mozilla-firefox.desktop +application/x-ufraw=mozilla-firefox.desktop +application/xhtml+xml=mozilla-firefox.desktop +application/xml-external-parsed-entity=mozilla-firefox.desktop +application/xml=mozilla-firefox.desktop +application/xsd=mozilla-firefox.desktop +application/xslt+xml=mozilla-firefox.desktop +audio/mp4=audacious2-gtkui.desktop +audio/mpeg=audacious2-gtkui.desktop +audio/x-flac=audacious2-gtkui.desktop +audio/x-ms-wma=audacious2-gtkui.desktop +audio/x-wav=audacious2-gtkui.desktop +image/bmp=gqview.desktop;gimp.desktop +image/gif=gqview.desktop;gimp.desktop +image/jpeg=gqview.desktop;gimp.desktop +image/jpg=gqview.desktop;gimp.desktop +image/png=gqview.desktop;gimp.desktop +image/svg+xml-compressed=gimp.desktop;gqview.desktop +image/svg+xml=gqview.desktop;gimp.desktop +image/tiff=gqview.desktop;gimp.desktop +image/vnd.microsoft.icon=gqview.desktop;gimp.desktop +image/vnd.wap.wbmp=gqview.desktop;gimp.desktop +image/x-gray=gqview.desktop;gimp.desktop +image/x-pcx=gqview.desktop;gimp.desktop +image/x-png=gqview.desktop;gimp.desktop +image/x-portable-anymap=gqview.desktop;gimp.desktop +image/x-portable-bitmap=gqview.desktop;gimp.desktop +image/x-portable-graymap=gqview.desktop;gimp.desktop +image/x-portable-pixmap=gqview.desktop;gimp.desktop +image/x-tga=gqview.desktop;gimp.desktop +image/x-xbitmap=gqview.desktop;gimp.desktop +image/x-xpixmap=gqview.desktop;gimp.desktop +text/html=mozilla-firefox.desktop +text/plain=mousepad.desktop +video/x-msvideo=gnome-mplayer.desktop + diff --git a/client-profiles/40-cldx-10.2-10.4/.local/share/applications/mimeapps.list b/client-profiles/40-cldx-10.2-10.4/.local/share/applications/mimeapps.list deleted file mode 100644 index dce4077..0000000 --- a/client-profiles/40-cldx-10.2-10.4/.local/share/applications/mimeapps.list +++ /dev/null @@ -1,26 +0,0 @@ -[Added Associations] -application/pdf=evince.desktop;gimp.desktop -#?pkg(www-client/mozilla-firefox)>=3.5&pkg(www-client/mozilla-firefox)<3.6# -application/rss+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/vnd.mozilla.xul+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/x-font-ttx=mozilla-firefox-3.5.desktop; -application/x-ufraw=mozilla-firefox-3.5.desktop; -application/xhtml+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xml-external-parsed-entity=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xsd=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xslt+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -text/html=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -#pkg# -#?pkg(www-client/mozilla-firefox)>=3.6# -application/rss+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/vnd.mozilla.xul+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/x-font-ttx=mozilla-firefox-3.6.desktop; -application/x-ufraw=mozilla-firefox-3.6.desktop; -application/xhtml+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xml-external-parsed-entity=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xsd=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xslt+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -text/html=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -#pkg# diff --git a/client-profiles/40-xfce-4.6/.config/xfce4/panel/panels.xml b/client-profiles/40-xfce-4.6/.config/xfce4/panel/panels.xml index abb3c46..f0ee348 100644 --- a/client-profiles/40-xfce-4.6/.config/xfce4/panel/panels.xml +++ b/client-profiles/40-xfce-4.6/.config/xfce4/panel/panels.xml @@ -1,4 +1,4 @@ - +# Calculate format=xml_xfcepanel diff --git a/client-profiles/40-xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/client-profiles/40-xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml index 041cdf7..071b192 100644 --- a/client-profiles/40-xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml +++ b/client-profiles/40-xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml @@ -5,4 +5,9 @@ +#?os_root_type==livecd# + + + +#os_root_type# diff --git a/client-profiles/40-xfce-4.6/.local/share/applications/audacious2-gtkui.desktop b/client-profiles/40-xfce-4.6/.local/share/applications/audacious2-gtkui.desktop new file mode 100644 index 0000000..e1008b7 --- /dev/null +++ b/client-profiles/40-xfce-4.6/.local/share/applications/audacious2-gtkui.desktop @@ -0,0 +1,4 @@ +# Calculate format=kde link=/usr/share/applications/audacious2-gtkui.desktop mirror +[Desktop Entry] +#hidden from menu +OnlyShowIn=X-NeverShowThis; diff --git a/client-profiles/40-xfce-4.6/.local/share/applications/audacious2.desktop b/client-profiles/40-xfce-4.6/.local/share/applications/audacious2.desktop new file mode 100644 index 0000000..eb4c05d --- /dev/null +++ b/client-profiles/40-xfce-4.6/.local/share/applications/audacious2.desktop @@ -0,0 +1,3 @@ +# Calculate format=kde link=/usr/share/applications/audacious2.desktop mirror +[Desktop Entry] +Exec=audacious2 -i gtkui %U diff --git a/client-profiles/40-xfce-4.6/.local/share/applications/defaults.list b/client-profiles/40-xfce-4.6/.local/share/applications/defaults.list index 8515814..0a2f0ba 100644 --- a/client-profiles/40-xfce-4.6/.local/share/applications/defaults.list +++ b/client-profiles/40-xfce-4.6/.local/share/applications/defaults.list @@ -1,2 +1,44 @@ +# Calculate format=compiz [Default Applications] -application/pdf=epdfview.desktop +application/illustrator=gimp.desktop +application/pdf=evince.desktop;gimp.desktop +application/rss+xml=mozilla-firefox.desktop +application/vnd.mozilla.xul+xml=mozilla-firefox.desktop +application/vnd.oasis.opendocument.spreadsheet=calc.desktop +application/vnd.oasis.opendocument.text=writer.desktop +application/x-font-ttx=mozilla-firefox.desktop +application/x-ufraw=mozilla-firefox.desktop +application/xhtml+xml=mozilla-firefox.desktop +application/xml-external-parsed-entity=mozilla-firefox.desktop +application/xml=mozilla-firefox.desktop +application/xsd=mozilla-firefox.desktop +application/xslt+xml=mozilla-firefox.desktop +audio/mp4=audacious2-gtkui.desktop +audio/mpeg=audacious2-gtkui.desktop +audio/x-flac=audacious2-gtkui.desktop +audio/x-ms-wma=audacious2-gtkui.desktop +audio/x-wav=audacious2-gtkui.desktop +image/bmp=gqview.desktop;gimp.desktop +image/gif=gqview.desktop;gimp.desktop +image/jpeg=gqview.desktop;gimp.desktop +image/jpg=gqview.desktop;gimp.desktop +image/png=gqview.desktop;gimp.desktop +image/svg+xml-compressed=gimp.desktop;gqview.desktop +image/svg+xml=gqview.desktop;gimp.desktop +image/tiff=gqview.desktop;gimp.desktop +image/vnd.microsoft.icon=gqview.desktop;gimp.desktop +image/vnd.wap.wbmp=gqview.desktop;gimp.desktop +image/x-gray=gqview.desktop;gimp.desktop +image/x-pcx=gqview.desktop;gimp.desktop +image/x-png=gqview.desktop;gimp.desktop +image/x-portable-anymap=gqview.desktop;gimp.desktop +image/x-portable-bitmap=gqview.desktop;gimp.desktop +image/x-portable-graymap=gqview.desktop;gimp.desktop +image/x-portable-pixmap=gqview.desktop;gimp.desktop +image/x-tga=gqview.desktop;gimp.desktop +image/x-xbitmap=gqview.desktop;gimp.desktop +image/x-xpixmap=gqview.desktop;gimp.desktop +text/html=mozilla-firefox.desktop +text/plain=mousepad.desktop +video/x-msvideo=gnome-mplayer.desktop + diff --git a/client-profiles/40-xfce-4.6/.local/share/applications/mimeapps.list b/client-profiles/40-xfce-4.6/.local/share/applications/mimeapps.list deleted file mode 100644 index dce4077..0000000 --- a/client-profiles/40-xfce-4.6/.local/share/applications/mimeapps.list +++ /dev/null @@ -1,26 +0,0 @@ -[Added Associations] -application/pdf=evince.desktop;gimp.desktop -#?pkg(www-client/mozilla-firefox)>=3.5&pkg(www-client/mozilla-firefox)<3.6# -application/rss+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/vnd.mozilla.xul+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/x-font-ttx=mozilla-firefox-3.5.desktop; -application/x-ufraw=mozilla-firefox-3.5.desktop; -application/xhtml+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xml-external-parsed-entity=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xsd=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xslt+xml=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -text/html=mozilla-firefox-3.5.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -#pkg# -#?pkg(www-client/mozilla-firefox)>=3.6# -application/rss+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/vnd.mozilla.xul+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/x-font-ttx=mozilla-firefox-3.6.desktop; -application/x-ufraw=mozilla-firefox-3.6.desktop; -application/xhtml+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xml-external-parsed-entity=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xsd=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -application/xslt+xml=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -text/html=mozilla-firefox-3.6.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop; -#pkg# diff --git a/client-profiles/40-xfce-4.6/.local/share/desktop-directories/xfce-accessories.directory b/client-profiles/40-xfce-4.6/.local/share/desktop-directories/xfce-accessories.directory index c8191a1..eeb9cc6 100644 --- a/client-profiles/40-xfce-4.6/.local/share/desktop-directories/xfce-accessories.directory +++ b/client-profiles/40-xfce-4.6/.local/share/desktop-directories/xfce-accessories.directory @@ -1,3 +1,12 @@ -# Calculate format=kde link=/usr/share/desktop-directories/xfce-network.directory mirror +# Calculate format=kde link=/usr/share/desktop-directories/xfce-accessories.directory mirror + [Desktop Entry] +Name=Utilities +Name[de]=Dienstprogramme +Name[es]=Utilidades +Name[fr]=Utilitaires +Name[it]=Accessori +Name[pl]=Narzędzia +Name[pt_BR]=Utilitários Name[ru]=Служебные +Name[uk]=Утиліти diff --git a/client-profiles/40-xfce-always/.calculate_directory b/client-profiles/40-xfce-always/.calculate_directory new file mode 100644 index 0000000..a628783 --- /dev/null +++ b/client-profiles/40-xfce-always/.calculate_directory @@ -0,0 +1 @@ +# Calculate ini(main.update)!=off&ini(update.xfce)!=off&pkg(xfce-base/xfdesktop)>=4.6&ini(domain)!=cl_remote_host diff --git a/client-profiles/40-xfce-always/.config/xfce4/desktop/icons.screen0.rc b/client-profiles/40-xfce-always/.config/xfce4/desktop/icons.screen0.rc new file mode 100644 index 0000000..4b2fcab --- /dev/null +++ b/client-profiles/40-xfce-always/.config/xfce4/desktop/icons.screen0.rc @@ -0,0 +1,17 @@ +# Calculate format=samba +[Home] +row=0 +col=0 + +#?cl_remote_host!=# +[Disks] +row=0 +col=1 +#cl_remote_host# + +#?cl_remote_host!=&cl_remote_ftp!=# +[FTP] +row=0 +col=2 +#cl_remote_host# + diff --git a/client-profiles/40-xfce-always/.config/xfce4/panel/panels.xml b/client-profiles/40-xfce-always/.config/xfce4/panel/panels.xml new file mode 100644 index 0000000..047c6e6 --- /dev/null +++ b/client-profiles/40-xfce-always/.config/xfce4/panel/panels.xml @@ -0,0 +1,34 @@ +# Calculate format=xml_xfcepanel + + + + + + +#?cl_remote_host!=# + + +#cl_remote_host# +#?cl_remote_host!=&cl_remote_ftp!=# + +#cl_remote_host# +#?cl_remote_host==# + +#cl_remote_host# + + + + +#?hr_laptop!=# + +#hr_laptop# + + + + + + + + + + diff --git a/client-profiles/40-xfce-always/Desktop/FTP.desktop b/client-profiles/40-xfce-always/Desktop/FTP.desktop new file mode 100644 index 0000000..8c25a03 --- /dev/null +++ b/client-profiles/40-xfce-always/Desktop/FTP.desktop @@ -0,0 +1,12 @@ +# Calculate format=samba cl_remote_host!=&cl_remote_ftp!= +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Type=Application +Name=FTP +Comment=Browser FTP +Categories=Application; +Exec=thunar /home/#-ur_login-#/FTP +Icon=update-manager +Terminal=false +StartupNotify=false diff --git a/client-profiles/40-xfce-always/Desktop/FTP.desktop.remove b/client-profiles/40-xfce-always/Desktop/FTP.desktop.remove new file mode 100644 index 0000000..11ff407 --- /dev/null +++ b/client-profiles/40-xfce-always/Desktop/FTP.desktop.remove @@ -0,0 +1 @@ +# Calculate append=remove name=FTP.desktop cl_remote_host!=&cl_remote_ftp== diff --git a/profiles/client/etc/xdg/xfce4/kiosk/kioskrc b/profiles/client/etc/xdg/xfce4/kiosk/kioskrc new file mode 100644 index 0000000..1e3f88e --- /dev/null +++ b/profiles/client/etc/xdg/xfce4/kiosk/kioskrc @@ -0,0 +1,9 @@ +# Calculate format=samba pkg(xfce-base/xfdesktop)!= + +[xfce4-session] +#?cl_remote_host!=# +Shutdown=NONE +#cl_remote_host# +#?cl_remote_host==# +!Shutdown= +#cl_remote_host# diff --git a/profiles/domain/etc/xdg/xfce4/kiosk/kioskrc b/profiles/domain/etc/xdg/xfce4/kiosk/kioskrc new file mode 100644 index 0000000..1e3f88e --- /dev/null +++ b/profiles/domain/etc/xdg/xfce4/kiosk/kioskrc @@ -0,0 +1,9 @@ +# Calculate format=samba pkg(xfce-base/xfdesktop)!= + +[xfce4-session] +#?cl_remote_host!=# +Shutdown=NONE +#cl_remote_host# +#?cl_remote_host==# +!Shutdown= +#cl_remote_host# diff --git a/pym/cl_client.py b/pym/cl_client.py index 57af139..9025322 100644 --- a/pym/cl_client.py +++ b/pym/cl_client.py @@ -35,7 +35,7 @@ import subprocess from encrypt import encrypt from signal import SIGTERM -Version = "calculate-client 2.1.12" +Version = "calculate-client 2.1.15" tr = cl_base.lang() tr.setLanguage(sys.modules[__name__]) @@ -88,7 +88,7 @@ class GProgressBar(NoneProgressBar): title = re.sub("<[^>]+>", "", title) self.title = title if os.system('which Xdialog &>/dev/null') == 0: - pipe = subprocess.Popen('/usr/bin/Xdialog --progress "%s" 5 80'\ + pipe = subprocess.Popen('/usr/bin/Xdialog --progress "%s" 6 80'\ %(self.title), stdin=subprocess.PIPE, stdout=subprocess.PIPE, diff --git a/pym/cl_vars_client.py b/pym/cl_vars_client.py index 1784137..6bf060c 100644 --- a/pym/cl_vars_client.py +++ b/pym/cl_vars_client.py @@ -138,7 +138,7 @@ class Data: cl_name = {'value':'calculate-client'} # версия программы - cl_ver = {'value':'2.1.12'} + cl_ver = {'value':'2.1.15'} # Режим работы клиента клиент # (local или имя хоста клиента) diff --git a/setup.py b/setup.py index db0d300..ec63cef 100755 --- a/setup.py +++ b/setup.py @@ -102,7 +102,7 @@ class cl_install_data(install_data): setup( name = 'calculate-client', - version = "2.1.12", + version = "2.1.15", description = "Client for the calculate-server", author = "Mir Calculate Ltd.", author_email = "support@calculate.ru",