From 5306f8a1d42e11e9af480f342bd4501762b36a38 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Tue, 23 Feb 2010 21:07:10 +0100 Subject: [PATCH 01/22] debian/control: Depends on the re-written pcmanfm (>= 0.9.0) --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3688e3e..925a82d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ lubuntu-default-settings (0.6) UNRELEASED; urgency=low * Set iconsize to 22 and panel height to 24 for panel settings. It displays correct icons size for panel icons. Thanks Leszek Lesner. + * debian/control: Depends on the re-written pcmanfm (>= 0.9.0) -- Julien Lavergne Fri, 19 Feb 2010 22:28:28 +0100 diff --git a/debian/control b/debian/control index e36f62e..74f3c7a 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,6 @@ Vcs-Browser: http://bazaar.launchpad.net/~lubuntu-desktop/+junk/lubuntu-default- Package: lubuntu-default-settings Architecture: all -Depends: ${misc:Depends}, lxsession (>= 0.4.1), lubuntu-artwork (>= 0.4), elementary-icon-theme +Depends: ${misc:Depends}, lxsession (>= 0.4.1), lubuntu-artwork (>= 0.4), elementary-icon-theme, pcmanfm (>= 0.9.0~) Description: default settings for Lubuntu Various system settings tailored for Lubuntu. From 689f7589c3be74f1397912bb67e6938d8aa9c26e Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Tue, 23 Feb 2010 21:08:35 +0100 Subject: [PATCH 02/22] autostart: Use new pcmanfm --desktop command to start pcmanfm with desktop management. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 925a82d..9fc055e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ lubuntu-default-settings (0.6) UNRELEASED; urgency=low * Set iconsize to 22 and panel height to 24 for panel settings. It displays correct icons size for panel icons. Thanks Leszek Lesner. * debian/control: Depends on the re-written pcmanfm (>= 0.9.0) + * autostart: Use new pcmanfm --desktop command to start pcmanfm with desktop + management. -- Julien Lavergne Fri, 19 Feb 2010 22:28:28 +0100 From af4e91215f5c2f5c4822c2b49fee3dc3748e3549 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Tue, 23 Feb 2010 21:48:48 +0100 Subject: [PATCH 03/22] usr/bin/start* : Ensure configuration files for libfm and pcmanfm2. --- debian/changelog | 1 + etc/xdg/lubuntu/libfm/libfm.conf | 13 +++++++++++++ usr/bin/startlubuntu | 12 ++++++++++++ usr/bin/startlubuntu-netbook | 12 ++++++++++++ usr/share/lubuntu/pcmanfm/pcmanfm.conf | 0 5 files changed, 38 insertions(+) create mode 100644 etc/xdg/lubuntu/libfm/libfm.conf create mode 100644 usr/share/lubuntu/pcmanfm/pcmanfm.conf diff --git a/debian/changelog b/debian/changelog index 9fc055e..5e6312d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ lubuntu-default-settings (0.6) UNRELEASED; urgency=low * debian/control: Depends on the re-written pcmanfm (>= 0.9.0) * autostart: Use new pcmanfm --desktop command to start pcmanfm with desktop management. + * usr/bin/start* : Ensure configuration files for libfm and pcmanfm2. -- Julien Lavergne Fri, 19 Feb 2010 22:28:28 +0100 diff --git a/etc/xdg/lubuntu/libfm/libfm.conf b/etc/xdg/lubuntu/libfm/libfm.conf new file mode 100644 index 0000000..5d3cd0a --- /dev/null +++ b/etc/xdg/lubuntu/libfm/libfm.conf @@ -0,0 +1,13 @@ +[config] +single_click=1 +use_trash=1 +confirm_del=1 +thumbnail_local=1 +thumbnail_max=2048 + +[ui] +big_icon_size=48 +small_icon_size=24 +thumbnail_size=128 +pane_icon_size=24 +show_thumbnail=1 diff --git a/usr/bin/startlubuntu b/usr/bin/startlubuntu index 98cae6c..a4bb704 100644 --- a/usr/bin/startlubuntu +++ b/usr/bin/startlubuntu @@ -29,6 +29,18 @@ if [ ! -f "$PCMANFM_CONF_DIR/main.lubuntu" ]; then cp /usr/share/lubuntu/pcmanfm/main.lubuntu "$PCMANFM_CONF_DIR/main.lubuntu" fi +if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then + mkdir -p "$PCMANFM_CONF_DIR" + cp /usr/share/lubuntu/pcmanfm/main.lubuntu "$PCMANFM_CONF_DIR/pcmanfm.conf" +fi + +# Ensure the existance of pcmanfm config file +LIBFM_CONF_DIR="$XDG_CONFIG_HOME/libfm" +if [ ! -f "$LIBFM_CONF_DIR/libfm.conf" ]; then + mkdir -p "$LIBFM_CONF_DIR" + cp /etc/xdg/lubuntu/libfm/libfm.conf "$LIBFM_CONF_DIR/libfm.conf" +fi + # Ensure the existance of openbox config file OPENBOX_CONF_DIR="$XDG_CONFIG_HOME/openbox" if [ ! -f "$OPENBOX_CONF_DIR/lubuntu-rc.xml" ]; then diff --git a/usr/bin/startlubuntu-netbook b/usr/bin/startlubuntu-netbook index 5d99b4b..17531e9 100644 --- a/usr/bin/startlubuntu-netbook +++ b/usr/bin/startlubuntu-netbook @@ -29,6 +29,18 @@ if [ ! -f "$PCMANFM_CONF_DIR/main.lubuntu" ]; then cp /usr/share/lubuntu/pcmanfm/main.lubuntu "$PCMANFM_CONF_DIR/main.lubuntu" fi +if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then + mkdir -p "$PCMANFM_CONF_DIR" + cp /usr/share/lubuntu/pcmanfm/main.lubuntu "$PCMANFM_CONF_DIR/pcmanfm.conf" +fi + +# Ensure the existance of pcmanfm config file +LIBFM_CONF_DIR="$XDG_CONFIG_HOME/libfm" +if [ ! -f "$LIBFM_CONF_DIR/libfm.conf" ]; then + mkdir -p "$LIBFM_CONF_DIR" + cp /etc/xdg/lubuntu/libfm/libfm.conf "$LIBFM_CONF_DIR/libfm.conf" +fi + # Ensure the existance of openbox config file OPENBOX_CONF_DIR="$XDG_CONFIG_HOME/openbox" if [ ! -f "$OPENBOX_CONF_DIR/lubuntu-rc.xml" ]; then diff --git a/usr/share/lubuntu/pcmanfm/pcmanfm.conf b/usr/share/lubuntu/pcmanfm/pcmanfm.conf new file mode 100644 index 0000000..e69de29 From ab0c3ea3247ed20c4a3a0f66e6e0ec03de8dd2f0 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Tue, 23 Feb 2010 22:05:15 +0100 Subject: [PATCH 04/22] Update libfm.conf and pcmanfm.conf --- etc/xdg/lubuntu/libfm/libfm.conf | 5 +++-- usr/share/lubuntu/pcmanfm/pcmanfm.conf | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/etc/xdg/lubuntu/libfm/libfm.conf b/etc/xdg/lubuntu/libfm/libfm.conf index 5d3cd0a..68b0941 100644 --- a/etc/xdg/lubuntu/libfm/libfm.conf +++ b/etc/xdg/lubuntu/libfm/libfm.conf @@ -1,13 +1,14 @@ [config] -single_click=1 +single_click=0 use_trash=1 confirm_del=1 +terminal=lxterminal %s thumbnail_local=1 thumbnail_max=2048 [ui] big_icon_size=48 small_icon_size=24 -thumbnail_size=128 pane_icon_size=24 +thumbnail_size=128 show_thumbnail=1 diff --git a/usr/share/lubuntu/pcmanfm/pcmanfm.conf b/usr/share/lubuntu/pcmanfm/pcmanfm.conf index e69de29..0a1b578 100644 --- a/usr/share/lubuntu/pcmanfm/pcmanfm.conf +++ b/usr/share/lubuntu/pcmanfm/pcmanfm.conf @@ -0,0 +1,20 @@ +[config] +bm_open_method=0 +su_cmd=gksu %s + +[desktop] +wallpaper_mode=1 +wallpaper=/usr/share/lubuntu/wallpapers/lubuntu-default-wallpaper.png +desktop_bg=#000000 +desktop_fg=#ffffff +desktop_shadow=#000000 + +[ui] +always_show_tabs=0 +hide_close_btn=0 +win_width=798 +win_height=547 +view_mode=0 +show_hidden=0 +sort_type=0 +sort_by=0 From c5710d544cadb784be8e308ae622191a0d9afd15 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Wed, 24 Feb 2010 21:32:59 +0100 Subject: [PATCH 05/22] Fix pcmanfm invocation --- etc/xdg/lxsession/Lubuntu-Netbook/autostart | 2 +- etc/xdg/lxsession/Lubuntu/autostart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/xdg/lxsession/Lubuntu-Netbook/autostart b/etc/xdg/lxsession/Lubuntu-Netbook/autostart index 2a0bb0f..6afe616 100644 --- a/etc/xdg/lxsession/Lubuntu-Netbook/autostart +++ b/etc/xdg/lxsession/Lubuntu-Netbook/autostart @@ -3,4 +3,4 @@ @lxpanel --profile Lubuntu @xscreensaver -no-splash @gnome-power-manager -@pcmanfm -d +@pcmanfm --desktop diff --git a/etc/xdg/lxsession/Lubuntu/autostart b/etc/xdg/lxsession/Lubuntu/autostart index 99c1d1b..e972eef 100644 --- a/etc/xdg/lxsession/Lubuntu/autostart +++ b/etc/xdg/lxsession/Lubuntu/autostart @@ -2,4 +2,4 @@ @lxpanel --profile Lubuntu @xscreensaver -no-splash @gnome-power-manager -@pcmanfm -d +@pcmanfm --desktop From 967c3077e09d3114e42581219577c34de036fb31 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Wed, 24 Feb 2010 21:33:14 +0100 Subject: [PATCH 06/22] debian/control: Depends on the re-written pcmanfm2 (>= 0.7.0) --- debian/changelog | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5e6312d..e25ec66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ lubuntu-default-settings (0.6) UNRELEASED; urgency=low * Set iconsize to 22 and panel height to 24 for panel settings. It displays correct icons size for panel icons. Thanks Leszek Lesner. - * debian/control: Depends on the re-written pcmanfm (>= 0.9.0) + * debian/control: Depends on the re-written pcmanfm2 (>= 0.7.0) * autostart: Use new pcmanfm --desktop command to start pcmanfm with desktop management. * usr/bin/start* : Ensure configuration files for libfm and pcmanfm2. diff --git a/debian/control b/debian/control index 74f3c7a..620bb22 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,6 @@ Vcs-Browser: http://bazaar.launchpad.net/~lubuntu-desktop/+junk/lubuntu-default- Package: lubuntu-default-settings Architecture: all -Depends: ${misc:Depends}, lxsession (>= 0.4.1), lubuntu-artwork (>= 0.4), elementary-icon-theme, pcmanfm (>= 0.9.0~) +Depends: ${misc:Depends}, lxsession (>= 0.4.1), lubuntu-artwork (>= 0.4), elementary-icon-theme, pcmanfm2 (>= 0.7.0) Description: default settings for Lubuntu Various system settings tailored for Lubuntu. From e9d898be233d844d68af6d0569bd30401a762af8 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Wed, 24 Feb 2010 21:38:52 +0100 Subject: [PATCH 07/22] Fix pcmanfm.conf cp typo --- usr/bin/startlubuntu | 2 +- usr/bin/startlubuntu-netbook | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr/bin/startlubuntu b/usr/bin/startlubuntu index a4bb704..9a33990 100644 --- a/usr/bin/startlubuntu +++ b/usr/bin/startlubuntu @@ -31,7 +31,7 @@ fi if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then mkdir -p "$PCMANFM_CONF_DIR" - cp /usr/share/lubuntu/pcmanfm/main.lubuntu "$PCMANFM_CONF_DIR/pcmanfm.conf" + cp /usr/share/lubuntu/pcmanfm/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf" fi # Ensure the existance of pcmanfm config file diff --git a/usr/bin/startlubuntu-netbook b/usr/bin/startlubuntu-netbook index 17531e9..d02d9ec 100644 --- a/usr/bin/startlubuntu-netbook +++ b/usr/bin/startlubuntu-netbook @@ -31,7 +31,7 @@ fi if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then mkdir -p "$PCMANFM_CONF_DIR" - cp /usr/share/lubuntu/pcmanfm/main.lubuntu "$PCMANFM_CONF_DIR/pcmanfm.conf" + cp /usr/share/lubuntu/pcmanfm/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf" fi # Ensure the existance of pcmanfm config file From d6a832122726a795c80359343f92aadd8d5579a0 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Wed, 24 Feb 2010 21:41:33 +0100 Subject: [PATCH 08/22] Use pcmanfm2.desktop in lxpanel panel settings. --- debian/changelog | 3 ++- usr/share/lxpanel/profile/Lubuntu/panels/panel | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e25ec66..b292039 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,9 @@ lubuntu-default-settings (0.6) UNRELEASED; urgency=low * autostart: Use new pcmanfm --desktop command to start pcmanfm with desktop management. * usr/bin/start* : Ensure configuration files for libfm and pcmanfm2. + * Use pcmanfm2.desktop in lxpanel panel settings. - -- Julien Lavergne Fri, 19 Feb 2010 22:28:28 +0100 + -- Julien Lavergne Wed, 24 Feb 2010 21:40:19 +0100 lubuntu-default-settings (0.5) lucid; urgency=low diff --git a/usr/share/lxpanel/profile/Lubuntu/panels/panel b/usr/share/lxpanel/profile/Lubuntu/panels/panel index a0f5f85..7557662 100644 --- a/usr/share/lxpanel/profile/Lubuntu/panels/panel +++ b/usr/share/lxpanel/profile/Lubuntu/panels/panel @@ -44,7 +44,7 @@ Plugin { type = launchbar Config { Button { - id=pcmanfm.desktop + id=pcmanfm2.desktop } Button { id=chromium-browser.desktop From 69a94f7098a3490ab607353b25c305f52de1efea Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sat, 27 Feb 2010 18:05:27 +0100 Subject: [PATCH 09/22] Add custom defaults.list for applications by default. --- debian/changelog | 1 + etc/xdg/lubuntu/applications/defaults.list | 177 +++++++++++++++++++++ 2 files changed, 178 insertions(+) create mode 100644 etc/xdg/lubuntu/applications/defaults.list diff --git a/debian/changelog b/debian/changelog index b292039..5eb959d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ lubuntu-default-settings (0.6) UNRELEASED; urgency=low management. * usr/bin/start* : Ensure configuration files for libfm and pcmanfm2. * Use pcmanfm2.desktop in lxpanel panel settings. + * Add custom defaults.list for applications by default. -- Julien Lavergne Wed, 24 Feb 2010 21:40:19 +0100 diff --git a/etc/xdg/lubuntu/applications/defaults.list b/etc/xdg/lubuntu/applications/defaults.list new file mode 100644 index 0000000..0b9bc8c --- /dev/null +++ b/etc/xdg/lubuntu/applications/defaults.list @@ -0,0 +1,177 @@ +[Default Applications] +application/csv=gnumeric.desktop +application/excel=gnumeric.desktop +application/msexcel=gnumeric.desktop +application/msword=abiword.desktop +application/ogg=aqualung.desktop +application/pdf=epdfview.desktop +application/postscript=epdfview.desktop +application/rtf=abiword.desktop +application/tab-separated-values=gnumeric.desktop +application/vnd.lotus-1-2-3=gnumeric.desktop +application/vnd.ms-excel=gnumeric.desktop +application/vnd.ms-word=abiword.desktop +application/vnd.rn-realmedia=gnome-mplayer.desktop +application/vnd.sun.xml.calc=gnumeric.desktop +application/vnd.sun.xml.calc.template=gnumeric.desktop +application/vnd.sun.xml.draw=ooo2-impress.desktop +application/vnd.sun.xml.draw.template=ooo2-impress.desktop +application/vnd.sun.xml.math=ooo2-math.desktop +application/vnd.sun.xml.writer=abiword.desktop +application/vnd.sun.xml.writer.template=abiword.desktop +application/vnd.sun.xml.writer.global=abiword.desktop +application/vnd.oasis.opendocument.formula=ooo2-math.desktop +application/vnd.oasis.opendocument.graphics=ooo2-draw.desktop +application/vnd.oasis.opendocument.graphics-template=ooo2-draw.desktop +application/vnd.oasis.opendocument.presentation=ooo2-impress.desktop +application/vnd.oasis.opendocument.presentation-template=ooo2-impress.desktop +application/vnd.oasis.opendocument.spreadsheet=gnumeric.desktop +application/vnd.oasis.opendocument.spreadsheet-template=gnumeric.desktop +application/vnd.oasis.opendocument.text=abiword.desktop +application/vnd.oasis.opendocument.text-template=abiword.desktop +application/vnd.oasis.opendocument.text-web=abiword.desktop +application/vnd.oasis.opendocument.text-master=abiword.desktop +application/vnd.sun.xml.impress=ooo2-impress.desktop +application/vnd.sun.xml.impress.template=ooo2-impress.desktop +application/vnd.stardivision.calc=gnumeric.desktop +application/vnd.stardivision.draw=ooo2-draw.desktop +application/vnd.stardivision.impress=ooo2-impress.desktop +application/vnd.stardivision.math=ooo2-math.desktop +application/vnd.stardivision.writer=abiword.desktop +application/mspowerpoint=ooo2-impress.desktop +application/vnd.ms-powerpoint=ooo2-impress.desktop +application/vnd.wordperfect=abiword.desktop +application/wordperfect=abiword.desktop +application/x-123=gnumeric.desktop +application/x-abiword=abiword.desktop +application/x-applix-spreadsheet=gnumeric.desktop +application/x-ar=xarchiver.desktop +application/x-arj=xarchiver.desktop +application/x-bzip-compressed-tar=xarchiver.desktop +application/x-bzip=xarchiver.desktop +application/x-cd-image=xarchiver.desktop +application/x-compressed-tar=xarchiver.desktop +application/x-compress=xarchiver.desktop +application/x-deb=gdebi.desktop +application/x-debian-package=gdebi.desktop +application/x-dos_ms_excel=gnumeric.desktop +application/x-ear=xarchiver.desktop +application/x-excel=gnumeric.desktop +application/x-extension-m4a=gnome-mplayer.desktop +application/x-extension-mp4=gnome-mplayer.desktop +application/x-flac=aqualung.desktop +application/x-glade=glade-2.desktop +application/x-gnumeric=gnumeric.desktop +application/x-gtar=xarchiver.desktop +application/x-gzip=xarchiver.desktop +application/x-gzpostscript=epdfview.desktop +application/xhtml+xml=chromium-browser.desktop +application/x-jar=xarchiver.desktop +application/x-java-archive=xarchiver.desktop +application/x-lha=xarchiver.desktop +application/x-lhz=xarchiver.desktop +application/xls=gnumeric.desktop +application/x-lzop=xarchiver.desktop +application/x-matroska=gnome-mplayer.desktop +application/x-mps=gnumeric.desktop +application/x-ms-excel=gnumeric.desktop +application/x-msexcel=gnumeric.desktop +application/x-ogg=aqualung.desktop +application/x-oleo=gnumeric.desktop +application/x-perl=leafpad.desktop +application/x-planperfect=gnumeric.desktop +application/x-quattropro=gnumeric.desktop +application/x-rar-compressed=xarchiver.desktop +application/x-rar=xarchiver.desktop +application/x-rpm=xarchiver.desktop +application/x-sc=gnumeric.desktop +application/x-shockwave-flash=gnome-mplayer.desktop +application/x-sylk=gnumeric.desktop +application/x-tar=xarchiver.desktop +application/x-war=xarchiver.desktop +application/x-xbase=gnumeric.desktop +application/x-xls=gnumeric.desktop +application/x-zip-compressed=xarchiver.desktop +application/x-zip=xarchiver.desktop +application/x-zoo=xarchiver.desktop +application/zip=xarchiver.desktop +audio/mpeg=aqualung.desktop +audio/mpegurl=aqualung.desktop +audio/vnd.rn-realaudio=aqualung.desktop +audio/x-flac=aqualung.desktop +audio/x-m4a=aqualung.desktop +audio/x-mp3=aqualung.desktop +audio/x-mpeg=aqualung.desktop +audio/x-mpegurl=aqualung.desktop +audio/x-ms-asf=aqualung.desktop +audio/x-ms-asx=aqualung.desktop +audio/x-ms-wax=aqualung.desktop +audio/x-pn-aiff=aqualung.desktop +audio/x-pn-au=aqualung.desktop +audio/x-pn-realaudio-plugin=aqualung.desktop +audio/x-pn-realaudio=aqualung.desktop +audio/x-pn-wav=aqualung.desktop +audio/x-pn-windows-acm=aqualung.desktop +audio/x-real-audio=aqualung.desktop +audio/x-scpls=aqualung.desktop +audio/x-wav=aqualung.desktop +image/bmp=gpicview.desktop +image/gif=gpicview.desktop +image/jpeg=gpicview.desktop +image/jpg=gpicview.desktop +image/pjpeg=gpicview.desktop +image/png=gpicview.desktop +image/svg+xml=gpicview.desktop +image/tiff=gpicview.desktop +image/vnd.rn-realpix=gnome-mplayer.desktop +image/x-bmp=gpicview.desktop +image/x-gray=gpicview.desktop +image/x-icb=gpicview.desktop +image/x-ico=gpicview.desktop +image/x-png=gpicview.desktop +image/x-portable-anymap=gpicview.desktop +image/x-portable-bitmap=gpicview.desktop +image/x-portable-graymap=gpicview.desktop +image/x-portable-pixmap=gpicview.desktop +image/x-psd=gpicview.desktop +image/x-xbitmap=gpicview.desktop +image/x-xpixmap=gpicview.desktop +inode/directory=pcmanfm.desktop +misc/ultravox=totem.desktop +multipart/x-zip=xarchiver.desktop +text/abiword=abiword.desktop +text/comma-separated-values=gnumeric.desktop +text/csv=gnumeric.desktop +text/html=chromium-browser.desktop +text/plain=leafpad.desktop +text/richtext=abiword.desktop +text/rtf=abiword.desktop +text/spreadsheet=gnumeric.desktop +text/tab-separated-values=gnumeric.desktop +text/x-comma-separated-values=gnumeric.desktop +text/x-chdr=leafpad.desktop +text/x-csrc=leafpad.desktop +text/x-dtd=leafpad.desktop +text/x-java=leafpad.desktop +text/mathml=leafpad.desktop +text/x-python=leafpad.desktop +text/x-sql=leafpad.desktop +text/xml=chromium-browser.desktop +video/dv=gnome-mplayer.desktop +video/mp4=gnome-mplayer.desktop +video/mpeg=gnome-mplayer.desktop +video/msvideo=gnome-mplayer.desktop +video/quicktime=gnome-mplayer.desktop +video/vnd.rn-realvideo=gnome-mplayer.desktop +video/ogv=gnome-mplayer.desktop +video/x-anim=gnome-mplayer.desktop +video/x-avi=gnome-mplayer.desktop +video/x-flc=gnome-mplayer.desktop +video/x-fli=gnome-mplayer.desktop +video/x-mpeg=gnome-mplayer.desktop +video/x-ms-asf=gnome-mplayer.desktop +video/x-msvideo=gnome-mplayer.desktop +video/x-ms-wmv=gnome-mplayer.desktop +video/x-nsv=gnome-mplayer.desktop +x-directory/normal=pcmanfm.desktop +zz-application/zz-winassoc-xls=gnumeric.desktop From 307995389dcb809eca79b13355748fb748b4d770 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sat, 27 Feb 2010 18:07:53 +0100 Subject: [PATCH 10/22] * usr/bin/start* : - Ensure configuration files for libfm and pcmanfm2. - From LXDE upstream, make sur dbus is launched when it's necessary. --- debian/changelog | 4 +++- usr/bin/startlubuntu | 5 +++++ usr/bin/startlubuntu-netbook | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5eb959d..e57732c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,9 @@ lubuntu-default-settings (0.6) UNRELEASED; urgency=low * debian/control: Depends on the re-written pcmanfm2 (>= 0.7.0) * autostart: Use new pcmanfm --desktop command to start pcmanfm with desktop management. - * usr/bin/start* : Ensure configuration files for libfm and pcmanfm2. + * usr/bin/start* : + - Ensure configuration files for libfm and pcmanfm2. + - From LXDE upstream, make sur dbus is launched when it's necessary. * Use pcmanfm2.desktop in lxpanel panel settings. * Add custom defaults.list for applications by default. diff --git a/usr/bin/startlubuntu b/usr/bin/startlubuntu index 9a33990..9faa5ae 100644 --- a/usr/bin/startlubuntu +++ b/usr/bin/startlubuntu @@ -59,5 +59,10 @@ xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _ # Enable GTK+2 integration for OpenOffice.org, if available. export SAL_USE_VCLPLUGIN=gtk +# Launch DBus if needed +if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then + eval "$(dbus-launch --sh-syntax --exit-with-session)" +fi + # Start the LXDE session exec /usr/bin/lxsession -s Lubuntu -e LXDE diff --git a/usr/bin/startlubuntu-netbook b/usr/bin/startlubuntu-netbook index d02d9ec..1c72815 100644 --- a/usr/bin/startlubuntu-netbook +++ b/usr/bin/startlubuntu-netbook @@ -59,5 +59,10 @@ xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _ # Enable GTK+2 integration for OpenOffice.org, if available. export SAL_USE_VCLPLUGIN=gtk +# Launch DBus if needed +if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then + eval "$(dbus-launch --sh-syntax --exit-with-session)" +fi + # Start the LXDE session exec /usr/bin/lxsession -s Lubuntu-Netbook -e LXDE From ddfc63c184fdcede3bbdb3aa2593bebed1f98fb8 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sat, 27 Feb 2010 19:45:05 +0100 Subject: [PATCH 11/22] Format changelog --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e57732c..53bb724 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,8 @@ lubuntu-default-settings (0.6) UNRELEASED; urgency=low * Set iconsize to 22 and panel height to 24 for panel settings. It displays correct icons size for panel icons. Thanks Leszek Lesner. * debian/control: Depends on the re-written pcmanfm2 (>= 0.7.0) - * autostart: Use new pcmanfm --desktop command to start pcmanfm with desktop - management. + * autostart: + - Use new pcmanfm --desktop command to start pcmanfm with desktop management * usr/bin/start* : - Ensure configuration files for libfm and pcmanfm2. - From LXDE upstream, make sur dbus is launched when it's necessary. From baa4f573294497f1829934b7284cac3548b27fb5 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sat, 27 Feb 2010 19:46:38 +0100 Subject: [PATCH 12/22] Add polkit-gnome-authentification-agent-1 --- debian/changelog | 1 + etc/xdg/lxsession/Lubuntu-Netbook/autostart | 1 + etc/xdg/lxsession/Lubuntu/autostart | 1 + 3 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 53bb724..d87d20a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ lubuntu-default-settings (0.6) UNRELEASED; urgency=low * debian/control: Depends on the re-written pcmanfm2 (>= 0.7.0) * autostart: - Use new pcmanfm --desktop command to start pcmanfm with desktop management + - Add polkit-gnome-authentification-agent-1 * usr/bin/start* : - Ensure configuration files for libfm and pcmanfm2. - From LXDE upstream, make sur dbus is launched when it's necessary. diff --git a/etc/xdg/lxsession/Lubuntu-Netbook/autostart b/etc/xdg/lxsession/Lubuntu-Netbook/autostart index 6afe616..9bdc5f6 100644 --- a/etc/xdg/lxsession/Lubuntu-Netbook/autostart +++ b/etc/xdg/lxsession/Lubuntu-Netbook/autostart @@ -4,3 +4,4 @@ @xscreensaver -no-splash @gnome-power-manager @pcmanfm --desktop +@/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 diff --git a/etc/xdg/lxsession/Lubuntu/autostart b/etc/xdg/lxsession/Lubuntu/autostart index e972eef..2cbc956 100644 --- a/etc/xdg/lxsession/Lubuntu/autostart +++ b/etc/xdg/lxsession/Lubuntu/autostart @@ -3,3 +3,4 @@ @xscreensaver -no-splash @gnome-power-manager @pcmanfm --desktop +@/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 From 025f30186f808acadb40aab389edc7a77c0c97c5 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sat, 27 Feb 2010 19:56:15 +0100 Subject: [PATCH 13/22] dirs: Add /etc/lxdm, to be sure the directory exit (LP: #527482) --- debian/changelog | 1 + debian/dirs | 1 + 2 files changed, 2 insertions(+) create mode 100644 debian/dirs diff --git a/debian/changelog b/debian/changelog index d87d20a..b428848 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ lubuntu-default-settings (0.6) UNRELEASED; urgency=low - From LXDE upstream, make sur dbus is launched when it's necessary. * Use pcmanfm2.desktop in lxpanel panel settings. * Add custom defaults.list for applications by default. + * dirs: Add /etc/lxdm, to be sure the directory exit (LP: #527482) -- Julien Lavergne Wed, 24 Feb 2010 21:40:19 +0100 diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..cc94349 --- /dev/null +++ b/debian/dirs @@ -0,0 +1 @@ +/etc/lxdm From 3ec797347415c9504c9dc0f14ac941488ac93549 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sun, 28 Feb 2010 13:31:37 +0100 Subject: [PATCH 14/22] Add & to pcmanfm --desktop to workaround a weird bug in menu://applications --- etc/xdg/lxsession/Lubuntu-Netbook/autostart | 2 +- etc/xdg/lxsession/Lubuntu/autostart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/xdg/lxsession/Lubuntu-Netbook/autostart b/etc/xdg/lxsession/Lubuntu-Netbook/autostart index 9bdc5f6..3de9d19 100644 --- a/etc/xdg/lxsession/Lubuntu-Netbook/autostart +++ b/etc/xdg/lxsession/Lubuntu-Netbook/autostart @@ -3,5 +3,5 @@ @lxpanel --profile Lubuntu @xscreensaver -no-splash @gnome-power-manager -@pcmanfm --desktop +@pcmanfm --desktop & @/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 diff --git a/etc/xdg/lxsession/Lubuntu/autostart b/etc/xdg/lxsession/Lubuntu/autostart index 2cbc956..181b0cc 100644 --- a/etc/xdg/lxsession/Lubuntu/autostart +++ b/etc/xdg/lxsession/Lubuntu/autostart @@ -2,5 +2,5 @@ @lxpanel --profile Lubuntu @xscreensaver -no-splash @gnome-power-manager -@pcmanfm --desktop +@pcmanfm --desktop & @/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 From 36e857f4846fed339695372c157e63fc919f5d83 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sun, 7 Mar 2010 13:12:56 +0100 Subject: [PATCH 15/22] Fix for profile support in pcmanfm --- .../pcmanfm.conf => etc/xdg/lubuntu/pcmanfm/lubuntu.conf | 0 etc/xdg/lxsession/Lubuntu/autostart | 2 +- usr/bin/startlubuntu | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename usr/share/lubuntu/pcmanfm/pcmanfm.conf => etc/xdg/lubuntu/pcmanfm/lubuntu.conf (100%) diff --git a/usr/share/lubuntu/pcmanfm/pcmanfm.conf b/etc/xdg/lubuntu/pcmanfm/lubuntu.conf similarity index 100% rename from usr/share/lubuntu/pcmanfm/pcmanfm.conf rename to etc/xdg/lubuntu/pcmanfm/lubuntu.conf diff --git a/etc/xdg/lxsession/Lubuntu/autostart b/etc/xdg/lxsession/Lubuntu/autostart index 2cbc956..ecd7530 100644 --- a/etc/xdg/lxsession/Lubuntu/autostart +++ b/etc/xdg/lxsession/Lubuntu/autostart @@ -2,5 +2,5 @@ @lxpanel --profile Lubuntu @xscreensaver -no-splash @gnome-power-manager -@pcmanfm --desktop +@pcmanfm --desktop --profile lubuntu @/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 diff --git a/usr/bin/startlubuntu b/usr/bin/startlubuntu index 9faa5ae..410a8a9 100644 --- a/usr/bin/startlubuntu +++ b/usr/bin/startlubuntu @@ -31,7 +31,7 @@ fi if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then mkdir -p "$PCMANFM_CONF_DIR" - cp /usr/share/lubuntu/pcmanfm/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf" + cp /etc/xdg/lubuntu/pcmanfm/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf" fi # Ensure the existance of pcmanfm config file From 8064dfccf3da168dc0e0d88d0e113b3c99020ce7 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sun, 7 Mar 2010 14:34:31 +0100 Subject: [PATCH 16/22] Move pcmanfm conf in correct place Remove useless cp in start* --- debian/changelog | 1 - etc/xdg/{lubuntu => }/pcmanfm/lubuntu.conf | 0 usr/bin/startlubuntu | 12 ------------ usr/bin/startlubuntu-netbook | 12 ------------ 4 files changed, 25 deletions(-) rename etc/xdg/{lubuntu => }/pcmanfm/lubuntu.conf (100%) diff --git a/debian/changelog b/debian/changelog index 969e872..188575b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,6 @@ lubuntu-default-settings (0.7) UNRELEASED; urgency=low * debian/control: Depends on the re-written pcmanfm2 (>= 0.7.0) * autostart: - Use new pcmanfm --desktop command to start pcmanfm with desktop management - - Ensure configuration files for libfm and pcmanfm2. * Use pcmanfm2.desktop in lxpanel panel settings. * usr/bin/start* : - Install a custom preferences file for Chromium. diff --git a/etc/xdg/lubuntu/pcmanfm/lubuntu.conf b/etc/xdg/pcmanfm/lubuntu.conf similarity index 100% rename from etc/xdg/lubuntu/pcmanfm/lubuntu.conf rename to etc/xdg/pcmanfm/lubuntu.conf diff --git a/usr/bin/startlubuntu b/usr/bin/startlubuntu index cf77377..b8473a4 100644 --- a/usr/bin/startlubuntu +++ b/usr/bin/startlubuntu @@ -29,18 +29,6 @@ if [ ! -f "$PCMANFM_CONF_DIR/main.lubuntu" ]; then cp /usr/share/lubuntu/pcmanfm/main.lubuntu "$PCMANFM_CONF_DIR/main.lubuntu" fi -if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then - mkdir -p "$PCMANFM_CONF_DIR" - cp /etc/xdg/lubuntu/pcmanfm/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf" -fi - -# Ensure the existance of pcmanfm config file -LIBFM_CONF_DIR="$XDG_CONFIG_HOME/libfm" -if [ ! -f "$LIBFM_CONF_DIR/libfm.conf" ]; then - mkdir -p "$LIBFM_CONF_DIR" - cp /etc/xdg/lubuntu/libfm/libfm.conf "$LIBFM_CONF_DIR/libfm.conf" -fi - # Ensure the existance of openbox config file OPENBOX_CONF_DIR="$XDG_CONFIG_HOME/openbox" if [ ! -f "$OPENBOX_CONF_DIR/lubuntu-rc.xml" ]; then diff --git a/usr/bin/startlubuntu-netbook b/usr/bin/startlubuntu-netbook index f1bf9c3..b3c48fb 100644 --- a/usr/bin/startlubuntu-netbook +++ b/usr/bin/startlubuntu-netbook @@ -29,18 +29,6 @@ if [ ! -f "$PCMANFM_CONF_DIR/main.lubuntu" ]; then cp /usr/share/lubuntu/pcmanfm/main.lubuntu "$PCMANFM_CONF_DIR/main.lubuntu" fi -if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then - mkdir -p "$PCMANFM_CONF_DIR" - cp /usr/share/lubuntu/pcmanfm/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf" -fi - -# Ensure the existance of pcmanfm config file -LIBFM_CONF_DIR="$XDG_CONFIG_HOME/libfm" -if [ ! -f "$LIBFM_CONF_DIR/libfm.conf" ]; then - mkdir -p "$LIBFM_CONF_DIR" - cp /etc/xdg/lubuntu/libfm/libfm.conf "$LIBFM_CONF_DIR/libfm.conf" -fi - # Ensure the existance of openbox config file OPENBOX_CONF_DIR="$XDG_CONFIG_HOME/openbox" if [ ! -f "$OPENBOX_CONF_DIR/lubuntu-rc.xml" ]; then From 2299f1fc0c5b8046e11c1d4f6fa7b3a6c2b86ee2 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sat, 20 Mar 2010 11:00:05 +0100 Subject: [PATCH 17/22] Fix sorting --- etc/xdg/pcmanfm/lubuntu.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/xdg/pcmanfm/lubuntu.conf b/etc/xdg/pcmanfm/lubuntu.conf index 0a1b578..6092642 100644 --- a/etc/xdg/pcmanfm/lubuntu.conf +++ b/etc/xdg/pcmanfm/lubuntu.conf @@ -17,4 +17,4 @@ win_height=547 view_mode=0 show_hidden=0 sort_type=0 -sort_by=0 +sort_by=2 From 4d96d95f9205507f28e6f6e137fa1f576a33dac2 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sat, 20 Mar 2010 11:00:35 +0100 Subject: [PATCH 18/22] openbox/menu.xml : Use new command to launch desktop settings. --- debian/changelog | 3 ++- usr/share/lubuntu/openbox/menu.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 188575b..193cd10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,9 @@ lubuntu-default-settings (0.7) UNRELEASED; urgency=low * usr/bin/start* : - Install a custom preferences file for Chromium. - Ensure the menu prefix + * openbox/menu.xml : Use new command to launch desktop settings. - -- Julien Lavergne Mon, 01 Mar 2010 00:38:35 +0100 + -- Julien Lavergne Sat, 20 Mar 2010 10:58:33 +0100 lubuntu-default-settings (0.6) lucid; urgency=low diff --git a/usr/share/lubuntu/openbox/menu.xml b/usr/share/lubuntu/openbox/menu.xml index e353502..72816ed 100644 --- a/usr/share/lubuntu/openbox/menu.xml +++ b/usr/share/lubuntu/openbox/menu.xml @@ -25,7 +25,7 @@ yes - pcmanfm --show-pref 2 + pcmanfm --desktop-pref From 1ffb7bfac285b3f8a998311c06a4a5a2339c47e4 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sat, 10 Apr 2010 18:49:39 +0200 Subject: [PATCH 19/22] Make sure the directory exist for Chromium settings --- usr/bin/startlubuntu | 1 + usr/bin/startlubuntu-netbook | 1 + 2 files changed, 2 insertions(+) diff --git a/usr/bin/startlubuntu b/usr/bin/startlubuntu index b8473a4..5f43d6c 100644 --- a/usr/bin/startlubuntu +++ b/usr/bin/startlubuntu @@ -43,6 +43,7 @@ fi # Install custom chromium-browser configuration if [ ! -f "$XDG_CONFIG_HOME/chromium/Default/Preferences" ]; then + mkdir -p "$XDG_CONFIG_HOME/chromium/Default/" cp /etc/xdg/lubuntu/chromium-browser/Preferences "$XDG_CONFIG_HOME/chromium/Default/Preferences" fi diff --git a/usr/bin/startlubuntu-netbook b/usr/bin/startlubuntu-netbook index b3c48fb..cce64ab 100644 --- a/usr/bin/startlubuntu-netbook +++ b/usr/bin/startlubuntu-netbook @@ -43,6 +43,7 @@ fi # Install custom chromium-browser configuration if [ ! -f "$XDG_CONFIG_HOME/chromium/Default/Preferences" ]; then + mkdir -p "$XDG_CONFIG_HOME/chromium/Default/" cp /etc/xdg/lubuntu/chromium-browser/Preferences "$XDG_CONFIG_HOME/chromium/Default/Preferences" fi From 90d5411526b5b8b5c8e52072b67e5047e04651c3 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Tue, 1 Jun 2010 22:07:44 +0200 Subject: [PATCH 20/22] Depends on the re-written pcmanfm (>= 0.9.5). --- debian/changelog | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 31331fb..b5bd605 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ lubuntu-default-settings (0.8) UNRELEASED; urgency=low * debian/control - - Depends on the re-written pcmanfm2 (>= 0.7.0) + - Depends on the re-written pcmanfm (>= 0.9.5). * usr/share/lubuntu/openbox/menu.xml: - Use new command to launch desktop settings. * autostart: diff --git a/debian/control b/debian/control index b27ba8f..215205e 100644 --- a/debian/control +++ b/debian/control @@ -15,6 +15,6 @@ Depends: ${misc:Depends}, lxsession (>= 0.4.1), lubuntu-artwork (>= 0.4), elementary-icon-theme, - pcmanfm2 (>= 0.7.0) + pcmanfm (>= 0.9.5) Description: default settings for Lubuntu Various system settings tailored for Lubuntu. From 45ebc46262ebcc291f6e6a2fc16d0ed89d7f1389 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Tue, 1 Jun 2010 22:10:24 +0200 Subject: [PATCH 21/22] Revert change of desktop file in lxpanel settings. --- debian/changelog | 1 - usr/share/lxpanel/profile/Lubuntu/panels/panel | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b5bd605..5551c2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,6 @@ lubuntu-default-settings (0.8) UNRELEASED; urgency=low - Use new command to launch desktop settings. * autostart: - Use new pcmanfm --desktop command to start pcmanfm with desktop management - * Use pcmanfm2.desktop in lxpanel panel settings. -- Julien Lavergne Fri, 21 May 2010 19:32:01 +0200 diff --git a/usr/share/lxpanel/profile/Lubuntu/panels/panel b/usr/share/lxpanel/profile/Lubuntu/panels/panel index 7557662..a0f5f85 100644 --- a/usr/share/lxpanel/profile/Lubuntu/panels/panel +++ b/usr/share/lxpanel/profile/Lubuntu/panels/panel @@ -44,7 +44,7 @@ Plugin { type = launchbar Config { Button { - id=pcmanfm2.desktop + id=pcmanfm.desktop } Button { id=chromium-browser.desktop From 12b99cf9de3e27ca0a2450e007cc5d6a5c0ad04b Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Tue, 1 Jun 2010 22:18:52 +0200 Subject: [PATCH 22/22] Rename also command in openbox rc.xml. --- usr/share/lubuntu/openbox/rc.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/share/lubuntu/openbox/rc.xml b/usr/share/lubuntu/openbox/rc.xml index c2de821..45b0154 100644 --- a/usr/share/lubuntu/openbox/rc.xml +++ b/usr/share/lubuntu/openbox/rc.xml @@ -361,7 +361,7 @@         -       pcmanfm2 +       pcmanfm