--- alx-src/trunk/tinyalxconfig-ng/functions/config_sessions.sh	2008/06/07 17:10:04	484
+++ alx-src/trunk/tinyalxconfig-ng/functions/config_sessions.sh	2008/06/10 13:15:11	498
@@ -1,4 +1,4 @@
-# $Header: /home/cvsd/alx-cvs/alx-src/tinyalxconfig-ng/functions/config_sessions.sh,v 1.3 2008-06-07 17:10:04 niro Exp $
+# $Header: /home/cvsd/alx-cvs/alx-src/tinyalxconfig-ng/functions/config_sessions.sh,v 1.4 2008-06-10 13:07:48 niro Exp $
 # configures ica-sessions on the host via mysql db settings
 
 get_sessions_settings()
@@ -40,6 +40,17 @@
 	export ALX_AUTOSTART
 }
 
+get_theme_settings()
+{
+	# get settings from database
+	ALX_THEME=$(mysqldo "select theme from cfg_theme where serial='${ALX_SERIAL}'")
+
+	# default setting (use old alx-theme atm)
+	[[ -z ${ALX_THEME} ]] && ALX_THEME=LemonSpace
+
+	export ALX_THEME
+}
+
 get_screensaver_settings()
 {
 	ALX_SCRN_SAVER=$(mysqldo "select screensaver from cfg_screensaver where serial='${ALX_SERIAL}'")
@@ -322,9 +333,6 @@
 	xres="$(( ${xres} - 120 ))"
 	yres="$(( ${yres} - 80 ))"
 
-	# basic config
-	cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc
-
 	# clean desktop icon location
 	[ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop
 	install -d ${ALX_UNPRIV_HOME}/.xtdesktop
@@ -447,6 +455,9 @@
 
 config_sessions()
 {
+	# get theme settings
+	get_theme_settings
+
 	# generate ica session files
 	generate_ica_session_files
 
@@ -459,6 +470,9 @@
 	local icon
 	local i
 
+	# basic config for xtdeskop
+	cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc-${ALX_THEME} > ${ALX_UNPRIV_HOME}/.xtdeskrc
+
 	# now setup fluxbox for user station
 
 	# create a fresh fluxbox directory
@@ -466,14 +480,15 @@
 	install -d ${ALX_UNPRIV_HOME}/.fluxbox
 
 	# now generate fluxbox config files
+	# copy theme
+	[[ ! -d /usr/share/fluxbox/styles ]] && install -d /usr/share/fluxbox/styles
+	cat ${ALX_SKELETONS}/fluxbox/themes/${ALX_THEME} > /usr/share/fluxbox/styles/default
 
 	# fluxbox main config
-	cat ${ALX_SKELETONS}/fluxbox/init \
-		> ${ALX_UNPRIV_HOME}/.fluxbox/init
+	cat ${ALX_SKELETONS}/fluxbox/init > ${ALX_UNPRIV_HOME}/.fluxbox/init
 
 	# fluxbox autostart
-	cat ${ALX_SKELETONS}/fluxbox/apps \
-		> ${ALX_UNPRIV_HOME}/.fluxbox/apps
+	cat ${ALX_SKELETONS}/fluxbox/apps > ${ALX_UNPRIV_HOME}/.fluxbox/apps
 
 	# add screensaver
 	if [[ -n ${ALX_SCRN_SAVER} ]] && [[ -n ${ALX_SCRN_TIMEOUT} ]]
@@ -499,17 +514,14 @@
 	fi
 
 	# fluxbox hotkeys
-	cat ${ALX_SKELETONS}/fluxbox/keys \
-		> ${ALX_UNPRIV_HOME}/.fluxbox/keys
+	cat ${ALX_SKELETONS}/fluxbox/keys > ${ALX_UNPRIV_HOME}/.fluxbox/keys
 
 	# fluxbox menu header
-	cat ${ALX_SKELETONS}/fluxbox/menu.header \
-		> ${ALX_UNPRIV_HOME}/.fluxbox/menu
+	cat ${ALX_SKELETONS}/fluxbox/menu.header > ${ALX_UNPRIV_HOME}/.fluxbox/menu
 
 	# now fix it with proper messages :P
 	local ver="$(< /etc/mageversion)"
-	sed -i "s:@CHANGEME@:tinyALX-${ver}  #${ALX_SERIAL}:g" \
-		${ALX_UNPRIV_HOME}/.fluxbox/menu
+	sed -i "s:@CHANGEME@:tinyALX-${ver}  #${ALX_SERIAL}:g" ${ALX_UNPRIV_HOME}/.fluxbox/menu
 
 	# add a newline (maybe there is no crlf in the header)
 	echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
@@ -526,8 +538,7 @@
 	get_other_menuitems >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
 
 	# fluxbox menu footer
-	cat ${ALX_SKELETONS}/fluxbox/menu.footer \
-		>> ${ALX_UNPRIV_HOME}/.fluxbox/menu
+	cat ${ALX_SKELETONS}/fluxbox/menu.footer >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
 
 	# add a newline (maybe there is no crlf in the footer)
 	echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu