From da86c426fec9a6432047b6eda6a170059dc2e36d Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Sun, 17 Jan 2021 13:39:57 +0100 Subject: [PATCH] gradient settings added --- usr/bin/jgmenusettings-pipe | 68 ++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 31 deletions(-) diff --git a/usr/bin/jgmenusettings-pipe b/usr/bin/jgmenusettings-pipe index a91675d..c7925c2 100755 --- a/usr/bin/jgmenusettings-pipe +++ b/usr/bin/jgmenusettings-pipe @@ -47,6 +47,7 @@ case $LANG in HUGE="wielki" FONT_FAMILY="Czcionka" COLOR_SCHEME="Schemat kolorystyczny" + GRADIENT="Gradient" EDIT_CURRENT="Edytuj aktywny" FOLLOW_OB="Zgodny z motywem OpenBox" CHOOSE="Wybierz..." @@ -96,6 +97,7 @@ case $LANG in HUGE="Muy Grande" FONT_FAMILY="Familia tipográfica" COLOR_SCHEME="Esquema de colores" + GRADIENT="Gradient" EDIT_CURRENT="Editar el actual" FOLLOW_OB="Similiar al de Openbox" CHOOSE="Elegir..." @@ -145,6 +147,7 @@ case $LANG in HUGE="huge" FONT_FAMILY="Font Family" COLOR_SCHEME="Color Scheme" + GRADIENT="Gradient position" EDIT_CURRENT="Edit current" FOLLOW_OB="Same as OpenBox theme" CHOOSE="Choose..." @@ -229,21 +232,21 @@ out+=("$TOPMARGIN [ ${panels_topmargin:-0} ],^checkout(topmargin)") out+=("$SUBSPACING [ ${submenu_spacing:-0} ],^checkout(subspacing)") out2+=("^tag(mborder)") #for i in 0 1 2 3 4; do out2+=("${i},mb-setvar jgtools_border=${i};$me");done -for i in 0 1 2 3 4; do out2+=("$(printf "%3s,%s" "$i" "mb-setvar jgtools_border=${i};$me")");done +for i in 0 1 2 3 4 5 6 8 10 12; do out2+=("$(printf "%3s,%s" "$i" "mb-setvar jgtools_border=${i};$me")");done out2+=("^tag(mpadding)") #for i in 0 1 2 3 4; do out2+=("${i},mb-setvar jgtools_border=${i};$me");done -for i in 0 2 4 6 8 10 12 14 16 18 20; do out2+=("$(printf "%3s,%s" "$i" "mb-setvar jgtools_padding=${i};$me")");done +for i in 0 2 4 6 8 10 12 14 16 18 20 22 24; do out2+=("$(printf "%3s,%s" "$i" "mb-setvar jgtools_padding=${i};$me")");done out2+=("^tag(mradius)") -for i in 0 1 2 3 4 6 8 12 14 16 18 20; do out2+=("$(printf "%3s,%s" "$i" "mb-setvar jgtools_radius=${i};$me")");done +for i in 0 1 2 3 4 6 8 12 14 16 18 20 40; do out2+=("$(printf "%3s,%s" "$i" "mb-setvar jgtools_radius=${i};$me")");done out2+=("^tag(topmargin)") -for i in 0 20 30 40 50 60 80 100; do out2+=("$(printf "%4s,%s" "$i" "mb-setvar panels_topmargin=${i};$me")");done +for i in 0 20 30 40 50 60 80 100 120; do out2+=("$(printf "%4s,%s" "$i" "mb-setvar panels_topmargin=${i};$me")");done #for i in 0 20 30 40 50 60 80 100; do out2+=("${i},mb-setvar panels_topmargin=${i};$me");done out2+=("^tag(subspacing)") -for i in -8 -6 -4 -2 0 1 2 4 6 8 10; do out2+=("$(printf "%4s,%s" "$i" "mb-setvar submenu_spacing=${i};$me")");done +for i in -8 -6 -4 -2 0 1 2 4 6 8 10 12 14 16 18 20; do out2+=("$(printf "%4s,%s" "$i" "mb-setvar submenu_spacing=${i};$me")");done #for i in -8 -6 -4 -2 0 1 2 3 4 5 6; do out2+=("${i},mb-setvar submenu_spacing=${i};$me");done @@ -251,8 +254,8 @@ for i in -8 -6 -4 -2 0 1 2 4 6 8 10; do out2+=("$(printf "%4s,%s" "$i" out+=("^sep($SIZE)") out+=(" $t $TINY,mb-setvar menu_font_size=7;mb-setvar jgmenu_item_height=14;mb-setvar jgmenu_icon_size=14;mb-setvar sep_height=1;mb-setvar item_margin_y=1;$me $s $SMALL,mb-setvar menu_font_size=8;mb-setvar jgmenu_item_height=16;mb-setvar jgmenu_icon_size=16;mb-setvar sep_height=1;mb-setvar item_margin_y=1;$me - $n $NORMAL,mb-setvar menu_font_size=9;mb-setvar jgmenu_item_height=18;mb-setvar jgmenu_icon_size=18;mb-setvar sep_height=1;mb-setvar item_margin_y=1;$me - $b $BIG,mb-setvar menu_font_size=10;mb-setvar jgmenu_item_height=20;mb-setvar jgmenu_icon_size=20;mb-setvar sep_height=1;mb-setvar item_margin_y=1;$me + $n $NORMAL,mb-setvar menu_font_size=9;mb-setvar jgmenu_item_height=18;mb-setvar jgmenu_icon_size=18;mb-setvar sep_height=1;mb-setvar item_margin_y=2;$me + $b $BIG,mb-setvar menu_font_size=10;mb-setvar jgmenu_item_height=20;mb-setvar jgmenu_icon_size=20;mb-setvar sep_height=1;mb-setvar item_margin_y=2;$me $h $HUGE,mb-setvar menu_font_size=11;mb-setvar jgmenu_item_height=22;mb-setvar jgmenu_icon_size=22;mb-setvar sep_height=2;mb-setvar item_margin_y=2;$me") @@ -283,6 +286,33 @@ out2+=("$ro Roboto Light$in Inconsolata,mb-setvar menu_font_family=Inconsolata;$me") +########## THEMES +out+=("^sep($COLOR_SCHEME)") + +ob_file=$HOME/.config/openbox/rc.xml +[[ -f $ob_file ]] && wm_theme=$(awk '// {while (getline n) {if (match(n, //)){l=n; exit}}} END {split(l, a, "[<>]"); print a[3]}' "$ob_file") +out+=("$CHOOSE,^checkout(motywy)") +if [ $jgmenu_theme != obtheme ]; then + +out+=("$EDIT_CURRENT: ($jgmenu_theme),geany $HOME/.config/mabox/jgobthemes/$jgmenu_theme.colorrc,geany") +out+=("$FOLLOW_OB,mb-setvar jgmenu_theme=obtheme;$me +^sep()") +else +out+=("$EDIT_CURRENT: (${wm_theme// /_}),geany $HOME/.config/mabox/jgobthemes/${wm_theme// /_}.colorrc,geany") +out+=("$FOLLOW_OB,mb-setvar jgmenu_theme=obtheme;$me +^sep()") +fi +. $HOME/.config/mabox/jgobthemes/${wm_theme// /_}.colorrc + +out+=("$GRADIENT [ ${menu_gradient_pos:-none} ],^checkout(gradient)") +out2+=("^tag(gradient)") +for i in none top right bottom left top_left top_right bottom_left bottom_right; do out2+=("$(printf "%14s,%s" "$i" "mb-setvar menu_gradient_pos=${i} $HOME/.config/mabox/jgobthemes/${wm_theme// /_}.colorrc;$me")");done +out2+=("^tag(motywy)") + +for item in "$HOME"/.config/mabox/jgobthemes/*colorrc; do + theme="${item##*/}" + out2+=("${theme%.*},mb-setvar jgmenu_theme=${theme%.*};$me") + done ########## ICONS out+=("^sep($ICONS)") @@ -308,32 +338,8 @@ out+=("^sep()") out+=("$INSTALL_SARDI, pamac-installer sardi-icons") fi -########## THEMES -out+=("^sep($COLOR_SCHEME)") -if [ $jgmenu_theme != obtheme ]; then -out+=("$FOLLOW_OB,mb-setvar jgmenu_theme=obtheme;$me -^sep()") -out+=("$CHOOSE,^checkout(motywy) -^sep()") -out+=("$EDIT_CURRENT: ($jgmenu_theme),geany $HOME/.config/mabox/jgobthemes/$jgmenu_theme.colorrc,geany") -else -ob_file=$HOME/.config/openbox/rc.xml -[[ -f $ob_file ]] && wm_theme=$(awk '// {while (getline n) {if (match(n, //)){l=n; exit}}} END {split(l, a, "[<>]"); print a[3]}' "$ob_file") -out+=("$FOLLOW_OB,mb-setvar jgmenu_theme=obtheme;$me -^sep()") -out+=("$CHOOSE,^checkout(motywy) -^sep()") -out+=("$EDIT_CURRENT: (${wm_theme// /_}),geany $HOME/.config/mabox/jgobthemes/${wm_theme// /_}.colorrc,geany") -fi - -out2+=("^tag(motywy)") - -for item in "$HOME"/.config/mabox/jgobthemes/*colorrc; do - theme="${item##*/}" - out2+=("${theme%.*},mb-setvar jgmenu_theme=${theme%.*};$me") - done ### RUN