slitaz-tools rev 957

tazkeymap: specify keymap is Unicode; tazbox: fix icons, time zone selection, and misc.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sun Nov 08 22:09:10 2015 +0200 (2015-11-08)
parents f26fae7c6159
children 465ebc61ed8d
files boxes/scp-box tazbox/tazbox tinyutils/tazkeymap
line diff
     1.1 --- a/boxes/scp-box	Sun Nov 08 09:07:35 2015 +0000
     1.2 +++ b/boxes/scp-box	Sun Nov 08 22:09:10 2015 +0200
     1.3 @@ -83,8 +83,8 @@
     1.4  		--field="$(_n 'Local file:'):FL" "$file" \
     1.5  		--field="$(_n 'Local directory:'):DIR" "$dir" \
     1.6  		--field="$(_n 'Remote path:')" "" \
     1.7 -		--button="$(_n 'Download'):2" \
     1.8 -		--button="$(_n 'Upload'):0" \
     1.9 +		--button="$(_n 'Download')!go-down:2" \
    1.10 +		--button="$(_n 'Upload')!go-up:0" \
    1.11  		--button="gtk-close:1"
    1.12  }
    1.13  
     2.1 --- a/tazbox/tazbox	Sun Nov 08 09:07:35 2015 +0000
     2.2 +++ b/tazbox/tazbox	Sun Nov 08 22:09:10 2015 +0200
     2.3 @@ -200,7 +200,7 @@
     2.4  		--list --column="$(_n 'Flag'):IMG" --column $(_n 'Name') \
     2.5  		--column $(_n 'Description') \
     2.6  		--print-column='2' --separator='' \
     2.7 -		--button="$(_n 'Manage')!stock_properties:2" \
     2.8 +		--button="$(_n 'Manage')!document-properties:2" \
     2.9  		--button="gtk-cancel:1" --button="gtk-ok:0"
    2.10  }
    2.11  
    2.12 @@ -267,7 +267,7 @@
    2.13  
    2.14  tz_list() {
    2.15  	find $zi | \
    2.16 -		grep -E "$(cat $ztab | grep "^$1	" | cut -d'	' -f2 | tr ' ' '|')" | \
    2.17 +		grep -E "$(awk -F$'\t' -vv="$1" '{if ($1 == v || $2 ~ v) print $2}' $ztab | tr ' ' '|')" | \
    2.18  		grep -v -E "posix|right" | \
    2.19  		sed 's|.*/||g' | sort
    2.20  }
    2.21 @@ -306,7 +306,7 @@
    2.22  			cat << EOT
    2.23  $CC
    2.24  $CC
    2.25 -$(grep -m1 "$CC	" ${zi}iso3166.tab | cut -d$'\t' -f2)
    2.26 +$(grep -m1 "$CC	" ${zi}iso3166.tab | cut -d$'\t' -f2 | sed 's|\&|&amp;|g')
    2.27  EOT
    2.28  		done | \
    2.29  		yad --title="$(_ 'SliTaz TZ')" --window-icon="$icon" \
    2.30 @@ -317,7 +317,7 @@
    2.31  \n\n$(_ 'Tip: manage timezones list by installing/removing locale packages.')" \
    2.32  			--list \
    2.33  			--column="$(_n 'Flag'):IMG" --column=$(_n 'Code') --column=$(_n 'Country') \
    2.34 -			--button="$(_n 'Manage')!stock_properties:4" \
    2.35 +			--button="$(_n 'Manage')!document-properties:4" \
    2.36  			--button="$(_n 'Manual')!gtk-index:2" \
    2.37  			--button="gtk-go-forward:0" \
    2.38  			--button="gtk-cancel:1" --always-print-result \
    2.39 @@ -352,16 +352,18 @@
    2.40  
    2.41  
    2.42  tz() {
    2.43 -	icon='clock'
    2.44 +	icon='preferences-system-time'
    2.45  	arg=$(tz_suggest)
    2.46  
    2.47  	timezone=$(tz_select $arg)
    2.48  	case $? in
    2.49  		1) exit 0 ;;
    2.50 -		0) [ -n "$arg" ] && timezone=$(tz_select "$timezone")
    2.51 +		0)
    2.52 +			[ -n "$timezone" ] && timezone=$(tz_select "$timezone")
    2.53  			[ -z "$timezone" ] && exit 0
    2.54  			timezone=$(find $zi -name $timezone | grep -v -E "posix|right" | \
    2.55 -				sed "s|$zi||") ;;
    2.56 +				sed "s|$zi||")
    2.57 +			;;
    2.58  		2) timezone=$(tz_select "index") ;;
    2.59  		4) tazbox manage_i18n main;;
    2.60  	esac
    2.61 @@ -426,11 +428,11 @@
    2.62  			--width='400' --on-top --center \
    2.63  			--image="$icon" --image-on-top \
    2.64  			--text="$(_n 'Please, recharge packages database.')" \
    2.65 -			--button="$(_n 'Recharge list')!reload:2" \
    2.66 +			--button="$(_n 'Recharge list')!view-refresh:2" \
    2.67  			--button="gtk-cancel:1"
    2.68  
    2.69  		case "$?" in
    2.70 -			1) rm_tmp; return;;
    2.71 +			1) rm_temp; return;;
    2.72  			2) tazbox recharge;;
    2.73  		esac
    2.74  	fi
    2.75 @@ -490,7 +492,7 @@
    2.76  		done
    2.77  	fi
    2.78  
    2.79 -	icon='stock_properties'
    2.80 +	icon='preferences-desktop-locale'
    2.81  	cat $PKGS_LIST | \
    2.82  	{
    2.83  		yad --title="$(_n 'Manage locale packages')" --window-icon="$icon" \
    2.84 @@ -501,15 +503,15 @@
    2.85  		--column="$(_n 'Inst.'):CHK" --column="$(_n 'Package Name'):TEXT" \
    2.86  		--column="$(_n 'Description'):TEXT" --column="$(_n 'Size'):TEXT" \
    2.87  		--column="$(_n 'Installed'):TEXT" \
    2.88 -		--button="$(_n 'Recharge list')!reload:4" \
    2.89 -		--button="$(_n 'Install/Remove')!system-upgrade:2" \
    2.90 +		--button="$(_n 'Recharge list')!view-refresh:4" \
    2.91 +		--button="$(_n 'Install/Remove')!gtk-execute:2" \
    2.92  		--button="gtk-cancel:1" \
    2.93  		--print-all
    2.94  	} > $ANSWER
    2.95  
    2.96  	case "$?" in
    2.97  		1) rm_temp; exit 0;;
    2.98 -		4) tazbox recharge; rm_tmp; tazbox manage_i18n; exit 0;;
    2.99 +		4) tazbox recharge; rm_temp; tazbox manage_i18n; exit 0;;
   2.100  	esac
   2.101  
   2.102  	grep -e 'TRUE' $ANSWER | cut -d'|' -f2 > $NEW_LIST
   2.103 @@ -521,7 +523,7 @@
   2.104  	if [ -z "$DIFF" ]; then rm_temp; exit 0; fi
   2.105  
   2.106  	# output log to gtk window
   2.107 -	title="$(_n 'TazPkg log')"; icon='tazpkg'; opts='--tail'
   2.108 +	title="$(_n 'TazPkg log')"; icon='system-software-update'; opts='--tail'
   2.109  	{
   2.110  		for pkg in $(echo "$DIFF" | grep -e '^-' | sed 's|^-||g'); do
   2.111  			_ 'REMOVE: %s' "$pkg"
   2.112 @@ -541,14 +543,14 @@
   2.113  # New file functions
   2.114  
   2.115  newfile_main() {
   2.116 -	icon='gtk-new'
   2.117 +	icon='document-new'
   2.118  	yad --title="$(_n 'New file')" --window-icon="$icon" \
   2.119  		--width='460' --height='160' --on-top --center \
   2.120  		--image="$icon" --image-on-top \
   2.121  		--icon="$icon" \
   2.122  		--text="<b>$(_n 'Create a new file or folder on your desktop')</b>" \
   2.123  		--entry --entry-label="$(_n 'File name')" \
   2.124 -		--ricon='editclear' \
   2.125 +		--ricon='edit-clear' \
   2.126  		--always-print-result \
   2.127  		--button="$(_n 'SHell script')!application-x-shellscript:4" \
   2.128  		--button="$(_n 'Folder')!folder:3" \
   2.129 @@ -579,7 +581,7 @@
   2.130  # All applications
   2.131  
   2.132  all_apps() {
   2.133 -	icon='stock_bookmark'
   2.134 +	icon='user-bookmarks'
   2.135  	yad --title="$(_n 'All Applications')" --window-icon="$icon" \
   2.136  		--width='400' --height='400' \
   2.137  		--icons --compact \
   2.138 @@ -675,7 +677,7 @@
   2.139  	out-dl)
   2.140  		# A tiny GTK window for Busybox wget output
   2.141  		url="$2"; opts='--tail --button=gtk-cancel:1'
   2.142 -		icon='folder-downloads'; title="$(_ 'Downloading...')"
   2.143 +		icon='folder-download'; title="$(_ 'Downloading...')"
   2.144  		[ -d $DOWNLOADS ] || mkdir -p $DOWNLOADS
   2.145  		busybox wget -c -P $DOWNLOADS $url 2>&1 | output_command
   2.146  		cancel_dl
   2.147 @@ -717,7 +719,7 @@
   2.148  		# On screen notification box.
   2.149  		icon="$3"
   2.150  		time="$4"
   2.151 -		[ -z "$icon" ] && icon='info'
   2.152 +		[ -z "$icon" ] && icon='dialog-information'
   2.153  		[ -z "$time" ] && time='4'
   2.154  		yad --width='520' --height='80' --timeout="$time" --timeout-indicator='right' \
   2.155  			--on-top --center --no-buttons --borders='12' --undecorated \
   2.156 @@ -764,7 +766,7 @@
   2.157  		;;
   2.158  
   2.159  	gpl)
   2.160 -		yad --title='GNU General Public License' --window-icon='text-x-generic' \
   2.161 +		yad --title='GNU General Public License' --window-icon='text-x-copying' \
   2.162  			--geometry='650x500' \
   2.163  			--image='/usr/share/pixmaps/gpl3.png' --image-on-top \
   2.164  			--center \
     3.1 --- a/tinyutils/tazkeymap	Sun Nov 08 09:07:35 2015 +0000
     3.2 +++ b/tinyutils/tazkeymap	Sun Nov 08 22:09:10 2015 +0200
     3.3 @@ -29,7 +29,7 @@
     3.4  
     3.5  load_keymap() {
     3.6  	if [ -x /bin/loadkeys ]; then
     3.7 -		loadkeys $kmap
     3.8 +		loadkeys -u $kmap
     3.9  	else
    3.10  		loadkmap < /usr/share/kmap/$kmap.kmap
    3.11  	fi