slitaz-tools rev 968
wifi-box: deal with the Start/Stop buttons better
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sat Mar 26 15:54:25 2016 +0200 (2016-03-26) |
| parents | 72f3c042d777 |
| children | 10253cb429d5 |
| files | boxes/wifi-box po/slitaz-boxes/es.po po/slitaz-boxes/fr.po po/slitaz-boxes/pl.po po/slitaz-boxes/pt_BR.po po/slitaz-boxes/ru.po po/slitaz-boxes/slitaz-boxes.pot po/slitaz-boxes/sv.po po/slitaz-boxes/zh_CN.po |
line diff
1.1 --- a/boxes/wifi-box Tue Mar 15 22:50:01 2016 +0100 1.2 +++ b/boxes/wifi-box Sat Mar 26 15:54:25 2016 +0200 1.3 @@ -4,7 +4,7 @@ 1.4 # is most important, this tool provides a quick way to connect or change Wi-Fi 1.5 # settings while full network configuration is done in TazPanel. 1.6 # 1.7 -# Copyright (C) 2012-2015 SliTaz GNU/Linux - GNU GPL v2 1.8 +# Copyright (C) 2012-2016 SliTaz GNU/Linux - GNU GPL v2 1.9 # 1.10 # Authors: Christophe Lincoln <pankso@slitaz.org> 1.11 # 1.12 @@ -64,7 +64,7 @@ 1.13 if ifconfig | grep -A 1 $WIFI_INTERFACE | \ 1.14 grep -q inet && iwconfig $WIFI_INTERFACE | \ 1.15 grep ESSID | grep -q -w "$essid"; then 1.16 - status=connected 1.17 + status="$(_n 'connected')" 1.18 else 1.19 status="$(_n '-')" 1.20 fi 1.21 @@ -122,14 +122,21 @@ 1.22 1.23 wifi_main() { 1.24 icon='network-wireless' 1.25 + if iwconfig 2>/dev/null | grep -q 'Tx-Power=off'; then 1.26 + startstop="$(_n 'Start Wi-Fi')!media-playback-start:4" 1.27 + refresh='' 1.28 + else 1.29 + startstop="$(_n 'Stop Wi-Fi')!media-playback-stop:3" 1.30 + refresh="--button=gtk-refresh:5" 1.31 + fi 1.32 detect_wifi | yad --title="$(_n 'Wi-Fi network')" --window-icon=$icon \ 1.33 - --width=520 --height=300 --on-top --center \ 1.34 + --width=520 --height=300 --center \ 1.35 --image=$icon --image-on-top \ 1.36 --text="$(_n '<b>Connect to a Wi-Fi network</b> (Double click to connect)')" \ 1.37 --list \ 1.38 --column "$(_n 'ESSID Name')" --column "$(_n 'Quality')" \ 1.39 --column "$(_n 'Encryption')" --column "$(_n 'Status')" \ 1.40 - --button="$(_n 'Start Wi-Fi'):4" --button="$(_n 'Stop Wi-Fi'):3" \ 1.41 + --button="$startstop" $refresh \ 1.42 --button="gtk-preferences:2" --button="gtk-close:1" 1.43 } 1.44 1.45 @@ -143,10 +150,10 @@ 1.46 # Deal with --button values 1.47 case $ret in 1.48 1) exit 0 ;; 1.49 - 2) tazweb --notoolbar http://tazpanel:82/network.cgi?wifi && exit 0 ;; 1.50 - 3) /etc/init.d/network.sh stop && exit 0 ;; 1.51 - 4) start_wifi && exit 0 ;; 1.52 - *) continue ;; 1.53 + 2) tazpanel network#wifi; exit 0 ;; 1.54 + 3) /etc/init.d/network.sh stop; $0 ;; 1.55 + 4) start_wifi; $0 ;; 1.56 + 5) $0 ;; 1.57 esac 1.58 if [ -n "$main" ]; then 1.59 essid=$(echo "$main" | cut -d "|" -f 1) 1.60 @@ -165,7 +172,7 @@ 1.61 usage ;; 1.62 *) 1.63 # Only for root. 1.64 - if [ $(id -u) != 0 ]; then 1.65 + if [ $(id -u) -ne 0 ]; then 1.66 exec tazbox su $0 $@ 1.67 exit 0 1.68 fi
2.1 --- a/po/slitaz-boxes/es.po Tue Mar 15 22:50:01 2016 +0100 2.2 +++ b/po/slitaz-boxes/es.po Sat Mar 26 15:54:25 2016 +0200 2.3 @@ -46,6 +46,9 @@ 2.4 msgid "-" 2.5 msgstr "" 2.6 2.7 +msgid "connected" 2.8 +msgstr "conectado" 2.9 + 2.10 #: boxes/wifi-box:75 2.11 msgid "WPA Password:" 2.12 msgstr "WPA Contraseña:"
3.1 --- a/po/slitaz-boxes/fr.po Tue Mar 15 22:50:01 2016 +0100 3.2 +++ b/po/slitaz-boxes/fr.po Sat Mar 26 15:54:25 2016 +0200 3.3 @@ -49,6 +49,9 @@ 3.4 msgid "-" 3.5 msgstr "" 3.6 3.7 +msgid "connected" 3.8 +msgstr "connecté" 3.9 + 3.10 #: boxes/wifi-box:75 3.11 msgid "WPA Password:" 3.12 msgstr "Mot de passe WPA:"
4.1 --- a/po/slitaz-boxes/pl.po Tue Mar 15 22:50:01 2016 +0100 4.2 +++ b/po/slitaz-boxes/pl.po Sat Mar 26 15:54:25 2016 +0200 4.3 @@ -47,6 +47,9 @@ 4.4 msgid "-" 4.5 msgstr "" 4.6 4.7 +msgid "connected" 4.8 +msgstr "połączony" 4.9 + 4.10 #: boxes/wifi-box:75 4.11 #, fuzzy 4.12 msgid "WPA Password:"
5.1 --- a/po/slitaz-boxes/pt_BR.po Tue Mar 15 22:50:01 2016 +0100 5.2 +++ b/po/slitaz-boxes/pt_BR.po Sat Mar 26 15:54:25 2016 +0200 5.3 @@ -45,6 +45,9 @@ 5.4 msgid "-" 5.5 msgstr "-" 5.6 5.7 +msgid "connected" 5.8 +msgstr "conectado" 5.9 + 5.10 #: boxes/wifi-box:75 5.11 msgid "WPA Password:" 5.12 msgstr "Senha WPA:"
6.1 --- a/po/slitaz-boxes/ru.po Tue Mar 15 22:50:01 2016 +0100 6.2 +++ b/po/slitaz-boxes/ru.po Sat Mar 26 15:54:25 2016 +0200 6.3 @@ -50,6 +50,9 @@ 6.4 msgid "-" 6.5 msgstr "—" 6.6 6.7 +msgid "connected" 6.8 +msgstr "соединено" 6.9 + 6.10 #: boxes/wifi-box:75 6.11 msgid "WPA Password:" 6.12 msgstr "Пароль WPA:"
7.1 --- a/po/slitaz-boxes/slitaz-boxes.pot Tue Mar 15 22:50:01 2016 +0100 7.2 +++ b/po/slitaz-boxes/slitaz-boxes.pot Sat Mar 26 15:54:25 2016 +0200 7.3 @@ -45,6 +45,9 @@ 7.4 msgid "-" 7.5 msgstr "" 7.6 7.7 +msgid "connected" 7.8 +msgstr "" 7.9 + 7.10 #: boxes/wifi-box:75 7.11 msgid "WPA Password:" 7.12 msgstr ""
8.1 --- a/po/slitaz-boxes/sv.po Tue Mar 15 22:50:01 2016 +0100 8.2 +++ b/po/slitaz-boxes/sv.po Sat Mar 26 15:54:25 2016 +0200 8.3 @@ -45,6 +45,9 @@ 8.4 msgid "-" 8.5 msgstr "" 8.6 8.7 +msgid "connected" 8.8 +msgstr "ansluten" 8.9 + 8.10 #: boxes/wifi-box:75 8.11 msgid "WPA Password:" 8.12 msgstr "WPA Lösenord:"
9.1 --- a/po/slitaz-boxes/zh_CN.po Tue Mar 15 22:50:01 2016 +0100 9.2 +++ b/po/slitaz-boxes/zh_CN.po Sat Mar 26 15:54:25 2016 +0200 9.3 @@ -46,6 +46,9 @@ 9.4 msgid "-" 9.5 msgstr "-" 9.6 9.7 +msgid "connected" 9.8 +msgstr "已连接" 9.9 + 9.10 #: boxes/wifi-box:75 9.11 msgid "WPA Password:" 9.12 msgstr "WPA密码："