jab2870/sxmo-utils
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Moved checkmark to icons

Browse source
This commit is contained in:
Maarten van Gompel 2021-03-16 21:47:31 +01:00
parent 47c62388e0
commit 2f62b7c446
7 changed files with 28 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/core/sxmo_appmenu.sh
View file

@ -127,10 +127,10 @@ programchoicesinit() {
# Audio Out menu
CURRENTDEV="$(sxmo_audiocurrentdevice.sh)"
CHOICES="
$icon_hdp Headphones $([ "$CURRENTDEV" = "Headphone" ] && echo "✓") ^ 1 ^ sxmo_audioout.sh Headphones
$icon_spk Speaker $([ "$CURRENTDEV" = "Line Out" ] && echo "✓") ^ 1 ^ sxmo_audioout.sh Speaker
$icon_phn Earpiece $([ "$CURRENTDEV" = "Earpiece" ] && echo "✓") ^ 1 ^ sxmo_audioout.sh Earpiece
$icon_mut None $([ "$CURRENTDEV" = "None" ] && echo "✓") ^ 1 ^ sxmo_audioout.sh None
$icon_hdp Headphones $([ "$CURRENTDEV" = "Headphone" ] && echo "$icon_chk") ^ 1 ^ sxmo_audioout.sh Headphones
$icon_spk Speaker $([ "$CURRENTDEV" = "Line Out" ] && echo "$icon_chk") ^ 1 ^ sxmo_audioout.sh Speaker
$icon_phn Earpiece $([ "$CURRENTDEV" = "Earpiece" ] && echo "$icon_chk") ^ 1 ^ sxmo_audioout.sh Earpiece
$icon_mut None $([ "$CURRENTDEV" = "None" ] && echo "$icon_chk") ^ 1 ^ sxmo_audioout.sh None
$icon_aru Volume up ^ 1 ^ sxmo_vol.sh up
$icon_ard Volume down ^ 1 ^ sxmo_vol.sh down
"

6
scripts/core/sxmo_common.sh
View file

@ -23,6 +23,7 @@ command -v "$KEYBOARD" > /dev/null || export KEYBOARD=svkbd-mobile-intl
# user's computer
#aliases aren't expanded in bash
# shellcheck disable=SC2039
command -v shopt > /dev/null && shopt -s expand_aliases
alias find="busybox find"
@ -32,6 +33,9 @@ alias xargs="busybox xargs"
SXMO_COMMON_INCLUDED=1
# shellcheck disable=SC2034
icon_chk="[x]" #we override this later if the user wants icons
[ "$SXMO_NO_ICONS" = "1" ] && return 0;
#this script is meant to be sourced
@ -212,6 +216,8 @@ icon_snd="" #send
icon_phx="" #hangup
# shellcheck disable=SC2034
icon_wn2=""
# shellcheck disable=SC2034
icon_chk=""
#allow the user to override icons
if [ -x "$XDG_CONFIG_HOME/sxmo/hooks/icons" ]; then

10
scripts/core/sxmo_gpsutil.sh
View file

@ -214,11 +214,11 @@ menumaptype() {
CURRENTMAPTYPE="$(gsettings get org.foxtrotgps repo-name | tr -d "'")"
CHOICES=$(echo "
Close Menu
OSM $([ "$CURRENTMAPTYPE" = "OSM" ] && echo "✓") ^ OSM
OpenCycleMap $([ "$CURRENTMAPTYPE" = "OpenCycleMap" ] && echo "✓") ^ OpenCycleMap
Google Maps $([ "$CURRENTMAPTYPE" = "Google Maps (testing only)" ] && echo "✓") ^ Google Maps (testing only)
Google Sat $([ "$CURRENTMAPTYPE" = "Google Sat (testing only)" ] && echo "✓") ^ Google Sat (testing only)
Maps-for-free.com $([ "$CURRENTMAPTYPE" = "Maps-for-free.com" ] && echo "✓") ^ Maps-for-free.com
OSM $([ "$CURRENTMAPTYPE" = "OSM" ] && echo "$icon_chk") ^ OSM
OpenCycleMap $([ "$CURRENTMAPTYPE" = "OpenCycleMap" ] && echo "$icon_chk") ^ OpenCycleMap
Google Maps $([ "$CURRENTMAPTYPE" = "Google Maps (testing only)" ] && echo "$icon_chk") ^ Google Maps (testing only)
Google Sat $([ "$CURRENTMAPTYPE" = "Google Sat (testing only)" ] && echo "$icon_chk") ^ Google Sat (testing only)
Maps-for-free.com $([ "$CURRENTMAPTYPE" = "Maps-for-free.com" ] && echo "$icon_chk") ^ Maps-for-free.com
" | sed '/^[[:space:]]*$/d' | awk '{$1=$1};1')
CHOICE="$(
echo "$CHOICES" |

4
scripts/core/sxmo_networks.sh
View file

@ -5,7 +5,7 @@
. "$(dirname "$0")/sxmo_common.sh"
connections() {
ACTIVE="$(nmcli -c no -t c show --active | cut -d: -f1,3 | sed 's/$/ ✓/')"
ACTIVE="$(nmcli -c no -t c show --active | cut -d: -f1,3 | sed "s/$/ $icon_chk/")"
INACTIVE="$(nmcli -c no -t c show | cut -d: -f1,3)"
printf %b "$ACTIVE\n$INACTIVE" | sort -u -t: -k1,1
}
@ -13,7 +13,7 @@ connections() {
toggleconnection() {
CONNLINE="$1"
CONNNAME="$(echo "$CHOICE" | cut -d: -f1)"
if echo "$CONNLINE" | grep "✓"; then
if echo "$CONNLINE" | grep "$icon_chk"; then
RES="$(nmcli c down "$CONNNAME" 2>&1)"
else
RES="$(nmcli c up "$CONNNAME" 2>&1)"