wok-4.x rev 464
Up: lxpanel (0.2.8) and adjust openbox config
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Thu Mar 20 14:33:19 2008 +0100 (2008-03-20) |
| parents | 28b23f950f49 |
| children | 9d7bcbed6dde |
| files | lxpanel/receipt lxpanel/stuff/fr.u lxpanel/stuff/ptk-app-menu.u openbox/receipt openbox/stuff/lxpanel.config openbox/stuff/openbox/autostart.sh openbox/stuff/openbox/menu.xml |
line diff
1.1 --- a/lxpanel/receipt Thu Mar 20 00:54:01 2008 +0100 1.2 +++ b/lxpanel/receipt Thu Mar 20 14:33:19 2008 +0100 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="lxpanel" 1.7 -VERSION="0.2.6" 1.8 +VERSION="0.2.8" 1.9 CATEGORY="x-window" 1.10 SHORT_DESC="Standard compliant desktop panel." 1.11 MAINTAINER="pankso@slitaz.org" 1.12 @@ -15,12 +15,16 @@ 1.13 compile_rules() 1.14 { 1.15 cd $src 1.16 + # Patch the menu 1.17 patch -p0 < ../stuff/ptk-app-menu.u 1.18 + patch -p0 < ../stuff/fr.u 1.19 ./configure \ 1.20 --prefix=/usr \ 1.21 $CONFIGURE_ARGS 1.22 make 1.23 make DESTDIR=$PWD/_pkg install 1.24 + # Avoid insatll error (want docbook for man) 1.25 + echo "Please continue..." 1.26 } 1.27 1.28 # Rules to gen a SliTaz package suitable for Tazpkg. 1.29 @@ -42,3 +46,8 @@ 1.30 ln -s /etc/lxpanel $fs/usr/share/lxpanel/profile 1.31 } 1.32 1.33 +# Remove old config if upgrade. 1.34 +pre_install() 1.35 +{ 1.36 + rm -rf /usr/share/lxpanel/profile 1.37 +}
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/lxpanel/stuff/fr.u Thu Mar 20 14:33:19 2008 +0100 2.3 @@ -0,0 +1,29 @@ 2.4 +--- po/fr.po Thu Mar 20 11:13:21 2008 2.5 ++++ po/fr.po Thu Mar 20 11:09:38 2008 2.6 +@@ -305,7 +305,7 @@ 2.7 + 2.8 + #: ../src/plugins/ptk-app-menu.c:148 2.9 + msgid "Other" 2.10 +-msgstr "Autres" 2.11 ++msgstr "Divers" 2.12 + 2.13 + #: ../src/plugins/ptk-app-menu.c:149 2.14 + msgid "Game" 2.15 +@@ -321,7 +321,7 @@ 2.16 + 2.17 + #: ../src/plugins/ptk-app-menu.c:152 2.18 + msgid "Audio & Video" 2.19 +-msgstr "Audio & Vidéo" 2.20 ++msgstr "Multimedia" 2.21 + 2.22 + #: ../src/plugins/ptk-app-menu.c:153 2.23 + msgid "Graphics" 2.24 +@@ -345,7 +345,7 @@ 2.25 + 2.26 + #: ../src/plugins/ptk-app-menu.c:158 2.27 + msgid "Accessories" 2.28 +-msgstr "Accessoires" 2.29 ++msgstr "Utilitaires" 2.30 + 2.31 + #: ../src/plugins/taskbar.c:1211 2.32 + msgid "Raise"
3.1 --- a/lxpanel/stuff/ptk-app-menu.u Thu Mar 20 00:54:01 2008 +0100 3.2 +++ b/lxpanel/stuff/ptk-app-menu.u Thu Mar 20 14:33:19 2008 +0100 3.3 @@ -1,25 +1,23 @@ 3.4 ---- src/plugins/ptk-app-menu.c Thu Mar 6 20:55:09 2008 3.5 -+++ src/plugins/ptk-app-menu.c Thu Mar 6 20:54:00 2008 3.6 -@@ -144,17 +144,17 @@ 3.7 +--- src/plugins/ptk-app-menu.c Thu Mar 20 11:12:31 2008 3.8 ++++ src/plugins/ptk-app-menu.c Thu Mar 20 11:11:31 2008 3.9 +@@ -145,17 +145,17 @@ 3.10 3.11 const CatInfo known_cats[]= 3.12 { 3.13 -- {N_("Other"), "gnome-other", NULL}, 3.14 -- {N_("Game"), "gnome-joystick", game_cats}, 3.15 -+ {N_("Misc"), "gnome-other", NULL}, 3.16 -+ {N_("Games"), "gnome-joystick", game_cats}, 3.17 - {N_("Education"), "gnome-amusements", education_cats}, 3.18 - {N_("Development"), "gnome-devel", development_cats}, 3.19 -- {N_("Audio & Video"), "gnome-multimedia", audiovideo_cats}, 3.20 -+ {N_("Multimedia"), "gnome-multimedia", audiovideo_cats}, 3.21 - {N_("Graphics"), "gnome-graphics", graphics_cats}, 3.22 - {N_("Settings"), "gnome-settings", settings_cats}, 3.23 - {N_("System Tools"), "gnome-system", system_cats}, 3.24 -- {N_("Network"), "gnome-globe", network_cats}, 3.25 - {N_("Office"), "gnome-applications", office_cats}, 3.26 -- {N_("Accessories"), "gnome-util", utility_cats} 3.27 -+ {N_("Network"), "gnome-globe", network_cats}, 3.28 -+ {N_("Utilities"), "gnome-util", utility_cats} 3.29 +- {N_("Other"), "Other", "gnome-other", NULL}, 3.30 ++ {N_("Other"), "Misc", "gnome-other", NULL}, 3.31 + {N_("Game"), "Games", "gnome-joystick", game_cats}, 3.32 + {N_("Education"), "Education", "gnome-amusements", education_cats}, 3.33 + {N_("Development"), "Development", "gnome-devel", development_cats}, 3.34 + {N_("Audio & Video"), "Multimedia", "gnome-multimedia", audiovideo_cats}, 3.35 + {N_("Graphics"), "Graphics", "gnome-graphics", graphics_cats}, 3.36 + {N_("Settings"), "Settings", "gnome-settings", settings_cats}, 3.37 +- {N_("System Tools"), "System-Tools", "gnome-system", system_cats}, 3.38 ++ {N_("System Tools"), "System Tools", "gnome-system", system_cats}, 3.39 + {N_("Network"), "Internet", "gnome-globe", network_cats}, 3.40 + {N_("Office"), "Office", "gnome-applications", office_cats}, 3.41 +- {N_("Accessories"), "Accessories", "gnome-util", utility_cats} 3.42 ++ {N_("Accessories"), "Utilities", "gnome-util", utility_cats} 3.43 }; 3.44 3.45 int find_cat( char** cats )
4.1 --- a/openbox/receipt Thu Mar 20 00:54:01 2008 +0100 4.2 +++ b/openbox/receipt Thu Mar 20 14:33:19 2008 +0100 4.3 @@ -30,7 +30,7 @@ 4.4 # Rules to gen a SliTaz package suitable for Tazpkg. 4.5 genpkg_rules() 4.6 { 4.7 - mkdir -p $fs/usr/lib $fs/usr/share/lxpanel/profile/openbox 4.8 + mkdir -p $fs/usr/lib $fs/usr/share 4.9 cp -a $_pkg/usr/bin $fs/usr 4.10 cp -a $_pkg/usr/lib/*.so* $fs/usr/lib 4.11 cp -a $_pkg/usr/share/themes $fs/usr/share 4.12 @@ -43,7 +43,8 @@ 4.13 mkdir -p $fs/etc/xdg 4.14 cp -a stuff/openbox $fs/etc/xdg 4.15 # LXpanel config. 4.16 - cp stuff/lxpanel.config $fs/usr/share/lxpanel/profile/openbox/config 4.17 + mkdir -p $fs/etc/lxpanel/openbox 4.18 + cp stuff/lxpanel.config $fs/etc/lxpanel/openbox/config 4.19 # Set perms. 4.20 chown -R root.root $fs 4.21 }
5.1 --- a/openbox/stuff/lxpanel.config Thu Mar 20 00:54:01 2008 +0100 5.2 +++ b/openbox/stuff/lxpanel.config Thu Mar 20 14:33:19 2008 +0100 5.3 @@ -2,18 +2,18 @@ 5.4 # see http://lxpanel.sf.net/docs.html for complete configuration guide 5.5 Global { 5.6 edge = top 5.7 - allign = center 5.8 + allign = left 5.9 margin = 0 5.10 - widthtype = request 5.11 - width = 442 5.12 + widthtype = percent 5.13 + width = 100 5.14 height = 26 5.15 transparent = false 5.16 tintcolor = #000000 5.17 - alpha = 106 5.18 + alpha = 119 5.19 setdocktype = true 5.20 setpartialstrut = true 5.21 useFontColor = true 5.22 - FontColor = #111111 5.23 + FontColor = #222222 5.24 Background = false 5.25 BackgroundFile = /usr/share/lxpanel/images/background.png 5.26 FileManager = emelfm2 5.27 @@ -24,7 +24,7 @@ 5.28 Plugin { 5.29 type = space 5.30 Config { 5.31 - Size = 4 5.32 + Size = 2 5.33 } 5.34 } 5.35 5.36 @@ -97,11 +97,32 @@ 5.37 Plugin { 5.38 type = space 5.39 Config { 5.40 - Size = 2 5.41 + Size = 4 5.42 } 5.43 } 5.44 5.45 Plugin { 5.46 + type = taskbar 5.47 + expand = true 5.48 + Config { 5.49 + tooltips = true 5.50 + IconsOnly = false 5.51 + AcceptSkipPager = true 5.52 + ShowIconified = true 5.53 + ShowMapped = true 5.54 + ShowAllDesks = false 5.55 + UseMouseWheel = true 5.56 + UseUrgencyHint = true 5.57 + MaxTaskWidth = 150 5.58 + spacing = 1 5.59 + } 5.60 +} 5.61 + 5.62 +Plugin { 5.63 + type = tray 5.64 +} 5.65 + 5.66 +Plugin { 5.67 type = volumealsa 5.68 } 5.69
6.1 --- a/openbox/stuff/openbox/autostart.sh Thu Mar 20 00:54:01 2008 +0100 6.2 +++ b/openbox/stuff/openbox/autostart.sh Thu Mar 20 14:33:19 2008 +0100 6.3 @@ -1,7 +1,7 @@ 6.4 # This shell script is run before Openbox launches. 6.5 # Environment variables set here are passed to the Openbox session. 6.6 6.7 -BG=/usr/share/images/slitaz-yellowshadow-1024x768.png 6.8 +BG=/usr/share/images/slitaz-background.png 6.9 #BG=$HOME/Images/background.png 6.10 6.11 # Set a background color usin hsetroot (depends on imlib2) or xsetroot.
7.1 --- a/openbox/stuff/openbox/menu.xml Thu Mar 20 00:54:01 2008 +0100 7.2 +++ b/openbox/stuff/openbox/menu.xml Thu Mar 20 14:33:19 2008 +0100 7.3 @@ -64,7 +64,6 @@ 7.4 <separator /> 7.5 <item label="ObConf"> 7.6 <action name="Execute"> 7.7 - <startupnotify><enabled>yes</enabled><icon>openbox</icon></startupnotify> 7.8 <command>obconf</command> 7.9 </action> 7.10 </item>