# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1209132739 -7200
# Node ID 17882e14fc31c50440bd9a9e51504a7e8e34daee
# Parent  ffc85adee781fcf6a23172125ba6e367ca56c49f
Up: openbox (3.4.7.2) with new pipe menu

diff -r ffc85adee781 -r 17882e14fc31 openbox/receipt
--- a/openbox/receipt	Fri Apr 25 12:40:49 2008 +0200
+++ b/openbox/receipt	Fri Apr 25 16:12:19 2008 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="openbox"
-VERSION="3.4.7.1"
+VERSION="3.4.7.2"
 CATEGORY="x-window"
 SHORT_DESC="Small-footprint and standard compliant Window Manager."
 MAINTAINER="pankso@slitaz.org"
@@ -30,7 +30,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib $fs/usr/share
+	mkdir -p $fs/usr/lib/openbox $fs/usr/share
 	cp -a $_pkg/usr/bin $fs/usr
 	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
 	cp -a $_pkg/usr/share/themes $fs/usr/share
@@ -41,9 +41,10 @@
 	rm $fs/usr/bin/gnome-panel-control
 	chmod 0755 $fs/usr/bin/openbox-session
 	
-	# Menu config and autostart script.
+	# Menu config, autostart script and pipe menu.
 	mkdir -p $fs/etc/xdg
 	cp -a stuff/openbox $fs/etc/xdg
+	cp stuff/open-folder-menu.sh $fs/usr/lib/openbox
 	
 	# SliTaz theme
 	cp -a stuff/themes $fs/usr/share
diff -r ffc85adee781 -r 17882e14fc31 openbox/stuff/open-folder-menu.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/openbox/stuff/open-folder-menu.sh	Fri Apr 25 16:12:19 2008 +0200
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# Openbox pipe menu to launch PCmanFM using GTK bookmarks.
+#
+
+echo '<openbox_pipe_menu>'
+
+# Home
+echo '<item label="Home">'
+echo '<action name="Execute"><execute>'
+echo "pcmanfm ~"
+echo '</execute></action></item>'
+
+# ~/Desktop
+echo '<item label="Desktop">'
+echo '<action name="Execute"><execute>'
+echo "pcmanfm ~/Desktop"
+echo '</execute></action></item>'
+
+# GTK bookmarks
+for dir in `sed 's/[ ][^ ]*$//' .gtk-bookmarks`
+do
+	echo '<item label="'`basename $dir`'">'
+	echo '<action name="Execute"><execute>'
+	echo "pcmanfm $dir"
+	echo '</execute></action></item>'
+done
+
+echo '</openbox_pipe_menu>'
diff -r ffc85adee781 -r 17882e14fc31 openbox/stuff/openbox/autostart.sh
--- a/openbox/stuff/openbox/autostart.sh	Fri Apr 25 12:40:49 2008 +0200
+++ b/openbox/stuff/openbox/autostart.sh	Fri Apr 25 16:12:19 2008 +0200
@@ -1,19 +1,7 @@
 # This shell script is run before Openbox launches.
 # Environment variables set here are passed to the Openbox session.
 
-#BG=/usr/share/images/slitaz-background.png
-#BG=$HOME/Images/background.png
-
-# Set a background color usin hsetroot (depends on imlib2) or xsetroot.
-#if which hsetroot >/dev/null; then
-	#hsetroot -fill $BG &
-#else
-	#if which xsetroot >/dev/null; then
-		#xsetroot -solid "#222222" &
-	#fi
-#fi
-
-# Start PCmanFM as deamon.
+# Start PCmanFM as deamon for Wallpaper and desktop icons.
 if which pcmanfm >/dev/null; then
 	pcmanfm -d &
 fi
@@ -27,3 +15,16 @@
 if which parcellite >/dev/null; then
 	parcellite &
 fi
+
+# Set a background color using hsetroot (depends on imlib2) or xsetroot.
+
+#BG=/usr/share/images/slitaz-background.png
+#BG=$HOME/Images/background.png
+
+#if which hsetroot >/dev/null; then
+	#hsetroot -fill $BG &
+#else
+	#if which xsetroot >/dev/null; then
+		#xsetroot -solid "#222222" &
+	#fi
+#fi
diff -r ffc85adee781 -r 17882e14fc31 openbox/stuff/openbox/menu.xml
--- a/openbox/stuff/openbox/menu.xml	Fri Apr 25 12:40:49 2008 +0200
+++ b/openbox/stuff/openbox/menu.xml	Fri Apr 25 16:12:19 2008 +0200
@@ -2,6 +2,7 @@
 
 <openbox_menu xmlns="http://openbox.org/3.4/menu">
 
+<!-- Favorites applications -->
 <menu id="favorites-menu" label="Favorites">
   <item label="File Manager">
     <action name="Execute"><command>pcmanfm</command></action>
@@ -23,6 +24,7 @@
   </item>
 </menu>
 
+<!-- Desktop effects -->
 <menu id="desktop-effects" label="Desktop Effects">
   <item label="Active composite">
     <action name="Execute"><command>xcompmgr</command></action>
@@ -50,10 +52,12 @@
   </item>
 </menu>
 
+<!-- SliTaz Live (Tazlito and Tazusb) -->
 <menu id="slitaz-live-menu" label="SliTaz Live">
   <item label="Tazlito LiveCD Tool">
     <action name="Execute"><command>subox tazlitobox</command></action>
   </item>
+  <separator />
   <item label="TazUSB Writefs (gzip)">
     <action name="Execute">
       <command>subox "xterm -e tazusb writefs gzip"</command>
@@ -71,6 +75,7 @@
   </item>
 </menu>
 
+<!-- SliTaz documentation -->
 <menu id="documentation-menu" label="Documentation">
   <item label="Tazlito Manual">
     <action name="Execute">
@@ -99,12 +104,20 @@
   </item>
 </menu>
 
+<!-- Openbox configuration -->
 <menu id="openbox-menu" label="Openbox">
   <item label="ObConf">
     <action name="Execute"><command>obconf</command></action>
   </item>
-  <item label="Restart LXpanel">
-    <action name="Execute"><command>lxpanelctl restart</command></action>
+  <item label="Autostart Script">
+    <action name="Execute">
+      <command>geany ~/.config/openbox/autostart.sh</command>
+    </action>
+  </item>
+  <item label="Openbox Menu">
+    <action name="Execute">
+      <command>geany ~/.config/openbox/menu</command>
+    </action>
   </item>
   <separator />
   <item label="Reconfigure">
@@ -118,6 +131,7 @@
   </item>
 </menu>
 
+<!-- System actions -->
 <menu id="system-actions-menu" label="System Actions">
   <item label="Reboot">
     <action name="Execute"><command>reboot</command></action>
@@ -133,13 +147,12 @@
 <menu id="root-menu" label="Openbox 3">
   <separator label="SliTaz Openbox" />
   <menu id="favorites-menu" />
+  <!-- Pipe menu to open folder using GTK bookmarks -->
+  <menu id="open-folder-menu" label="Open Folder" 
+        execute="/usr/lib/openbox/open-folder-menu.sh" />
   <menu id="desktop-effects" />
   <menu id="slitaz-live-menu" />
   <menu id="client-list-menu" />
-  <menu id="documentation-menu" />
-  <item label="Run Command">
-    <action name="Execute"><command>lxpanelctl run</command></action>
-  </item>
   <separator />
   <menu id="openbox-menu" />
   <menu id="system-actions-menu" />