Diff of /alx-src/branches/alxconf-060/functions/config_sessions.sh

Parent Directory | Revision Log | Patch

	revision 2469 by niro, Mon Jun 27 15:07:00 2011 UTC	revision 2565 by niro, Mon Jul 4 20:17:25 2011 UTC
#	Line 162  generate_icon()	Line 162  generate_icon()
162	[[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.idesktop/${name}.lnk"	[[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.idesktop/${name}.lnk"
163
164	# use some defaults for icon, dest, {x,y}res	# use some defaults for icon, dest, {x,y}res
165	[[ -z ${xres} ]] && xres=30	[[ -z ${xres} ]] && xres=50
166	[[ -z ${yres} ]] && xres=30	[[ -z ${yres} ]] && xres=50
167	if [[ -z ${icon} ]] || [ ! -f ${icon} ]	if [[ -z ${icon} ]] || [ ! -f ${icon} ]
168	then	then
169	# if no default icon is given use default.png	# if no default icon is given use default.png
#	Line 231  generate_all_desktop_icons()	Line 231  generate_all_desktop_icons()
231	install -d ${dest}	install -d ${dest}
232
233	# default settings	# default settings
234	declare -i x=30	declare -i x=50
235	declare -i y=30	declare -i y=50
236
237	# ica icons	# ica icons
238	for i in ${session_list}	for i in ${session_list}
#	Line 246  generate_all_desktop_icons()	Line 246  generate_all_desktop_icons()
246	# new line if x > xres	# new line if x > xres
247	if [ ${x} -ge ${xres} ]	if [ ${x} -ge ${xres} ]
248	then	then
249	x=30	x=50
250	y=$((${y} + 80))	y=$((${y} + 80))
251	fi	fi
252
#	Line 254  generate_all_desktop_icons()	Line 254  generate_all_desktop_icons()
254	if [ ${y} -ge ${yres} ]	if [ ${y} -ge ${yres} ]
255	then	then
256	x=$((${x} + 120))	x=$((${x} + 120))
257	y=30	y=50
258
259	# re-check x	# re-check x
260	[ ${x} -ge ${xres} ] && x=30	[ ${x} -ge ${xres} ] && x=50
261	fi	fi
262
263	generate_icon \	generate_icon \
#	Line 282  generate_all_desktop_icons()	Line 282  generate_all_desktop_icons()
282	# new line if x > xres	# new line if x > xres
283	if [ ${x} -ge ${xres} ]	if [ ${x} -ge ${xres} ]
284	then	then
285	x=30	x=50
286	y=$((${y} + 80))	y=$((${y} + 80))
287	fi	fi
288
#	Line 290  generate_all_desktop_icons()	Line 290  generate_all_desktop_icons()
290	if [ ${y} -ge ${yres} ]	if [ ${y} -ge ${yres} ]
291	then	then
292	x=$((${x} + 120))	x=$((${x} + 120))
293	y=30	y=50
294
295	# re-check x	# re-check x
296	[ ${x} -ge ${xres} ] && x=30	[ ${x} -ge ${xres} ] && x=50
297	fi	fi
298
299	generate_icon \	generate_icon \
#	Line 311  generate_all_desktop_icons()	Line 311  generate_all_desktop_icons()
311	# add shutdown, reboot icons	# add shutdown, reboot icons
312	for i in shutdown reboot	for i in shutdown reboot
313	do	do
	# abort if empty
	[[ -z ${i} ]] && continue
314	# new line if x > xres	# new line if x > xres
315	if [ ${x} -ge ${xres} ]	if [ ${x} -ge ${xres} ]
316	then	then
317	x=30	x=50
318	y=$((${y} + 80))	y=$((${y} + 80))
319	fi	fi
320
#	Line 325  generate_all_desktop_icons()	Line 322  generate_all_desktop_icons()
322	if [ ${y} -ge ${yres} ]	if [ ${y} -ge ${yres} ]
323	then	then
324	x=$((${x} + 120))	x=$((${x} + 120))
325	y=30	y=50
326
327	# re-check x	# re-check x
328	[ ${x} -ge ${xres} ] && x=30	[ ${x} -ge ${xres} ] && x=50
329	fi	fi
330
331	case ${i} in	case ${i} in
332	shutdown) name="Herunterfahren"	shutdown) name="Herunterfahren" ;;
333	reboot) name="Neustarten"	reboot) name="Neustarten" ;;
334	esac	esac
335
336	generate_icon \	generate_icon \
#	Line 342  generate_all_desktop_icons()	Line 339  generate_all_desktop_icons()
339	--icon "${ALX_SESSIONS_ICONS}/${i}.png" \	--icon "${ALX_SESSIONS_ICONS}/${i}.png" \
340	--dest "${dest}/${i}.lnk" \	--dest "${dest}/${i}.lnk" \
341	--xres "${x}" \	--xres "${x}" \
342	--yres "${y}"	--yres "${y}" \
343		--icon-width "40" \
344		--icon-height "40"
345
346	y=$((${y} + 80))	y=$((${y} + 80))
347	done	done

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.2469   changed lines   Added in v.2565