flavors rev 212

jwm: update sytel and menu
author Christophe Lincoln <pankso@slitaz.org>
date Tue Mar 04 15:55:39 2014 +0100 (2014-03-04)
parents 53a99e0737c9
children 0a6262c1180d
files jwm/rootfs/etc/skel/.xinitrc jwm/rootfs/etc/xdg/jwm/system.jwmrc
line diff
     1.1 --- a/jwm/rootfs/etc/skel/.xinitrc	Tue Feb 18 15:38:14 2014 +0000
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,18 +0,0 @@
     1.4 -# ~/.xinitrc: Executed by Slim/LXDM login manager to startx X session.
     1.5 -# You can use F1 with Slim to change your window manager or configure
     1.6 -# it permanently with your personal applications.conf file.
     1.7 -#
     1.8 -. $HOME/.config/slitaz/applications.conf
     1.9 -
    1.10 -[ "$1" ] && WINDOW_MANAGER="$1"
    1.11 -
    1.12 -case "$WINDOW_MANAGER" in
    1.13 -	openbox|lxde*|xfce4|compiz|karmen|dwm|fluxbox*)
    1.14 -		exec ${WINDOW_MANAGER%-session}-session ;;
    1.15 -	razor*)
    1.16 -		exec razor-session ;;
    1.17 -	enlightenment)
    1.18 -		exec enlightenment_start ;;
    1.19 -	*)
    1.20 -		exec $WINDOW_MANAGER ;;
    1.21 -esac
     2.1 --- a/jwm/rootfs/etc/xdg/jwm/system.jwmrc	Tue Feb 18 15:38:14 2014 +0000
     2.2 +++ b/jwm/rootfs/etc/xdg/jwm/system.jwmrc	Tue Mar 04 15:55:39 2014 +0100
     2.3 @@ -4,7 +4,7 @@
     2.4  
     2.5  	<!-- The root menu, if this is undefined you will not get a menu. -->
     2.6  	<!-- Additional RootMenu attributes: onroot, labeled, label -->
     2.7 -	<RootMenu height="24" onroot="12">
     2.8 +	<RootMenu height="22" onroot="12">
     2.9  		<Menu icon="applications-system.png" label="System Tools">
    2.10  			<Program icon="applications-other.png" label="Xload Monitor">
    2.11  				xload -nolabel -bg black -fg grey -hl orange
    2.12 @@ -12,6 +12,12 @@
    2.13  			<Program icon="utilities-system-monitor.png" label="Top Monitor">
    2.14  				terminal -e top
    2.15  			</Program>
    2.16 +			<Program icon="preferences-desktop-locale.png" label="System Language">
    2.17 +				terminal -e su -c tazlocale
    2.18 +			</Program>
    2.19 +			<Program icon="preferences-desktop-keyboard.png" label="System Keymap">
    2.20 +				terminal -e su -c tazkeymap
    2.21 +			</Program>
    2.22  		</Menu>
    2.23  		<Menu icon="applications-development.png" label="Development">
    2.24  			<Program icon="fluid.png" label="Fluid Designer">
    2.25 @@ -25,12 +31,12 @@
    2.26  			<Program icon="internet-web-browser.png" label="Dillo Web browser">
    2.27  				dillo
    2.28  			</Program>
    2.29 +			<Program icon="xchat.png" label="TazIRC IRC client">
    2.30 +				terminal -e 'tazirc --ask'
    2.31 +			</Program>
    2.32  			<Program icon="internet-web-browser.png" label="Local Web server">
    2.33  				browser http://localhost/
    2.34  			</Program>
    2.35 -			<Program icon="xterm.png" label="Scan localhost ports">
    2.36 -				terminal -e "(pscan localhost; read i)"
    2.37 -			</Program>
    2.38  		</Menu>
    2.39  		<Program icon="tazpkg.png" label="Packages manager">terminal -e tazpkg shell</Program>
    2.40  		<Program icon="text-editor.png" label="Nano Text editor">terminal -e nano</Program>
    2.41 @@ -38,7 +44,7 @@
    2.42  		<Program icon="tazpanel.png" label="SliTaz Panel">browser http://tazpanel:82</Program>
    2.43  	</RootMenu>
    2.44  	
    2.45 -	<RootMenu height="24" onroot="3">
    2.46 +	<RootMenu height="22" onroot="3">
    2.47  		<Program icon="system-shut-down.png" label="Shut down system">reboot</Program>
    2.48  		<Program icon="system-restart.png" label="Reboot system">reboot</Program>
    2.49  		<Exit label="Exit JWM" confirm="true" icon="system-suspend.png"/>
    2.50 @@ -46,11 +52,11 @@
    2.51  	</RootMenu>
    2.52  
    2.53     <!-- Additional tray attributes: autohide, width, border, layer, layout -->
    2.54 -   <Tray  x="0" y="-1" height="26">
    2.55 +   <Tray x="0" y="+0" height="22">
    2.56  
    2.57 -      <!-- Additional TrayButton attribute: label -->
    2.58 -      <TrayButton label="Application">root:1</TrayButton>
    2.59 -      <TrayButton label="System">root:3</TrayButton>
    2.60 +      <!-- Additional TrayButton attribute: label, icon, border, popup -->
    2.61 +      <TrayButton label="Application" border="false" popup="">root:1</TrayButton>
    2.62 +      <TrayButton label="System" border="false" popup="">root:3</TrayButton>
    2.63  
    2.64        <!-- <TrayButton label="_">showdesktop</TrayButton> -->
    2.65  
    2.66 @@ -58,7 +64,7 @@
    2.67        <Pager labeled="false" />
    2.68  
    2.69        <!-- Additional TaskList attribute: maxwidth -->
    2.70 -      <TaskList maxwidth="250"/>
    2.71 +      <TaskList maxwidth="250" border="false" />
    2.72  
    2.73        <Dock />
    2.74  
    2.75 @@ -67,7 +73,7 @@
    2.76  		  xload -nolabel -bg black -fg grey -hl orange
    2.77        </Swallow>
    2.78  
    2.79 -      <Clock>xclock</Clock>
    2.80 +      <Clock format="%I:%M">xclock</Clock>
    2.81  
    2.82     </Tray>
    2.83  
    2.84 @@ -77,47 +83,47 @@
    2.85  
    2.86        <Font>FreeSans-9:bold</Font>
    2.87        <Width>4</Width>
    2.88 -      <Height>26</Height>
    2.89 +      <Height>22</Height>
    2.90  
    2.91        <Active>
    2.92 -         <Text>#cfcfcf</Text>
    2.93 -         <!-- <Title>#351a0a:#72320e</Title> -->
    2.94 -         <Title>#351a0a</Title>
    2.95 -         <Outline>#351a0a</Outline>
    2.96 +         <Text>#222222</Text>
    2.97 +         <Title>#dadada:#ededed</Title>
    2.98 +         <Outline>#dadada</Outline>
    2.99           <Opacity>1.0</Opacity>
   2.100        </Active>
   2.101  
   2.102        <Inactive>
   2.103 -         <Text>#bbbbbb</Text>
   2.104 -         <Title>#72320e</Title>
   2.105 -         <Corner>#aaaaaa</Corner>
   2.106 -         <Outline>#72320e</Outline>
   2.107 +         <Text>#888888</Text>
   2.108 +         <Title>#ededed</Title>
   2.109 +         <!-- <Corner>#aaaaaa</Corner> -->
   2.110 +         <Outline>#888888</Outline>
   2.111 +         <Opacity>0.5</Opacity>
   2.112        </Inactive>
   2.113  
   2.114     </WindowStyle>
   2.115  
   2.116     <TaskListStyle>
   2.117        <Font>FreeSans-9:bold</Font>
   2.118 -      <ActiveForeground>black</ActiveForeground>
   2.119 -      <ActiveBackground>gray80:gray90</ActiveBackground>
   2.120 -      <Foreground>black</Foreground>
   2.121 -      <Background>gray90:gray80</Background>
   2.122 +      <ActiveForeground>#cfcfcf</ActiveForeground>
   2.123 +      <ActiveBackground>#444444</ActiveBackground>
   2.124 +      <Foreground>#888888</Foreground>
   2.125 +      <Background>#222222</Background>
   2.126     </TaskListStyle>
   2.127  
   2.128     <!-- Additional TrayStyle attribute: insert -->
   2.129     <TrayStyle>
   2.130        <Font>FreeSans-11:bold</Font>
   2.131 -      <Background>#f9f7f3</Background>
   2.132 -      <Foreground>black</Foreground>
   2.133 -      <Opacity>0.75</Opacity>
   2.134 +      <Background>#222222</Background>
   2.135 +      <Foreground>#cfcfcf</Foreground>
   2.136 +      <Opacity>1.0</Opacity>
   2.137     </TrayStyle>
   2.138  
   2.139     <PagerStyle>
   2.140        <Outline>black</Outline>
   2.141 -      <Foreground>gray90</Foreground>
   2.142 -      <Background>#666666</Background>
   2.143 -      <ActiveForeground>#70849d</ActiveForeground>
   2.144 -      <ActiveBackground>#2e3a67</ActiveBackground>
   2.145 +      <Foreground>#222222</Foreground>
   2.146 +      <Background>#444444</Background>
   2.147 +      <ActiveForeground>#888888</ActiveForeground>
   2.148 +      <ActiveBackground>#666666</ActiveBackground>
   2.149     </PagerStyle>
   2.150  
   2.151     <MenuStyle>
   2.152 @@ -126,35 +132,36 @@
   2.153        <Background>#f9f7f3</Background>
   2.154        <ActiveForeground>white</ActiveForeground>
   2.155        <ActiveBackground>#7A6753:#443b31</ActiveBackground>
   2.156 -      <Opacity>0.85</Opacity>
   2.157 +      <Opacity>1.0</Opacity>
   2.158     </MenuStyle>
   2.159  
   2.160 -   <PopupStyle>
   2.161 -      <Font>FreeSans-16</Font>
   2.162 +   <PopupStyle delay="100">
   2.163 +      <Font>FreeSans-18</Font>
   2.164        <Outline>#dddddd</Outline>
   2.165        <Foreground>black</Foreground>
   2.166        <Background>#f9f7f3</Background>
   2.167     </PopupStyle>
   2.168  
   2.169     <IconPath>$HOME/.icons</IconPath>
   2.170 -   <IconPath>/usr/share/pixmaps</IconPath>
   2.171     <IconPath>/usr/share/icons/SliTaz/apps/22</IconPath>
   2.172     <IconPath>/usr/share/icons/SliTaz/categories/22</IconPath>
   2.173 +   <IconPath>/usr/share/pixmaps</IconPath>
   2.174  
   2.175     <!-- Virtual Desktops -->
   2.176     <!-- Desktop tags can be contained within Desktops for desktop names. -->
   2.177 -   <Desktops count="2">
   2.178 +   <Desktops width="2">
   2.179  
   2.180        <!-- Default background. Note that a Background tag can be
   2.181             contained within a Desktop tag to give a specific background
   2.182 -           for that desktop.
   2.183 -       -->
   2.184 -      <Background type="image">/usr/share/images/slitaz-background.jpg</Background>
   2.185 +           for that desktop. -->
   2.186 +      <Background type="command">
   2.187 +		  hsetroot -fill /usr/share/images/slitaz-background.jpg
   2.188 +	  </Background>
   2.189  
   2.190     </Desktops>
   2.191  
   2.192     <!-- Startup and shutdown commands. -->
   2.193 -   <StartupCommand></StartupCommand>
   2.194 +   <StartupCommand>compton -Cc -r 10 -o 0.5</StartupCommand>
   2.195     <ShutdownCommand></ShutdownCommand>
   2.196  
   2.197     <!-- Double click speed (in milliseconds) -->
   2.198 @@ -164,7 +171,7 @@
   2.199     <DoubleClickDelta>2</DoubleClickDelta>
   2.200  
   2.201     <!-- The focus model (sloppy or click) -->
   2.202 -   <FocusModel>sloppy</FocusModel>
   2.203 +   <FocusModel>click</FocusModel>
   2.204  
   2.205     <!-- The snap mode (none, screen, or border) -->
   2.206     <SnapMode distance="10">border</SnapMode>