slitaz-arm rev 109
Improve R-Pi/JWM desktop
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Fri Apr 18 14:35:51 2014 +0200 (2014-04-18) |
| parents | fd283c8054a5 |
| children | a02d52c27190 |
| files | flavors/rpi-desktop/packages.list rootfs/etc/init.d/rcS rootfs/etc/xdg/jwm/menus.jwmrc rootfs/etc/xdg/jwm/system.jwmrc rootfs/usr/bin/xcal |
line diff
1.1 --- a/flavors/rpi-desktop/packages.list Fri Apr 18 08:54:12 2014 +0100 1.2 +++ b/flavors/rpi-desktop/packages.list Fri Apr 18 14:35:51 2014 +0200 1.3 @@ -112,3 +112,4 @@ 1.4 alsa-utils 1.5 mpg123 1.6 lua 1.7 +svkbd
2.1 --- a/rootfs/etc/init.d/rcS Fri Apr 18 08:54:12 2014 +0100 2.2 +++ b/rootfs/etc/init.d/rcS Fri Apr 18 14:35:51 2014 +0200 2.3 @@ -59,7 +59,8 @@ 2.4 syslogd -s ${SYSLOGD_SIZE} && klogd 2.5 status 2.6 2.7 -# Run post install configs on first boot --> into a script ? 2.8 +# Run post install configs on first boot 2.9 +# /etc/init.d/post-install.sh --> into a script ? 2.10 if [ ! -f "/var/lib/slitaz/post-install" ]; then 2.11 colorize 33 "Running post install configs..." 2.12 mkdir -p /var/lib/slitaz 2.13 @@ -67,12 +68,13 @@ 2.14 [ -s /etc/keymap.conf ] || tazkeymap 2.15 #[ -s /etc/locale.conf ] || tazlocale 2.16 slitaz-config root_passwd 2.17 - # add a user: slitaz-config add_user 2.18 + slitaz-config add_user 2.19 + [ -x "/var/lib/post-install.sh" ] && /var/lib/post-install.sh 2.20 # Run packages post_install since when we generate a distro from 2.21 # an i486 machine we can't chroot and run ARM binaries. If we don't 2.22 # run some post_install we will miss gtk icon, pango modules, etc... 2.23 - # echo "Configuring all SliTaz packages..." 2.24 - # spk reconf --all 2.25 + colorize 33 "Configuring all SliTaz packages..." 2.26 + spk reconf --all 2.27 fi 2.28 2.29 # Load all modules from config file
3.1 --- a/rootfs/etc/xdg/jwm/menus.jwmrc Fri Apr 18 08:54:12 2014 +0100 3.2 +++ b/rootfs/etc/xdg/jwm/menus.jwmrc Fri Apr 18 14:35:51 2014 +0200 3.3 @@ -24,7 +24,7 @@ 3.4 </Menu> 3.5 3.6 <Menu icon="applications-multimedia.png" label="Multimedia"> 3.7 - <Program icon="audio-mixer.png" label="Alsaplayer Mixer">terminal -e alsamixer</Program> 3.8 + <Program icon="audio-x-generic.png" label="Alsaplayer Mixer">terminal -e alsamixer</Program> 3.9 </Menu> 3.10 3.11 <Menu icon="applications-games.png" label="Games">
4.1 --- a/rootfs/etc/xdg/jwm/system.jwmrc Fri Apr 18 08:54:12 2014 +0100 4.2 +++ b/rootfs/etc/xdg/jwm/system.jwmrc Fri Apr 18 14:35:51 2014 +0200 4.3 @@ -2,8 +2,8 @@ 4.4 4.5 <JWM> 4.6 4.7 - <!-- SliTaz menus --> 4.8 - <Include>/etc/xdg/jwm/menus.jwmrc</Include> 4.9 + <!-- SliTaz menus --> 4.10 + <Include>/etc/xdg/jwm/menus.jwmrc</Include> 4.11 4.12 <!-- Additional tray attributes: autohide, width, border, layer, layout --> 4.13 <Tray x="0" y="+0" height="24"> 4.14 @@ -27,7 +27,7 @@ 4.15 xload -nolabel -bg black -fg grey -hl orange 4.16 </Swallow> 4.17 4.18 - <Clock format="%I:%M">xclock</Clock> 4.19 + <Clock format="%I:%M">xcal</Clock> 4.20 4.21 </Tray> 4.22 4.23 @@ -99,6 +99,8 @@ 4.24 <IconPath>$HOME/.icons</IconPath> 4.25 <IconPath>/usr/share/icons/SliTaz/apps/22</IconPath> 4.26 <IconPath>/usr/share/icons/SliTaz/categories/22</IconPath> 4.27 + <IconPath>/usr/share/icons/SliTaz/mimetypes/32</IconPath> 4.28 + <IconPath>/usr/share/icons/SliTaz/devices/22</IconPath> 4.29 <IconPath>/usr/share/pixmaps</IconPath> 4.30 4.31 <!-- Virtual Desktops --> 4.32 @@ -128,7 +130,7 @@ 4.33 <FocusModel>click</FocusModel> 4.34 4.35 <!-- The snap mode (none, screen, or border) --> 4.36 - <SnapMode distance="10">border</SnapMode> 4.37 + <SnapMode distance="20">border</SnapMode> 4.38 4.39 <!-- The move mode (outline or opaque) --> 4.40 <MoveMode>opaque</MoveMode> 4.41 @@ -153,5 +155,9 @@ 4.42 <Key mask="A" key="#">desktop#</Key> 4.43 <Key mask="A" key="F1">root:1</Key> 4.44 <Key mask="A" key="F2">window</Key> 4.45 + 4.46 + <Key mask="" key="Print">exec:shutterbug</Key> 4.47 + <Key mask="" key="F11">exec:amixer set PCM 5%- unmute</Key> 4.48 + <Key mask="" key="F12">exec:amixer set PCM 5%+ unmute</Key> 4.49 4.50 </JWM>