# HG changeset patch # User Christophe Lincoln # Date 1206019999 -3600 # Node ID 91f7f214555238520b5c3b2c0c1dd06d6b705515 # Parent 28b23f950f494617d70bb93aefccf6ceff73de78 Up: lxpanel (0.2.8) and adjust openbox config diff -r 28b23f950f49 -r 91f7f2145552 lxpanel/receipt --- a/lxpanel/receipt Thu Mar 20 00:54:01 2008 +0100 +++ b/lxpanel/receipt Thu Mar 20 14:33:19 2008 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="lxpanel" -VERSION="0.2.6" +VERSION="0.2.8" CATEGORY="x-window" SHORT_DESC="Standard compliant desktop panel." MAINTAINER="pankso@slitaz.org" @@ -15,12 +15,16 @@ compile_rules() { cd $src + # Patch the menu patch -p0 < ../stuff/ptk-app-menu.u + patch -p0 < ../stuff/fr.u ./configure \ --prefix=/usr \ $CONFIGURE_ARGS make make DESTDIR=$PWD/_pkg install + # Avoid insatll error (want docbook for man) + echo "Please continue..." } # Rules to gen a SliTaz package suitable for Tazpkg. @@ -42,3 +46,8 @@ ln -s /etc/lxpanel $fs/usr/share/lxpanel/profile } +# Remove old config if upgrade. +pre_install() +{ + rm -rf /usr/share/lxpanel/profile +} diff -r 28b23f950f49 -r 91f7f2145552 lxpanel/stuff/fr.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lxpanel/stuff/fr.u Thu Mar 20 14:33:19 2008 +0100 @@ -0,0 +1,29 @@ +--- po/fr.po Thu Mar 20 11:13:21 2008 ++++ po/fr.po Thu Mar 20 11:09:38 2008 +@@ -305,7 +305,7 @@ + + #: ../src/plugins/ptk-app-menu.c:148 + msgid "Other" +-msgstr "Autres" ++msgstr "Divers" + + #: ../src/plugins/ptk-app-menu.c:149 + msgid "Game" +@@ -321,7 +321,7 @@ + + #: ../src/plugins/ptk-app-menu.c:152 + msgid "Audio & Video" +-msgstr "Audio & Vidéo" ++msgstr "Multimedia" + + #: ../src/plugins/ptk-app-menu.c:153 + msgid "Graphics" +@@ -345,7 +345,7 @@ + + #: ../src/plugins/ptk-app-menu.c:158 + msgid "Accessories" +-msgstr "Accessoires" ++msgstr "Utilitaires" + + #: ../src/plugins/taskbar.c:1211 + msgid "Raise" diff -r 28b23f950f49 -r 91f7f2145552 lxpanel/stuff/ptk-app-menu.u --- a/lxpanel/stuff/ptk-app-menu.u Thu Mar 20 00:54:01 2008 +0100 +++ b/lxpanel/stuff/ptk-app-menu.u Thu Mar 20 14:33:19 2008 +0100 @@ -1,25 +1,23 @@ ---- src/plugins/ptk-app-menu.c Thu Mar 6 20:55:09 2008 -+++ src/plugins/ptk-app-menu.c Thu Mar 6 20:54:00 2008 -@@ -144,17 +144,17 @@ +--- src/plugins/ptk-app-menu.c Thu Mar 20 11:12:31 2008 ++++ src/plugins/ptk-app-menu.c Thu Mar 20 11:11:31 2008 +@@ -145,17 +145,17 @@ const CatInfo known_cats[]= { -- {N_("Other"), "gnome-other", NULL}, -- {N_("Game"), "gnome-joystick", game_cats}, -+ {N_("Misc"), "gnome-other", NULL}, -+ {N_("Games"), "gnome-joystick", game_cats}, - {N_("Education"), "gnome-amusements", education_cats}, - {N_("Development"), "gnome-devel", development_cats}, -- {N_("Audio & Video"), "gnome-multimedia", audiovideo_cats}, -+ {N_("Multimedia"), "gnome-multimedia", audiovideo_cats}, - {N_("Graphics"), "gnome-graphics", graphics_cats}, - {N_("Settings"), "gnome-settings", settings_cats}, - {N_("System Tools"), "gnome-system", system_cats}, -- {N_("Network"), "gnome-globe", network_cats}, - {N_("Office"), "gnome-applications", office_cats}, -- {N_("Accessories"), "gnome-util", utility_cats} -+ {N_("Network"), "gnome-globe", network_cats}, -+ {N_("Utilities"), "gnome-util", utility_cats} +- {N_("Other"), "Other", "gnome-other", NULL}, ++ {N_("Other"), "Misc", "gnome-other", NULL}, + {N_("Game"), "Games", "gnome-joystick", game_cats}, + {N_("Education"), "Education", "gnome-amusements", education_cats}, + {N_("Development"), "Development", "gnome-devel", development_cats}, + {N_("Audio & Video"), "Multimedia", "gnome-multimedia", audiovideo_cats}, + {N_("Graphics"), "Graphics", "gnome-graphics", graphics_cats}, + {N_("Settings"), "Settings", "gnome-settings", settings_cats}, +- {N_("System Tools"), "System-Tools", "gnome-system", system_cats}, ++ {N_("System Tools"), "System Tools", "gnome-system", system_cats}, + {N_("Network"), "Internet", "gnome-globe", network_cats}, + {N_("Office"), "Office", "gnome-applications", office_cats}, +- {N_("Accessories"), "Accessories", "gnome-util", utility_cats} ++ {N_("Accessories"), "Utilities", "gnome-util", utility_cats} }; int find_cat( char** cats ) diff -r 28b23f950f49 -r 91f7f2145552 openbox/receipt --- a/openbox/receipt Thu Mar 20 00:54:01 2008 +0100 +++ b/openbox/receipt Thu Mar 20 14:33:19 2008 +0100 @@ -30,7 +30,7 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib $fs/usr/share/lxpanel/profile/openbox + mkdir -p $fs/usr/lib $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 @@ -43,7 +43,8 @@ mkdir -p $fs/etc/xdg cp -a stuff/openbox $fs/etc/xdg # LXpanel config. - cp stuff/lxpanel.config $fs/usr/share/lxpanel/profile/openbox/config + mkdir -p $fs/etc/lxpanel/openbox + cp stuff/lxpanel.config $fs/etc/lxpanel/openbox/config # Set perms. chown -R root.root $fs } diff -r 28b23f950f49 -r 91f7f2145552 openbox/stuff/lxpanel.config --- a/openbox/stuff/lxpanel.config Thu Mar 20 00:54:01 2008 +0100 +++ b/openbox/stuff/lxpanel.config Thu Mar 20 14:33:19 2008 +0100 @@ -2,18 +2,18 @@ # see http://lxpanel.sf.net/docs.html for complete configuration guide Global { edge = top - allign = center + allign = left margin = 0 - widthtype = request - width = 442 + widthtype = percent + width = 100 height = 26 transparent = false tintcolor = #000000 - alpha = 106 + alpha = 119 setdocktype = true setpartialstrut = true useFontColor = true - FontColor = #111111 + FontColor = #222222 Background = false BackgroundFile = /usr/share/lxpanel/images/background.png FileManager = emelfm2 @@ -24,7 +24,7 @@ Plugin { type = space Config { - Size = 4 + Size = 2 } } @@ -97,11 +97,32 @@ Plugin { type = space Config { - Size = 2 + Size = 4 } } Plugin { + type = taskbar + expand = true + Config { + tooltips = true + IconsOnly = false + AcceptSkipPager = true + ShowIconified = true + ShowMapped = true + ShowAllDesks = false + UseMouseWheel = true + UseUrgencyHint = true + MaxTaskWidth = 150 + spacing = 1 + } +} + +Plugin { + type = tray +} + +Plugin { type = volumealsa } diff -r 28b23f950f49 -r 91f7f2145552 openbox/stuff/openbox/autostart.sh --- a/openbox/stuff/openbox/autostart.sh Thu Mar 20 00:54:01 2008 +0100 +++ b/openbox/stuff/openbox/autostart.sh Thu Mar 20 14:33:19 2008 +0100 @@ -1,7 +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-yellowshadow-1024x768.png +BG=/usr/share/images/slitaz-background.png #BG=$HOME/Images/background.png # Set a background color usin hsetroot (depends on imlib2) or xsetroot. diff -r 28b23f950f49 -r 91f7f2145552 openbox/stuff/openbox/menu.xml --- a/openbox/stuff/openbox/menu.xml Thu Mar 20 00:54:01 2008 +0100 +++ b/openbox/stuff/openbox/menu.xml Thu Mar 20 14:33:19 2008 +0100 @@ -64,7 +64,6 @@ - yesopenbox obconf