wok-4.x rev 610
Up: lxpanel (0.3.5) - Use new config UI and files
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Fri Apr 18 18:18:08 2008 +0200 (2008-04-18) |
parents | 47b8c1a37fdd |
children | 908ac4092305 |
files | lxpanel/receipt lxpanel/stuff/default/config lxpanel/stuff/default/panels/panel lxpanel/stuff/fr.patch lxpanel/stuff/fr.u lxpanel/stuff/ptk-app-menu.patch lxpanel/stuff/ptk-app-menu.u |
line diff
1.1 --- a/lxpanel/receipt Fri Apr 18 17:05:46 2008 +0200 1.2 +++ b/lxpanel/receipt Fri Apr 18 18:18:08 2008 +0200 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="lxpanel" 1.7 -VERSION="0.2.8" 1.8 +VERSION="0.3.5" 1.9 CATEGORY="x-window" 1.10 SHORT_DESC="Standard compliant desktop panel." 1.11 MAINTAINER="pankso@slitaz.org" 1.12 @@ -16,15 +16,14 @@ 1.13 { 1.14 cd $src 1.15 # Patch the menu 1.16 - patch -p0 < ../stuff/ptk-app-menu.u 1.17 - patch -p0 < ../stuff/fr.u 1.18 + patch -p0 < ../stuff/ptk-app-menu.patch || exit 1 1.19 + patch -p0 < ../stuff/fr.patch || exit 1 1.20 ./configure \ 1.21 --prefix=/usr \ 1.22 + --with-plugins=all \ 1.23 $CONFIGURE_ARGS 1.24 make 1.25 make DESTDIR=$PWD/_pkg install 1.26 - # Avoid insatll error (want docbook for man) 1.27 - echo "Please continue..." 1.28 } 1.29 1.30 # Rules to gen a SliTaz package suitable for Tazpkg. 1.31 @@ -48,3 +47,26 @@ 1.32 cp -a stuff/default $fs/etc/lxpanel 1.33 } 1.34 1.35 +# lxpanel logout calls lxsession-logout, not installed by default so 1.36 +# fake. 1.37 +post_install() 1.38 +{ 1.39 + locale root 1.40 + root=$1 1.41 + if [ ! -f $root/usr/bin/lxsession-logout ]; then 1.42 + cat > $root/usr/bin/lxsession-logout << "EOT" 1.43 +#!/bin/sh 1.44 +# lxsession-logout fake. 1.45 +# 1.46 +WM=`cat /etc/X11/wm.default` 1.47 + 1.48 +case $WM in 1.49 + jwm) 1.50 + jwm -exit ;; 1.51 + openbox) 1.52 + openbox --exit ;; 1.53 +esac 1.54 +EOT 1.55 + chmod +x $root/usr/bin/lxsession-logout 1.56 + fi 1.57 +}
2.1 --- a/lxpanel/stuff/default/config Fri Apr 18 17:05:46 2008 +0200 2.2 +++ b/lxpanel/stuff/default/config Fri Apr 18 18:18:08 2008 +0200 2.3 @@ -1,118 +1,4 @@ 2.4 -# lxpanel <profile> config file 2.5 -# see http://lxpanel.sf.net/docs.html for complete configuration guide 2.6 -Global { 2.7 - edge = top 2.8 - allign = center 2.9 - margin = 0 2.10 - widthtype = request 2.11 - width = 287 2.12 - height = 26 2.13 - transparent = false 2.14 - tintcolor = #000000 2.15 - alpha = 107 2.16 - setdocktype = true 2.17 - setpartialstrut = true 2.18 - useFontColor = true 2.19 - FontColor = #111111 2.20 - Background = false 2.21 - BackgroundFile = /usr/share/lxpanel/images/background.png 2.22 - FileManager = emelfm2 2.23 - Terminal = xterm 2.24 - LogoutCommand = jwm -exit 2.25 -} 2.26 - 2.27 -Plugin { 2.28 - type = space 2.29 - Config { 2.30 - Size = 4 2.31 - } 2.32 -} 2.33 - 2.34 -Plugin { 2.35 - type = menu 2.36 - Config { 2.37 - image = /usr/share/pixmaps/slitaz-menu.png 2.38 - system { 2.39 - } 2.40 - separator { 2.41 - } 2.42 - item { 2.43 - image = /usr/share/icons/Tango/jwm/applications-other.png 2.44 - command = run 2.45 - } 2.46 - item { 2.47 - image = /usr/share/icons/Tango/jwm/preferences-desktop.png 2.48 - command = configure 2.49 - } 2.50 - separator { 2.51 - } 2.52 - item { 2.53 - image = gnome-logout 2.54 - command = logout 2.55 - } 2.56 - } 2.57 -} 2.58 - 2.59 -Plugin { 2.60 - type = launchbar 2.61 - Config { 2.62 - Button { 2.63 - id = emelfm2.desktop 2.64 - } 2.65 - Button { 2.66 - id = xterm.desktop 2.67 - } 2.68 - Button { 2.69 - id = firefox.desktop 2.70 - } 2.71 - } 2.72 -} 2.73 - 2.74 -Plugin { 2.75 - type = space 2.76 - Config { 2.77 - Size = 4 2.78 - } 2.79 -} 2.80 - 2.81 -Plugin { 2.82 - type = wincmd 2.83 - Config { 2.84 - Button1 = iconify 2.85 - Button2 = shade 2.86 - } 2.87 -} 2.88 - 2.89 -Plugin { 2.90 - type = volumealsa 2.91 -} 2.92 - 2.93 -Plugin { 2.94 - type = netstatus 2.95 - Config { 2.96 - iface = eth0 2.97 - configtool = subox netbox 2.98 - } 2.99 -} 2.100 - 2.101 -Plugin { 2.102 - type = space 2.103 - Config { 2.104 - Size = 4 2.105 - } 2.106 -} 2.107 - 2.108 -Plugin { 2.109 - type = cpu 2.110 -} 2.111 - 2.112 -Plugin { 2.113 - type = dclock 2.114 - Config { 2.115 - ClockFmt = %R 2.116 - TooltipFmt = %A %x 2.117 - Action = osmo & 2.118 - BoldFont = 0 2.119 - } 2.120 -} 2.121 - 2.122 +[Command] 2.123 +FileManager=pcmanfm %s 2.124 +Terminal=xterm -e 2.125 +Logout=jwm -exit
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/lxpanel/stuff/default/panels/panel Fri Apr 18 18:18:08 2008 +0200 3.3 @@ -0,0 +1,111 @@ 3.4 +# lxpanel <profile> config file. Manually editing is not recommended. 3.5 +# Use preference dialog in lxpanel to adjust config when you can. 3.6 + 3.7 +Global { 3.8 + edge=top 3.9 + allign=center 3.10 + margin=0 3.11 + widthtype=percent 3.12 + width=21 3.13 + height=24 3.14 + transparent=0 3.15 + tintcolor=#000000 3.16 + alpha=0 3.17 + setdocktype=1 3.18 + setpartialstrut=1 3.19 + usefontcolor=0 3.20 + fontcolor=#ffffff 3.21 + background=0 3.22 + backgroundfile=/usr/share/lxpanel/images/background.png 3.23 +} 3.24 + 3.25 +Plugin { 3.26 + type = space 3.27 + Config { 3.28 + Size=4 3.29 + } 3.30 +} 3.31 + 3.32 +Plugin { 3.33 + type = menu 3.34 + Config { 3.35 + image=/usr/share/pixmaps/slitaz-menu.png 3.36 + system { 3.37 + } 3.38 + separator { 3.39 + } 3.40 + item { 3.41 + command=run 3.42 + } 3.43 + separator { 3.44 + } 3.45 + item { 3.46 + image=/usr/share/icons/Tango/jwm/system-log-out.png 3.47 + command=logout 3.48 + } 3.49 + } 3.50 +} 3.51 + 3.52 +Plugin { 3.53 + type = launchbar 3.54 + Config { 3.55 + Button { 3.56 + id=xterm.desktop 3.57 + } 3.58 + Button { 3.59 + id=emelfm2.desktop 3.60 + } 3.61 + Button { 3.62 + id=firefox.desktop 3.63 + } 3.64 + } 3.65 +} 3.66 + 3.67 +Plugin { 3.68 + type = space 3.69 + Config { 3.70 + Size=4 3.71 + } 3.72 +} 3.73 + 3.74 +Plugin { 3.75 + type = wincmd 3.76 + Config { 3.77 + Button1=iconify 3.78 + Button2=shade 3.79 + } 3.80 +} 3.81 + 3.82 +Plugin { 3.83 + type = volumealsa 3.84 +} 3.85 + 3.86 +Plugin { 3.87 + type = netstatus 3.88 + Config { 3.89 + iface=eth0 3.90 + configtool=subox netbox %i 3.91 + } 3.92 +} 3.93 + 3.94 +Plugin { 3.95 + type = space 3.96 + Config { 3.97 + Size=2 3.98 + } 3.99 +} 3.100 + 3.101 +Plugin { 3.102 + type = cpu 3.103 +} 3.104 + 3.105 +Plugin { 3.106 + type = dclock 3.107 + Config { 3.108 + ClockFmt=%R 3.109 + TooltipFmt=%A %x 3.110 + Action=osmo 3.111 + BoldFont=1 3.112 + } 3.113 +} 3.114 +
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/lxpanel/stuff/fr.patch Fri Apr 18 18:18:08 2008 +0200 4.3 @@ -0,0 +1,38 @@ 4.4 +--- po/fr.po Fri Apr 18 15:21:36 2008 4.5 ++++ po/fr.po Fri Apr 18 15:21:09 2008 4.6 +@@ -206,7 +206,7 @@ 4.7 + 4.8 + #: ../src/panel.c:609 ../src/panel.c:733 4.9 + msgid "Create New Panel" 4.10 +-msgstr "" 4.11 ++msgstr "Créer un nouveau Panel" 4.12 + 4.13 + #: ../src/panel.c:615 4.14 + #, fuzzy 4.15 +@@ -390,7 +390,7 @@ 4.16 + 4.17 + #: ../src/plugins/ptk-app-menu.c:157 4.18 + msgid "Other" 4.19 +-msgstr "Autres" 4.20 ++msgstr "Divers" 4.21 + 4.22 + #: ../src/plugins/ptk-app-menu.c:158 4.23 + msgid "Game" 4.24 +@@ -406,7 +406,7 @@ 4.25 + 4.26 + #: ../src/plugins/ptk-app-menu.c:161 4.27 + msgid "Audio & Video" 4.28 +-msgstr "Audio & Vidéo" 4.29 ++msgstr "Multimedia" 4.30 + 4.31 + #: ../src/plugins/ptk-app-menu.c:162 4.32 + msgid "Graphics" 4.33 +@@ -430,7 +430,7 @@ 4.34 + 4.35 + #: ../src/plugins/ptk-app-menu.c:167 4.36 + msgid "Accessories" 4.37 +-msgstr "Accessoires" 4.38 ++msgstr "Utilitaires" 4.39 + 4.40 + #: ../src/plugins/taskbar.c:1224 4.41 + msgid "Raise"
5.1 --- a/lxpanel/stuff/fr.u Fri Apr 18 17:05:46 2008 +0200 5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 5.3 @@ -1,29 +0,0 @@ 5.4 ---- po/fr.po Thu Mar 20 11:13:21 2008 5.5 -+++ po/fr.po Thu Mar 20 11:09:38 2008 5.6 -@@ -305,7 +305,7 @@ 5.7 - 5.8 - #: ../src/plugins/ptk-app-menu.c:148 5.9 - msgid "Other" 5.10 --msgstr "Autres" 5.11 -+msgstr "Divers" 5.12 - 5.13 - #: ../src/plugins/ptk-app-menu.c:149 5.14 - msgid "Game" 5.15 -@@ -321,7 +321,7 @@ 5.16 - 5.17 - #: ../src/plugins/ptk-app-menu.c:152 5.18 - msgid "Audio & Video" 5.19 --msgstr "Audio & Vidéo" 5.20 -+msgstr "Multimedia" 5.21 - 5.22 - #: ../src/plugins/ptk-app-menu.c:153 5.23 - msgid "Graphics" 5.24 -@@ -345,7 +345,7 @@ 5.25 - 5.26 - #: ../src/plugins/ptk-app-menu.c:158 5.27 - msgid "Accessories" 5.28 --msgstr "Accessoires" 5.29 -+msgstr "Utilitaires" 5.30 - 5.31 - #: ../src/plugins/taskbar.c:1211 5.32 - msgid "Raise"
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/lxpanel/stuff/ptk-app-menu.patch Fri Apr 18 18:18:08 2008 +0200 6.3 @@ -0,0 +1,23 @@ 6.4 +--- src/plugins/ptk-app-menu.c Fri Apr 18 15:16:04 2008 6.5 ++++ src/plugins/ptk-app-menu.c Fri Apr 18 15:15:02 2008 6.6 +@@ -154,17 +154,17 @@ 6.7 + 6.8 + static const CatInfo known_cats[]= 6.9 + { 6.10 +- {N_("Other"), "Other", "gnome-other", NULL}, 6.11 ++ {N_("Other"), "Misc", "gnome-other", NULL}, 6.12 + {N_("Game"), "Games", "gnome-joystick", game_cats}, 6.13 + {N_("Education"), "Education", "gnome-amusements", education_cats}, 6.14 + {N_("Development"), "Development", "gnome-devel", development_cats}, 6.15 + {N_("Audio & Video"), "Multimedia", "gnome-multimedia", audiovideo_cats}, 6.16 + {N_("Graphics"), "Graphics", "gnome-graphics", graphics_cats}, 6.17 + {N_("Settings"), "Settings", "gnome-settings", settings_cats}, 6.18 +- {N_("System Tools"), "System-Tools", "gnome-system", system_cats}, 6.19 ++ {N_("System Tools"), "System Tools", "gnome-system", system_cats}, 6.20 + {N_("Network"), "Internet", "gnome-globe", network_cats}, 6.21 + {N_("Office"), "Office", "gnome-applications", office_cats}, 6.22 +- {N_("Accessories"), "Accessories", "gnome-util", utility_cats} 6.23 ++ {N_("Accessories"), "Utilities", "gnome-util", utility_cats} 6.24 + }; 6.25 + 6.26 + static int find_cat( char** cats )
7.1 --- a/lxpanel/stuff/ptk-app-menu.u Fri Apr 18 17:05:46 2008 +0200 7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 7.3 @@ -1,23 +0,0 @@ 7.4 ---- src/plugins/ptk-app-menu.c Thu Mar 20 11:12:31 2008 7.5 -+++ src/plugins/ptk-app-menu.c Thu Mar 20 11:11:31 2008 7.6 -@@ -145,17 +145,17 @@ 7.7 - 7.8 - const CatInfo known_cats[]= 7.9 - { 7.10 -- {N_("Other"), "Other", "gnome-other", NULL}, 7.11 -+ {N_("Other"), "Misc", "gnome-other", NULL}, 7.12 - {N_("Game"), "Games", "gnome-joystick", game_cats}, 7.13 - {N_("Education"), "Education", "gnome-amusements", education_cats}, 7.14 - {N_("Development"), "Development", "gnome-devel", development_cats}, 7.15 - {N_("Audio & Video"), "Multimedia", "gnome-multimedia", audiovideo_cats}, 7.16 - {N_("Graphics"), "Graphics", "gnome-graphics", graphics_cats}, 7.17 - {N_("Settings"), "Settings", "gnome-settings", settings_cats}, 7.18 -- {N_("System Tools"), "System-Tools", "gnome-system", system_cats}, 7.19 -+ {N_("System Tools"), "System Tools", "gnome-system", system_cats}, 7.20 - {N_("Network"), "Internet", "gnome-globe", network_cats}, 7.21 - {N_("Office"), "Office", "gnome-applications", office_cats}, 7.22 -- {N_("Accessories"), "Accessories", "gnome-util", utility_cats} 7.23 -+ {N_("Accessories"), "Utilities", "gnome-util", utility_cats} 7.24 - }; 7.25 - 7.26 - int find_cat( char** cats )