wok rev 3093

lxpanel: Remove and add custom icon + use gtk calendar
author Christophe Lincoln <pankso@slitaz.org>
date Sun May 17 00:38:37 2009 +0200 (2009-05-17)
parents 1bc110936af4
children 4f6c9d697c58
files lxpanel/receipt lxpanel/stuff/default/panels/panel
line diff
     1.1 --- a/lxpanel/receipt	Sat May 16 23:51:07 2009 +0200
     1.2 +++ b/lxpanel/receipt	Sun May 17 00:38:37 2009 +0200
     1.3 @@ -5,7 +5,7 @@
     1.4  CATEGORY="x-window"
     1.5  SHORT_DESC="Standard compliant desktop panel."
     1.6  MAINTAINER="pankso@slitaz.org"
     1.7 -DEPENDS="gtk+ slitaz-menus alsa-lib xorg-libXdamage"
     1.8 +DEPENDS="gtk+ slitaz-menus alsa-lib xorg-libXdamage slitaz-icon"
     1.9  BUILD_DEPENDS="gtk+-dev gettext wireless_tools-dev wireless_tools"
    1.10  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.11  WEB_SITE="http://lxde.sourceforge.net/"
    1.12 @@ -37,39 +37,26 @@
    1.13  	cp -a $_pkg/usr/bin $fs/usr
    1.14  	cp -a $_pkg/usr/lib $fs/usr
    1.15  	cp -a $_pkg/usr/share/lxpanel $fs/usr/share
    1.16 -
    1.17  	# Remove a few "heavy" an unseful images (ns* goes in extra)
    1.18 -	rm $fs/usr/share/lxpanel/images/file-manager.png
    1.19 -	rm $fs/usr/share/lxpanel/images/stock_volume.png
    1.20 -	rm $fs/usr/share/lxpanel/images/gnome-[a-k]*.png
    1.21 -	rm $fs/usr/share/lxpanel/images/gnome-netstatus-[d-t]*.png
    1.22 -	rm $fs/usr/share/lxpanel/images/gnome-m*.png
    1.23 -	rm $fs/usr/share/lxpanel/images/gnome-[o-z]*.png
    1.24 -	rm $fs/usr/share/lxpanel/images/my-*
    1.25 -	rm $fs/usr/share/lxpanel/images/redhat*.png
    1.26 -	rm $fs/usr/share/lxpanel/images/ns-*.png
    1.27 -	rm $fs/usr/share/lxpanel/images/*lock-*.png
    1.28 -
    1.29 -	# Netstatus 24x24 resized icons in Tango theme path.
    1.30 -	cp -a stuff/icons $fs/usr/share
    1.31 -
    1.32 +	for i in file-manager* stock_volume* gnome-[a-k]*.png gnome-m*.png \
    1.33 +		gnome-netstatus-[d-t]*.png gnome-[o-z]*.png my-* redhat*.png \
    1.34 +		ns-*.png *lock-*.png gnome-logout.png
    1.35 +	do
    1.36 +		rm $fs/usr/share/lxpanel/images/$i
    1.37 +	done
    1.38 +	# Custom images to match SliTaz theme.
    1.39 +	cp -a stuff/images/* $fs/usr/share/lxpanel/images
    1.40  	# Remove plugins --> lxpanel-extra
    1.41  	rm $fs/usr/lib/lxpanel/plugins/netstat.so
    1.42  	rm $fs/usr/lib/lxpanel/plugins/kbled.so
    1.43 -
    1.44 -	# Move profile to /etc/lxpanel (/usr maybe read-only)
    1.45 +	# Move profile to /etc/lxpanel (/usr maybe read-only) and default config
    1.46  	mkdir $fs/etc
    1.47  	mv -f $fs/usr/share/lxpanel/profile $fs/etc/lxpanel
    1.48  	ln -s /etc/lxpanel $fs/usr/share/lxpanel/profile
    1.49 -
    1.50 -	# Default config
    1.51  	mv $fs/etc/lxpanel/default $fs/etc/lxpanel/original
    1.52  	cp -a stuff/default $fs/etc/lxpanel
    1.53 -
    1.54 -	# Declare lxsession-logout in files.list
    1.55 -	touch $fs/usr/bin/lxsession-logout
    1.56 -	if [ ! -s $fs/usr/bin/lxsession-logout ]; then
    1.57 -		cat > $fs/usr/bin/lxsession-logout << "EOT"
    1.58 +	# lxsession-logout fake
    1.59 +	cat > $fs/usr/bin/lxsession-logout << "EOT"
    1.60  #!/bin/sh
    1.61  # lxsession-logout fake.
    1.62  #
    1.63 @@ -78,6 +65,5 @@
    1.64  exit 0
    1.65  
    1.66  EOT
    1.67 -	fi
    1.68  	chmod +x $fs/usr/bin/lxsession-logout
    1.69  }
     2.1 --- a/lxpanel/stuff/default/panels/panel	Sat May 16 23:51:07 2009 +0200
     2.2 +++ b/lxpanel/stuff/default/panels/panel	Sun May 17 00:38:37 2009 +0200
     2.3 @@ -35,13 +35,13 @@
     2.4          separator {
     2.5          }
     2.6          item {
     2.7 -            image=/usr/share/icons/Tango/16x16/categories/applications-system.png
     2.8 +            image=/usr/share/icons/SliTaz/16x16/actions/go-next.png
     2.9              command=run
    2.10          }
    2.11          separator {
    2.12          }
    2.13          item {
    2.14 -            image=/usr/share/lxpanel/images/gnome-logout.png
    2.15 +            image=/usr/share/pixmaps/logout.png
    2.16              command=logout
    2.17          }
    2.18      }
    2.19 @@ -126,9 +126,16 @@
    2.20  }
    2.21  
    2.22  Plugin {
    2.23 +    type = space
    2.24 +    Config {
    2.25 +        Size=2
    2.26 +    }
    2.27 +}
    2.28 +
    2.29 +Plugin {
    2.30      type = netstatus
    2.31      Config {
    2.32 -        iface=eth0
    2.33 +        iface=wlan1
    2.34          configtool=subox netbox %i
    2.35      }
    2.36  }
    2.37 @@ -136,7 +143,7 @@
    2.38  Plugin {
    2.39      type = space
    2.40      Config {
    2.41 -        Size=4
    2.42 +        Size=2
    2.43      }
    2.44  }
    2.45  
    2.46 @@ -155,12 +162,6 @@
    2.47      type = launchbar
    2.48      Config {
    2.49          Button {
    2.50 -            id=lxtask.desktop
    2.51 -        }
    2.52 -        Button {
    2.53 -            id=tazctrlbox.desktop
    2.54 -        }
    2.55 -        Button {
    2.56              id=tazpkgbox.desktop
    2.57          }
    2.58      }
    2.59 @@ -169,10 +170,9 @@
    2.60  Plugin {
    2.61      type = dclock
    2.62      Config {
    2.63 -        ClockFmt=%R
    2.64 +        BoldFont=1
    2.65 +		ClockFmt=%R
    2.66          TooltipFmt=%A %x
    2.67 -        Action=desktopbox calendar
    2.68 -        BoldFont=0
    2.69      }
    2.70  }
    2.71