tint2 menu bugfix

This commit is contained in:
Daniel Napora 2023-03-19 13:35:26 +01:00
parent d12c4d45ed
commit a98e56c470

View File

@ -252,16 +252,16 @@ qactions () {
read TF2 <<< "$(grep "time2_format" ${TINT} | cut -d'=' -f2)"
out+=("^sep($CLOCK)")
out+=("$CLOCK_LINE1 [ <b> $(date "+${TF1}") </b> ],^checkout(cl1)")
out+=("$CLOCK_LINE2 [ <b> $(date "+${TF2}") </b> ],^checkout(cl2)")
out2+=("^tag(cl1)")
out+=("$CLOCK_LINE1 [ <b> $(date "+${TF1}") </b> ],^checkout(cl1$i)")
out+=("$CLOCK_LINE2 [ <b> $(date "+${TF2}") </b> ],^checkout(cl2$i)")
out2+=("^tag(cl1$i)")
out2+=("^sep($CLOCK_LINE1)")
out2+=("<b>$(date +"%H:%M")</b> <small>(%H:%M)</small>,t2ctl clockline1 '%H:%M' ${TINT};$me")
out2+=("<b>$(date +"%I:%M %p")</b> <small>(%I:%M %p)</small>,t2ctl clockline1 '%I:%M %p' ${TINT};$me")
out2+=("<b>$(date +"%-I:%M %p")</b> <small>(%I-:%M %p)</small>,t2ctl clockline1 '%-I:%M %p' ${TINT};$me")
out2+=("<b>$(date +"%H:%M:%S")</b> <small>(%H:%M:%S)</small>,t2ctl clockline1 '%H:%M:%S' ${TINT};$me")
out2+=("^tag(cl2)")
out2+=("^tag(cl2$i)")
out2+=("^sep($CLOCK_LINE2)")
out2+=("$NONE,t2ctl clockline2 none ${TINT};$me")
out2+=("^sep()")
@ -296,25 +296,25 @@ qactions () {
out2+=("^sep($MOUSE_EVENTS)")
out2+=("$RESETMOUSE,t2ctl mousereset ${TINT};$me")
out2+=("^sep()")
out2+=("<tt>$(printf "%-16s %1s" "$MOUSE_LEFT" "[ <b>$MLEFT</b> ]")</tt>,^checkout(mleft)")
out2+=("<tt>$(printf "%-16s %1s" "$MOUSE_RIGHT" "[ <b>$MRIGHT</b> ]")</tt>,^checkout(mright)")
out2+=("<tt>$(printf "%-16s %1s" "$MOUSE_MIDDLE" "[ <b>$MMIDDLE</b> ]")</tt>,^checkout(mmiddle)")
out2+=("<tt>$(printf "%-16s %1s" "$MOUSE_UP" "[ <b>$MUP</b> ]")</tt>,^checkout(mup)")
out2+=("<tt>$(printf "%-16s %1s" "$MOUSE_DOWN" "[ <b>$MDOWN</b> ]")</tt>,^checkout(mdown)")
out2+=("<tt>$(printf "%-16s %1s" "$MOUSE_LEFT" "[ <b>$MLEFT</b> ]")</tt>,^checkout(mleft$i)")
out2+=("<tt>$(printf "%-16s %1s" "$MOUSE_RIGHT" "[ <b>$MRIGHT</b> ]")</tt>,^checkout(mright$i)")
out2+=("<tt>$(printf "%-16s %1s" "$MOUSE_MIDDLE" "[ <b>$MMIDDLE</b> ]")</tt>,^checkout(mmiddle$i)")
out2+=("<tt>$(printf "%-16s %1s" "$MOUSE_UP" "[ <b>$MUP</b> ]")</tt>,^checkout(mup$i)")
out2+=("<tt>$(printf "%-16s %1s" "$MOUSE_DOWN" "[ <b>$MDOWN</b> ]")</tt>,^checkout(mdown$i)")
out3+=("^tag(mleft)" "^sep($MOUSE_LEFT)")
out3+=("^tag(mleft$i)" "^sep($MOUSE_LEFT)")
for n in "${mouseactions[@]}";do out3+=("$n,t2ctl mleft $n ${TINT};$me"); done
out3+=("^tag(mright)" "^sep($MOUSE_RIGHT)")
out3+=("^tag(mright$i)" "^sep($MOUSE_RIGHT)")
for n in "${mouseactions[@]}";do out3+=("$n,t2ctl mright $n ${TINT};$me"); done
out3+=("^tag(mmiddle)" "^sep($MOUSE_MIDDLE)")
out3+=("^tag(mmiddle$i)" "^sep($MOUSE_MIDDLE)")
for n in "${mouseactions[@]}";do out3+=("$n,t2ctl mmiddle $n ${TINT};$me"); done
out3+=("^tag(mup)" "^sep($MOUSE_UP)")
out3+=("^tag(mup$i)" "^sep($MOUSE_UP)")
for n in "${mouseactions[@]}";do out3+=("$n,t2ctl mup $n ${TINT};$me"); done
out3+=("^tag(mdown)" "^sep($MOUSE_DOWN)")
out3+=("^tag(mdown$i)" "^sep($MOUSE_DOWN)")
for n in "${mouseactions[@]}";do out3+=("$n,t2ctl mdown $n ${TINT};$me"); done
@ -326,8 +326,8 @@ qactions () {
out2+=("^sep()")
[[ "$CENTERED" = 1 ]] && out2+=("<big></big> $CENTER_TEXT,t2ctl tb_centered 0 ${TINT};$me")||out2+=("<big></big> $CENTER_TEXT,t2ctl tb_centered 1 ${TINT};$me")
out2+=("^sep()")
out2+=("$BUTTON_WIDTH [ <b>$TB_WIDTH</b> ],^checkout(tbwidth)")
out3+=("^tag(tbwidth)")
out2+=("$BUTTON_WIDTH [ <b>$TB_WIDTH</b> ],^checkout(tbwidth$i)")
out3+=("^tag(tbwidth$i)")
out3+=("^sep($BUTTON_WIDTH)")
out3+=("$FILL,t2ctl tb_width 0 ${TINT};$me")
out3+=("^sep()")