# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1393944939 -3600
# Node ID f36448d4587a2e94dd9eed7fee7e504bfc9ec31a
# Parent  53a99e0737c90a527af9f978ddbe5d217c15539d
jwm: update sytel and menu

diff -r 53a99e0737c9 -r f36448d4587a jwm/rootfs/etc/skel/.xinitrc
--- a/jwm/rootfs/etc/skel/.xinitrc	Tue Feb 18 15:38:14 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# ~/.xinitrc: Executed by Slim/LXDM login manager to startx X session.
-# You can use F1 with Slim to change your window manager or configure
-# it permanently with your personal applications.conf file.
-#
-. $HOME/.config/slitaz/applications.conf
-
-[ "$1" ] && WINDOW_MANAGER="$1"
-
-case "$WINDOW_MANAGER" in
-	openbox|lxde*|xfce4|compiz|karmen|dwm|fluxbox*)
-		exec ${WINDOW_MANAGER%-session}-session ;;
-	razor*)
-		exec razor-session ;;
-	enlightenment)
-		exec enlightenment_start ;;
-	*)
-		exec $WINDOW_MANAGER ;;
-esac
diff -r 53a99e0737c9 -r f36448d4587a jwm/rootfs/etc/xdg/jwm/system.jwmrc
--- a/jwm/rootfs/etc/xdg/jwm/system.jwmrc	Tue Feb 18 15:38:14 2014 +0000
+++ b/jwm/rootfs/etc/xdg/jwm/system.jwmrc	Tue Mar 04 15:55:39 2014 +0100
@@ -4,7 +4,7 @@
 
 	<!-- The root menu, if this is undefined you will not get a menu. -->
 	<!-- Additional RootMenu attributes: onroot, labeled, label -->
-	<RootMenu height="24" onroot="12">
+	<RootMenu height="22" onroot="12">
 		<Menu icon="applications-system.png" label="System Tools">
 			<Program icon="applications-other.png" label="Xload Monitor">
 				xload -nolabel -bg black -fg grey -hl orange
@@ -12,6 +12,12 @@
 			<Program icon="utilities-system-monitor.png" label="Top Monitor">
 				terminal -e top
 			</Program>
+			<Program icon="preferences-desktop-locale.png" label="System Language">
+				terminal -e su -c tazlocale
+			</Program>
+			<Program icon="preferences-desktop-keyboard.png" label="System Keymap">
+				terminal -e su -c tazkeymap
+			</Program>
 		</Menu>
 		<Menu icon="applications-development.png" label="Development">
 			<Program icon="fluid.png" label="Fluid Designer">
@@ -25,12 +31,12 @@
 			<Program icon="internet-web-browser.png" label="Dillo Web browser">
 				dillo
 			</Program>
+			<Program icon="xchat.png" label="TazIRC IRC client">
+				terminal -e 'tazirc --ask'
+			</Program>
 			<Program icon="internet-web-browser.png" label="Local Web server">
 				browser http://localhost/
 			</Program>
-			<Program icon="xterm.png" label="Scan localhost ports">
-				terminal -e "(pscan localhost; read i)"
-			</Program>
 		</Menu>
 		<Program icon="tazpkg.png" label="Packages manager">terminal -e tazpkg shell</Program>
 		<Program icon="text-editor.png" label="Nano Text editor">terminal -e nano</Program>
@@ -38,7 +44,7 @@
 		<Program icon="tazpanel.png" label="SliTaz Panel">browser http://tazpanel:82</Program>
 	</RootMenu>
 	
-	<RootMenu height="24" onroot="3">
+	<RootMenu height="22" onroot="3">
 		<Program icon="system-shut-down.png" label="Shut down system">reboot</Program>
 		<Program icon="system-restart.png" label="Reboot system">reboot</Program>
 		<Exit label="Exit JWM" confirm="true" icon="system-suspend.png"/>
@@ -46,11 +52,11 @@
 	</RootMenu>
 
    <!-- Additional tray attributes: autohide, width, border, layer, layout -->
-   <Tray  x="0" y="-1" height="26">
+   <Tray x="0" y="+0" height="22">
 
-      <!-- Additional TrayButton attribute: label -->
-      <TrayButton label="Application">root:1</TrayButton>
-      <TrayButton label="System">root:3</TrayButton>
+      <!-- Additional TrayButton attribute: label, icon, border, popup -->
+      <TrayButton label="Application" border="false" popup="">root:1</TrayButton>
+      <TrayButton label="System" border="false" popup="">root:3</TrayButton>
 
       <!-- <TrayButton label="_">showdesktop</TrayButton> -->
 
@@ -58,7 +64,7 @@
       <Pager labeled="false" />
 
       <!-- Additional TaskList attribute: maxwidth -->
-      <TaskList maxwidth="250"/>
+      <TaskList maxwidth="250" border="false" />
 
       <Dock />
 
@@ -67,7 +73,7 @@
 		  xload -nolabel -bg black -fg grey -hl orange
       </Swallow>
 
-      <Clock>xclock</Clock>
+      <Clock format="%I:%M">xclock</Clock>
 
    </Tray>
 
@@ -77,47 +83,47 @@
 
       <Font>FreeSans-9:bold</Font>
       <Width>4</Width>
-      <Height>26</Height>
+      <Height>22</Height>
 
       <Active>
-         <Text>#cfcfcf</Text>
-         <!-- <Title>#351a0a:#72320e</Title> -->
-         <Title>#351a0a</Title>
-         <Outline>#351a0a</Outline>
+         <Text>#222222</Text>
+         <Title>#dadada:#ededed</Title>
+         <Outline>#dadada</Outline>
          <Opacity>1.0</Opacity>
       </Active>
 
       <Inactive>
-         <Text>#bbbbbb</Text>
-         <Title>#72320e</Title>
-         <Corner>#aaaaaa</Corner>
-         <Outline>#72320e</Outline>
+         <Text>#888888</Text>
+         <Title>#ededed</Title>
+         <!-- <Corner>#aaaaaa</Corner> -->
+         <Outline>#888888</Outline>
+         <Opacity>0.5</Opacity>
       </Inactive>
 
    </WindowStyle>
 
    <TaskListStyle>
       <Font>FreeSans-9:bold</Font>
-      <ActiveForeground>black</ActiveForeground>
-      <ActiveBackground>gray80:gray90</ActiveBackground>
-      <Foreground>black</Foreground>
-      <Background>gray90:gray80</Background>
+      <ActiveForeground>#cfcfcf</ActiveForeground>
+      <ActiveBackground>#444444</ActiveBackground>
+      <Foreground>#888888</Foreground>
+      <Background>#222222</Background>
    </TaskListStyle>
 
    <!-- Additional TrayStyle attribute: insert -->
    <TrayStyle>
       <Font>FreeSans-11:bold</Font>
-      <Background>#f9f7f3</Background>
-      <Foreground>black</Foreground>
-      <Opacity>0.75</Opacity>
+      <Background>#222222</Background>
+      <Foreground>#cfcfcf</Foreground>
+      <Opacity>1.0</Opacity>
    </TrayStyle>
 
    <PagerStyle>
       <Outline>black</Outline>
-      <Foreground>gray90</Foreground>
-      <Background>#666666</Background>
-      <ActiveForeground>#70849d</ActiveForeground>
-      <ActiveBackground>#2e3a67</ActiveBackground>
+      <Foreground>#222222</Foreground>
+      <Background>#444444</Background>
+      <ActiveForeground>#888888</ActiveForeground>
+      <ActiveBackground>#666666</ActiveBackground>
    </PagerStyle>
 
    <MenuStyle>
@@ -126,35 +132,36 @@
       <Background>#f9f7f3</Background>
       <ActiveForeground>white</ActiveForeground>
       <ActiveBackground>#7A6753:#443b31</ActiveBackground>
-      <Opacity>0.85</Opacity>
+      <Opacity>1.0</Opacity>
    </MenuStyle>
 
-   <PopupStyle>
-      <Font>FreeSans-16</Font>
+   <PopupStyle delay="100">
+      <Font>FreeSans-18</Font>
       <Outline>#dddddd</Outline>
       <Foreground>black</Foreground>
       <Background>#f9f7f3</Background>
    </PopupStyle>
 
    <IconPath>$HOME/.icons</IconPath>
-   <IconPath>/usr/share/pixmaps</IconPath>
    <IconPath>/usr/share/icons/SliTaz/apps/22</IconPath>
    <IconPath>/usr/share/icons/SliTaz/categories/22</IconPath>
+   <IconPath>/usr/share/pixmaps</IconPath>
 
    <!-- Virtual Desktops -->
    <!-- Desktop tags can be contained within Desktops for desktop names. -->
-   <Desktops count="2">
+   <Desktops width="2">
 
       <!-- Default background. Note that a Background tag can be
            contained within a Desktop tag to give a specific background
-           for that desktop.
-       -->
-      <Background type="image">/usr/share/images/slitaz-background.jpg</Background>
+           for that desktop. -->
+      <Background type="command">
+		  hsetroot -fill /usr/share/images/slitaz-background.jpg
+	  </Background>
 
    </Desktops>
 
    <!-- Startup and shutdown commands. -->
-   <StartupCommand></StartupCommand>
+   <StartupCommand>compton -Cc -r 10 -o 0.5</StartupCommand>
    <ShutdownCommand></ShutdownCommand>
 
    <!-- Double click speed (in milliseconds) -->
@@ -164,7 +171,7 @@
    <DoubleClickDelta>2</DoubleClickDelta>
 
    <!-- The focus model (sloppy or click) -->
-   <FocusModel>sloppy</FocusModel>
+   <FocusModel>click</FocusModel>
 
    <!-- The snap mode (none, screen, or border) -->
    <SnapMode distance="10">border</SnapMode>