diff --git a/usr/bin/jgtint2-pipe b/usr/bin/jgtint2-pipe
index 9a2bc7d..914cbab 100755
--- a/usr/bin/jgtint2-pipe
+++ b/usr/bin/jgtint2-pipe
@@ -13,15 +13,26 @@ case $LANG in
LNG="pl"
TITLE="Panel Tint2"
POSITION="Pozycja"
+ SIZE="Rozmiar"
WIDTH="Szerokość"
HEIGHT="Wysokość"
MARGIN="Margines"
PADDING="Odstęp"
- COMPACT="Kompaktowy?"
- AUTOHIDE="Autoukrywanie?"
+ COMPACT="Kompaktowy ?"
+ AUTOHIDE="Autoukrywanie ?"
+ SIZEHIDDEN="Rozmiar gdy ukryty"
RESET="Resetuj"
TOP="Góra"
BOTTOM="Dół"
+ TOPLEFT="Góra po lewej"
+ TOPRIGHT="Góra po prawej"
+ LEFT="Lewa"
+ RIGHT="Prawa"
+ BOTTOMLEFT="Dół po lewej"
+ BOTTOMRIGHT="Dół po prawej"
+ HORIZONTAL="Poziomo"
+ VERTICAL="Pionowo"
+ SPACING="Odstęp"
YES="Tak (1)"
NO="Nie (0)"
RUNNING_TINT2="Działające Tint2"
@@ -42,15 +53,26 @@ case $LANG in
LNG="en"
TITLE="Panel Tint2"
POSITION="Position"
+ SIZE="Size"
WIDTH="Width"
HEIGHT="Height"
MARGIN="Margin"
PADDING="Padding"
COMPACT="Compact?"
AUTOHIDE="Autohide?"
+ SIZEHIDDEN="Size when hidden:"
RESET="Reset to default"
TOP="Top"
BOTTOM="Bottom"
+ TOPLEFT="TopLeft"
+ TOPRIGHT="TopRight"
+ LEFT="Left"
+ RIGHT="Right"
+ BOTTOMLEFT="BottomLeft"
+ BOTTOMRIGHT="BottomRight"
+ HORIZONTAL="Horizontal"
+ VERTICAL="Vertical"
+ SPACING="Spacing"
YES="Yes (1)"
NO="No (0)"
RUNNING_TINT2="Panel(es) en ejecución"
@@ -71,15 +93,26 @@ case $LANG in
LNG="en"
TITLE="Tint2 Panel"
POSITION="Position"
+ SIZE="Size"
WIDTH="Width"
HEIGHT="Height"
MARGIN="Margin"
PADDING="Padding"
COMPACT="Compact?"
AUTOHIDE="Autohide?"
+ SIZEHIDDEN="Size when hidden:"
RESET="Reset to default"
TOP="Top"
BOTTOM="Bottom"
+ TOPLEFT="TopLeft"
+ TOPRIGHT="TopRight"
+ LEFT="Left"
+ RIGHT="Right"
+ BOTTOMLEFT="BottomLeft"
+ BOTTOMRIGHT="BottomRight"
+ HORIZONTAL="Horizontal"
+ VERTICAL="Vertical"
+ SPACING="Spacing"
YES="Yes (1)"
NO="No (0)"
RUNNING_TINT2="Running Tint2"
@@ -98,21 +131,20 @@ case $LANG in
;;
esac
getvalues () {
- read POS REST <<< "$(grep panel_position ${TINT} | cut -d'=' -f2)"
+ read VE HO OR <<< "$(grep panel_position ${TINT} | cut -d'=' -f2)"
read W H <<< "$(grep panel_size ${TINT} | cut -d'=' -f2)"
read HOR VERT <<< "$(grep panel_margin ${TINT} | cut -d'=' -f2)"
- read PHOR PVERT SPACING <<< "$(grep panel_padding ${TINT} | cut -d'=' -f2)"
+ read PHOR PVERT SPACE <<< "$(grep panel_padding ${TINT} | cut -d'=' -f2)"
read SHRINK <<< "$(grep panel_shrink ${TINT} | cut -d'=' -f2)"
read HIDE <<< "$(grep "autohide " ${TINT} | cut -d'=' -f2)"
}
qactions () {
- out+=("$(printf "%-20s %20s" "$POSITION" "[ $POS ]"),^checkout(ppos$i)")
- out+=("$(printf "%-20s %20s" "$WIDTH" "[ $W ]"),^checkout(pwidth$i)")
- out+=("$(printf "%-20s %20s" "$HEIGHT" "[ $H ]"),^checkout(pheight$i)")
+ out+=("$(printf "%-20s %20s" "$POSITION" "[ $VE $HO ]"),^checkout(ppos$i)")
+ out+=("$(printf "%-20s %20s" "$SIZE" "[ $W ]"),^checkout(pwidth$i)")
+ out+=("$(printf "%-20s %20s" "$WIDTH" "[ $H ]"),^checkout(pheight$i)")
out+=("$(printf "%-20s %20s" "$MARGIN" "[ $HOR $VERT ]"),^checkout(pmargin$i)")
- out+=("$(printf "%-20s %20s" "$PADDING" "[ $PHOR $PVERT $SPACING ]"),^checkout(ppadding$i)")
- out+=("$(printf "%-20s %20s" "$COMPACT" "[ $SHRINK ]"),^checkout(pcompact$i)")
+ out+=("$(printf "%-20s %20s" "$PADDING" "[ $PHOR $PVERT $SPACE ]"),^checkout(ppadding$i)")
out+=("$(printf "%-20s %20s" "$AUTOHIDE" "[ $HIDE ]"),^checkout(phide$i)")
out+=("^sep()")
if [ -f "/usr/share/mabox/lang/${LNG}/.config/tint2/${TINT2}" ];then
@@ -121,48 +153,69 @@ qactions () {
fi
out2+=("^tag(ppos$i)")
out2+=("^sep($POSITION)")
- out2+=("$TOP,t2ctl position top ${TINT};$me")
- out2+=("$BOTTOM,t2ctl position bottom ${TINT};$me")
+ out2+=("^sep($HORIZONTAL)")
+ out2+=("$TOP,t2ctl position tch ${TINT};$me")
+ out2+=("$BOTTOM,t2ctl position bch ${TINT};$me")
+ out2+=("^sep()")
+ out2+=("$TOPLEFT,t2ctl position tlh ${TINT};$me")
+ out2+=("$TOPRIGHT,t2ctl position trh ${TINT};$me")
+ out2+=("$BOTTOMLEFT,t2ctl position blh ${TINT};$me")
+ out2+=("$BOTTOMRIGHT,t2ctl position brh ${TINT};$me")
+ out2+=("^sep($VERTICAL)")
+ out2+=("$LEFT,t2ctl position clv ${TINT};$me")
+ out2+=("$RIGHT,t2ctl position crv ${TINT};$me")
+ out2+=("^sep()")
+ out2+=("$TOPLEFT,t2ctl position tlv ${TINT};$me")
+ out2+=("$TOPRIGHT,t2ctl position trv ${TINT};$me")
+ out2+=("$BOTTOMLEFT,t2ctl position blv ${TINT};$me")
+ out2+=("$BOTTOMRIGHT,t2ctl position brv ${TINT};$me")
out2+=("^tag(pwidth$i)")
- out2+=("^sep($WIDTH)")
+ out2+=("^sep($SIZE)")
out2+=("100%,t2ctl width 100% ${TINT};$me")
out2+=("95%,t2ctl width 95% ${TINT};$me")
out2+=("90%,t2ctl width 90% ${TINT};$me")
out2+=("80%,t2ctl width 80% ${TINT};$me")
out2+=("75%,t2ctl width 75% ${TINT};$me")
out2+=("60%,t2ctl width 60% ${TINT};$me")
+ out2+=("50%,t2ctl width 50% ${TINT};$me")
+ out2+=("40%,t2ctl width 40% ${TINT};$me")
+ out2+=("30%,t2ctl width 30% ${TINT};$me")
+ out2+=("^sep()")
+ out2+=("$(printf "%-20s %20s" "$COMPACT" "[ $SHRINK ]"),^checkout(pcompact$i)")
out2+=("")
out2+=("^tag(pheight$i)")
- out2+=("^sep($HEIGHT)")
+ out2+=("^sep($WIDTH)")
out2+=("24,t2ctl height 24 ${TINT};$me")
out2+=("28,t2ctl height 28 ${TINT};$me")
out2+=("32,t2ctl height 32 ${TINT};$me")
out2+=("40,t2ctl height 40 ${TINT};$me")
+ out2+=("48,t2ctl height 48 ${TINT};$me")
+ out2+=("60,t2ctl height 60 ${TINT};$me")
out2+=("^tag(pmargin$i)")
- out2+=("^sep(HORIZONTAL)")
+ out2+=("^sep($HORIZONTAL)")
out2+=("0,t2ctl marginh 0 ${TINT};$me")
out2+=("1,t2ctl marginh 1 ${TINT};$me")
out2+=("2,t2ctl marginh 2 ${TINT};$me")
out2+=("4,t2ctl marginh 4 ${TINT};$me")
out2+=("")
- out2+=("^sep(VERTICAL)")
+ out2+=("^sep($VERTICAL)")
out2+=("0,t2ctl marginv 0 ${TINT};$me")
out2+=("1,t2ctl marginv 1 ${TINT};$me")
out2+=("2,t2ctl marginv 2 ${TINT};$me")
out2+=("4,t2ctl marginv 4 ${TINT};$me")
out2+=("^tag(ppadding$i)")
- out2+=("^sep(HORIZONTAL)")
+ out2+=("^sep($HORIZONTAL)")
out2+=("0,t2ctl paddingh 0 ${TINT};$me")
out2+=("1,t2ctl paddingh 1 ${TINT};$me")
out2+=("2,t2ctl paddingh 2 ${TINT};$me")
out2+=("4,t2ctl paddingh 4 ${TINT};$me")
out2+=("")
- out2+=("^sep(VERTICAL)")
+ out2+=("^sep($VERTICAL)")
out2+=("0,t2ctl paddingv 0 ${TINT};$me")
out2+=("1,t2ctl paddingv 1 ${TINT};$me")
out2+=("2,t2ctl paddingv 2 ${TINT};$me")
out2+=("4,t2ctl paddingv 4 ${TINT};$me")
- out2+=("^sep(SPACING)")
+ out2+=("^sep($SPACING)")
out2+=("0,t2ctl spacing 0 ${TINT};$me")
out2+=("1,t2ctl spacing 1 ${TINT};$me")
out2+=("2,t2ctl spacing 2 ${TINT};$me")
@@ -174,7 +227,13 @@ qactions () {
out2+=("^tag(phide$i)")
out2+=("^sep($AUTOHIDE)")
out2+=("$NO,t2ctl autohide 0 ${TINT};$me")
- out2+=("$YES,t2ctl autohide 1 ${TINT};$me")
+ out2+=("$YES,t2ctl autohide 1 ${TINT}")
+ out2+=("^sep($SIZEHIDDEN)")
+ out2+=("1,t2ctl hideheight 1 ${TINT}")
+ out2+=("2,t2ctl hideheight 2 ${TINT}")
+ out2+=("3,t2ctl hideheight 3 ${TINT}")
+ out2+=("4,t2ctl hideheight 4 ${TINT}")
+ out2+=("5,t2ctl hideheight 5 ${TINT}")
}
if [ "$(pidof tint2)" ];then