wok-6.x rev 684

Up: openbox (3.4.7.2) with new pipe menu
author Christophe Lincoln <pankso@slitaz.org>
date Fri Apr 25 16:12:19 2008 +0200 (2008-04-25)
parents ffc85adee781
children c7fced46d479
files openbox/receipt openbox/stuff/open-folder-menu.sh openbox/stuff/openbox/autostart.sh openbox/stuff/openbox/menu.xml
line diff
     1.1 --- a/openbox/receipt	Fri Apr 25 12:40:49 2008 +0200
     1.2 +++ b/openbox/receipt	Fri Apr 25 16:12:19 2008 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="openbox"
     1.7 -VERSION="3.4.7.1"
     1.8 +VERSION="3.4.7.2"
     1.9  CATEGORY="x-window"
    1.10  SHORT_DESC="Small-footprint and standard compliant Window Manager."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12 @@ -30,7 +30,7 @@
    1.13  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.14  genpkg_rules()
    1.15  {
    1.16 -	mkdir -p $fs/usr/lib $fs/usr/share
    1.17 +	mkdir -p $fs/usr/lib/openbox $fs/usr/share
    1.18  	cp -a $_pkg/usr/bin $fs/usr
    1.19  	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
    1.20  	cp -a $_pkg/usr/share/themes $fs/usr/share
    1.21 @@ -41,9 +41,10 @@
    1.22  	rm $fs/usr/bin/gnome-panel-control
    1.23  	chmod 0755 $fs/usr/bin/openbox-session
    1.24  	
    1.25 -	# Menu config and autostart script.
    1.26 +	# Menu config, autostart script and pipe menu.
    1.27  	mkdir -p $fs/etc/xdg
    1.28  	cp -a stuff/openbox $fs/etc/xdg
    1.29 +	cp stuff/open-folder-menu.sh $fs/usr/lib/openbox
    1.30  	
    1.31  	# SliTaz theme
    1.32  	cp -a stuff/themes $fs/usr/share
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/openbox/stuff/open-folder-menu.sh	Fri Apr 25 16:12:19 2008 +0200
     2.3 @@ -0,0 +1,29 @@
     2.4 +#!/bin/sh
     2.5 +#
     2.6 +# Openbox pipe menu to launch PCmanFM using GTK bookmarks.
     2.7 +#
     2.8 +
     2.9 +echo '<openbox_pipe_menu>'
    2.10 +
    2.11 +# Home
    2.12 +echo '<item label="Home">'
    2.13 +echo '<action name="Execute"><execute>'
    2.14 +echo "pcmanfm ~"
    2.15 +echo '</execute></action></item>'
    2.16 +
    2.17 +# ~/Desktop
    2.18 +echo '<item label="Desktop">'
    2.19 +echo '<action name="Execute"><execute>'
    2.20 +echo "pcmanfm ~/Desktop"
    2.21 +echo '</execute></action></item>'
    2.22 +
    2.23 +# GTK bookmarks
    2.24 +for dir in `sed 's/[ ][^ ]*$//' .gtk-bookmarks`
    2.25 +do
    2.26 +	echo '<item label="'`basename $dir`'">'
    2.27 +	echo '<action name="Execute"><execute>'
    2.28 +	echo "pcmanfm $dir"
    2.29 +	echo '</execute></action></item>'
    2.30 +done
    2.31 +
    2.32 +echo '</openbox_pipe_menu>'
     3.1 --- a/openbox/stuff/openbox/autostart.sh	Fri Apr 25 12:40:49 2008 +0200
     3.2 +++ b/openbox/stuff/openbox/autostart.sh	Fri Apr 25 16:12:19 2008 +0200
     3.3 @@ -1,19 +1,7 @@
     3.4  # This shell script is run before Openbox launches.
     3.5  # Environment variables set here are passed to the Openbox session.
     3.6  
     3.7 -#BG=/usr/share/images/slitaz-background.png
     3.8 -#BG=$HOME/Images/background.png
     3.9 -
    3.10 -# Set a background color usin hsetroot (depends on imlib2) or xsetroot.
    3.11 -#if which hsetroot >/dev/null; then
    3.12 -	#hsetroot -fill $BG &
    3.13 -#else
    3.14 -	#if which xsetroot >/dev/null; then
    3.15 -		#xsetroot -solid "#222222" &
    3.16 -	#fi
    3.17 -#fi
    3.18 -
    3.19 -# Start PCmanFM as deamon.
    3.20 +# Start PCmanFM as deamon for Wallpaper and desktop icons.
    3.21  if which pcmanfm >/dev/null; then
    3.22  	pcmanfm -d &
    3.23  fi
    3.24 @@ -27,3 +15,16 @@
    3.25  if which parcellite >/dev/null; then
    3.26  	parcellite &
    3.27  fi
    3.28 +
    3.29 +# Set a background color using hsetroot (depends on imlib2) or xsetroot.
    3.30 +
    3.31 +#BG=/usr/share/images/slitaz-background.png
    3.32 +#BG=$HOME/Images/background.png
    3.33 +
    3.34 +#if which hsetroot >/dev/null; then
    3.35 +	#hsetroot -fill $BG &
    3.36 +#else
    3.37 +	#if which xsetroot >/dev/null; then
    3.38 +		#xsetroot -solid "#222222" &
    3.39 +	#fi
    3.40 +#fi
     4.1 --- a/openbox/stuff/openbox/menu.xml	Fri Apr 25 12:40:49 2008 +0200
     4.2 +++ b/openbox/stuff/openbox/menu.xml	Fri Apr 25 16:12:19 2008 +0200
     4.3 @@ -2,6 +2,7 @@
     4.4  
     4.5  <openbox_menu xmlns="http://openbox.org/3.4/menu">
     4.6  
     4.7 +<!-- Favorites applications -->
     4.8  <menu id="favorites-menu" label="Favorites">
     4.9    <item label="File Manager">
    4.10      <action name="Execute"><command>pcmanfm</command></action>
    4.11 @@ -23,6 +24,7 @@
    4.12    </item>
    4.13  </menu>
    4.14  
    4.15 +<!-- Desktop effects -->
    4.16  <menu id="desktop-effects" label="Desktop Effects">
    4.17    <item label="Active composite">
    4.18      <action name="Execute"><command>xcompmgr</command></action>
    4.19 @@ -50,10 +52,12 @@
    4.20    </item>
    4.21  </menu>
    4.22  
    4.23 +<!-- SliTaz Live (Tazlito and Tazusb) -->
    4.24  <menu id="slitaz-live-menu" label="SliTaz Live">
    4.25    <item label="Tazlito LiveCD Tool">
    4.26      <action name="Execute"><command>subox tazlitobox</command></action>
    4.27    </item>
    4.28 +  <separator />
    4.29    <item label="TazUSB Writefs (gzip)">
    4.30      <action name="Execute">
    4.31        <command>subox "xterm -e tazusb writefs gzip"</command>
    4.32 @@ -71,6 +75,7 @@
    4.33    </item>
    4.34  </menu>
    4.35  
    4.36 +<!-- SliTaz documentation -->
    4.37  <menu id="documentation-menu" label="Documentation">
    4.38    <item label="Tazlito Manual">
    4.39      <action name="Execute">
    4.40 @@ -99,12 +104,20 @@
    4.41    </item>
    4.42  </menu>
    4.43  
    4.44 +<!-- Openbox configuration -->
    4.45  <menu id="openbox-menu" label="Openbox">
    4.46    <item label="ObConf">
    4.47      <action name="Execute"><command>obconf</command></action>
    4.48    </item>
    4.49 -  <item label="Restart LXpanel">
    4.50 -    <action name="Execute"><command>lxpanelctl restart</command></action>
    4.51 +  <item label="Autostart Script">
    4.52 +    <action name="Execute">
    4.53 +      <command>geany ~/.config/openbox/autostart.sh</command>
    4.54 +    </action>
    4.55 +  </item>
    4.56 +  <item label="Openbox Menu">
    4.57 +    <action name="Execute">
    4.58 +      <command>geany ~/.config/openbox/menu</command>
    4.59 +    </action>
    4.60    </item>
    4.61    <separator />
    4.62    <item label="Reconfigure">
    4.63 @@ -118,6 +131,7 @@
    4.64    </item>
    4.65  </menu>
    4.66  
    4.67 +<!-- System actions -->
    4.68  <menu id="system-actions-menu" label="System Actions">
    4.69    <item label="Reboot">
    4.70      <action name="Execute"><command>reboot</command></action>
    4.71 @@ -133,13 +147,12 @@
    4.72  <menu id="root-menu" label="Openbox 3">
    4.73    <separator label="SliTaz Openbox" />
    4.74    <menu id="favorites-menu" />
    4.75 +  <!-- Pipe menu to open folder using GTK bookmarks -->
    4.76 +  <menu id="open-folder-menu" label="Open Folder" 
    4.77 +        execute="/usr/lib/openbox/open-folder-menu.sh" />
    4.78    <menu id="desktop-effects" />
    4.79    <menu id="slitaz-live-menu" />
    4.80    <menu id="client-list-menu" />
    4.81 -  <menu id="documentation-menu" />
    4.82 -  <item label="Run Command">
    4.83 -    <action name="Execute"><command>lxpanelctl run</command></action>
    4.84 -  </item>
    4.85    <separator />
    4.86    <menu id="openbox-menu" />
    4.87    <menu id="system-actions-menu" />