conky handling update
This commit is contained in:
@@ -16,6 +16,8 @@
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
source ~/.config/mabox/mabox.conf
|
||||
|
||||
SYSSCHEMES="/usr/share/mabox-colorizer/colorschemes/conky.csv"
|
||||
#USERSCHEMES="$HOME/.config/colorizer/conky/c_userschemes.csv"
|
||||
USERSCHEMES="$HOME/.config/colorizer/conky/colorschemes.csv"
|
||||
@@ -97,10 +99,10 @@ case "$LANG" in
|
||||
GENERATEFROMWP="Generuj z kolorów tapety"
|
||||
LIGHTBG="Jasne tło"
|
||||
DARKBG="Ciemne tło"
|
||||
GLOBALSETTINGS="Ustawienia globalne <small>(dla wszystkich)</small>"
|
||||
VISUALSETTINGS="Ustawienia wyglądu <small>(dla wszystkich)</small>"
|
||||
REGENERATE="Motywy kolorów"
|
||||
OPENTHEMEDIR="Otwórz katalog motywów"
|
||||
_COLORS="kolory"
|
||||
_COLORS="indywidualne kolory"
|
||||
DEFCOLOR="Kolor obramowania"
|
||||
COLOR_0="Kolor 0 <small>(tekst)</small>"
|
||||
COLOR_1="Kolor 1 <small>(tekst alt)</small>"
|
||||
@@ -134,6 +136,11 @@ case "$LANG" in
|
||||
RESETALL="Resetuj wszystkie"
|
||||
RESETCOLORS="Przywróć domyślne kolory"
|
||||
AREYOUSURE="Czy aby napewno?"
|
||||
_FEATURES="Zaawansowane"
|
||||
_ADVANCED="Ustawienia zaawansowane"
|
||||
_C_LCLICK="wykonuj <b>własne akcje</b> po <i>lewym kliknięciu</i>"
|
||||
_C_RCLICK="pokaż <b>menu kontekstowe</b> po <i>prawym kliknięciu</i>"
|
||||
_C_SIMPLIFIEDMENU="<b>uproszczone</b> menu kontekstowe"
|
||||
_COLORIZER_ROOT="<b>Colorizer</b> - menu główne"
|
||||
_LEFTSIDEPANEL="Lewy panel boczny"
|
||||
;;
|
||||
@@ -141,7 +148,7 @@ case "$LANG" in
|
||||
COLORIZECONKY="<b>Conky</b> Widget <b>Manager</b>"
|
||||
NO_CONKY_RUNNING="No Conky running"
|
||||
RUN_CONKY_SESSION="Run Conky session"
|
||||
MOVEABLEALL="Make moveable all..."
|
||||
MOVEABLEALL="Rearrange widget positions"
|
||||
NOT_FULLY_SUPPORTED="Partially supported"
|
||||
UNSUPPORTED="partially supported Conkies"
|
||||
UNSUPPORTED_START="click to start"
|
||||
@@ -160,10 +167,10 @@ case "$LANG" in
|
||||
GENERATEFROMWP="Generate from wallpaper colors"
|
||||
LIGHTBG="Light Background"
|
||||
DARKBG="Dark Background"
|
||||
GLOBALSETTINGS="Global settings <small>(apply to all)</small>"
|
||||
VISUALSETTINGS="Visual settings <small>(apply to all)</small>"
|
||||
REGENERATE="Color schemes"
|
||||
OPENTHEMEDIR="Open schemes dir"
|
||||
_COLORS="colors"
|
||||
_COLORS="individual colors"
|
||||
DEFCOLOR="Border color"
|
||||
COLOR_0="<small>(color0)</small> Text"
|
||||
COLOR_1="<small>(color1)</small> Text alt"
|
||||
@@ -197,6 +204,11 @@ case "$LANG" in
|
||||
RESETALL="Reset all to defaults"
|
||||
RESETCOLORS="Restore default colors"
|
||||
AREYOUSURE="Are you sure?"
|
||||
_FEATURES="Features"
|
||||
_ADVANCED="Advanced settings"
|
||||
_C_LCLICK="run <b>custom actions</b> on <i>Left-click</i>"
|
||||
_C_RCLICK="show <b>context menu</b> on <i>Right-click</i>"
|
||||
_C_SIMPLIFIEDMENU="<b>simplified</b> context menu"
|
||||
_COLORIZER_ROOT="<b>Colorizer</b> rootmenu"
|
||||
_LEFTSIDEPANEL="Left Sidepanel"
|
||||
;;
|
||||
@@ -287,7 +299,7 @@ if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then
|
||||
name=${filename%%_mb*}
|
||||
name2=${name%%.con*}
|
||||
title=${name2//_/ }
|
||||
out+=("${title^},^pipe(conkyctl single ${c})")
|
||||
out+=("<big></big> ${title^},^pipe(conkyctl single ${c})")
|
||||
done
|
||||
out+=("^sep()")
|
||||
out+=("$STOP_ALL (${#running[@]}),conky_toggle;sleep .5;$me")
|
||||
@@ -340,9 +352,8 @@ if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then
|
||||
out+=("<big></big> $_OPEN_CONKYDIR,xdg-open ${CONKYDIR}")
|
||||
|
||||
#GLOBAL START
|
||||
out+=("^sep($GLOBALSETTINGS)")
|
||||
out+=(" $MOVEABLEALL,conkyctl makemoveableall")
|
||||
out+=("^sep()")
|
||||
out+=("^sep($VISUALSETTINGS)")
|
||||
|
||||
[[ "$WINTRANS" = true ]] && bga=1 || bga=100
|
||||
if [[ "${CLR3}" == "#" ]];then
|
||||
case "$LANG" in
|
||||
@@ -361,50 +372,6 @@ if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then
|
||||
recolor3=1
|
||||
fi
|
||||
|
||||
out+=("<big><span bgcolor='$WINCLR' bgalpha='${bga}%'><span bgcolor='$CLR'> </span> <span fgcolor='$CLR0'></span> <span fgcolor='$CLR1'></span> <span fgcolor='$CLR2'></span> <span bgcolor='$CLR'> </span></span></big> $REGENERATE,^checkout(regenconky)")
|
||||
out2+=("^tag(regenconky)")
|
||||
out2+=("^sep($REGENERATE)")
|
||||
out2+=("^sep($MONOCHROMATIC)")
|
||||
out2+=("^sep(<i>$CHOOSE_AND_PICK</i>)")
|
||||
out2+=("<big></big> $DARKBG...,conkyctl mono pick dark")
|
||||
out2+=("<big></big> $LIGHTBG...,conkyctl mono pick light")
|
||||
|
||||
out2+=("^sep($GENERATEFROMWP)")
|
||||
out2+=("<big><span bgcolor='${w[-1]}' fgcolor='${w[0]}'> $LIGHTBG <span fgcolor='${w[4]}'></span> <span fgcolor='${w[5]}'></span> </span></big>,w2theme conky light;$me")
|
||||
out2+=("<big><span bgcolor='${w[0]}' fgcolor='${w[-1]}'> $DARKBG <span fgcolor='${w[-4]}'></span> <span fgcolor='${w[-5]}'></span> </span></big>,w2theme conky dark;$me")
|
||||
|
||||
out2+=("^sep($SYSTEM_SCHEMES)")
|
||||
n=1
|
||||
while IFS="|" read -r winclr clr clr0 clr1 clr2 clr3 wintrans outline shades bord bwidth stip scheme_name
|
||||
do
|
||||
((n=n+1))
|
||||
[[ "$wintrans" = true ]] && bga=1 || bga=100
|
||||
out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='$winclr' bgalpha='${bga}%'><span bgcolor='$clr'> </span> <span fgcolor='$clr0'></span> <span fgcolor='$clr1'></span> <span fgcolor='$clr2'></span> <span fgcolor='$clr3'></span> <span bgcolor='$clr'> </span></span></big>,conkyctl applyscheme_all sys ${n};$me")
|
||||
done < <(tail -n +2 "$SYSSCHEMES")
|
||||
|
||||
out2+=("^sep($YOUR_SCHEMES)")
|
||||
out2+=("<big></big> $SAVE_CURRSCHEME,conkyctl savescheme '${cursettings}';$me")
|
||||
out2+=("<big></big> $OPEN_SCHEMEFILE,xdg-open $USERSCHEMES")
|
||||
out2+=("^sep()")
|
||||
|
||||
n=1
|
||||
while IFS="|" read -r winclr clr clr0 clr1 clr2 clr3 wintrans outline shades bord bwidth stip scheme_name
|
||||
do
|
||||
((n=n+1))
|
||||
[[ "$wintrans" = true ]] && bga=1 || bga=100
|
||||
out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='$winclr' bgalpha='${bga}%'><span bgcolor='$clr'> </span> <span fgcolor='$clr0'></span> <span fgcolor='$clr1'></span> <span fgcolor='$clr2'></span> <span fgcolor='$clr3'></span> <span bgcolor='$clr'> </span></span></big>,^checkout(sch${n})")
|
||||
#echo "${own_window_colour}|${default_color}|${color0}|${color1}|${color2}|${themename}" >> "$USERSCHEMES"
|
||||
out3+=("^tag(sch${n}")
|
||||
out3+=("^sep($COLORSCHEME: ${scheme_name})")
|
||||
out3+=("<big></big> $APPLY_SCHEME <big><span bgcolor='$winclr' bgalpha='${bga}%'><span bgcolor='$clr'> </span> <span fgcolor='$clr0'></span> <span fgcolor='$clr1'></span> <span fgcolor='$clr2'></span> <span fgcolor='$clr3'></span> <span bgcolor='$clr'> </span></span></big>,conkyctl applyscheme_all usr ${n};$me")
|
||||
out3+=("^sep($DELETE)")
|
||||
out3+=("<big></big> $DELETE_SCHEME ${scheme_name},conkyctl delscheme ${n};$me")
|
||||
done < <(tail -n +2 "$USERSCHEMES")
|
||||
|
||||
|
||||
|
||||
|
||||
out+=("^sep()")
|
||||
|
||||
|
||||
out+=("<big></big> $FONTS [ <b><span font_family=\"${FONT}\">$FONT</span> $FONTSIZE</b> ],^checkout(font)")
|
||||
@@ -462,6 +429,50 @@ if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then
|
||||
[[ "$STIP" == 3 ]] && out2+=("<big>綠</big> 3 px,conkyctl stippled_borders_all 3;$me") || out2+=("<big>祿</big> 3 px,conkyctl stippled_borders_all 3;$me")
|
||||
[[ "$STIP" == 4 ]] && out2+=("<big>綠</big> 4 px,conkyctl stippled_borders_all 4;$me") || out2+=("<big>祿</big> 4 px,conkyctl stippled_borders_all 4;$me")
|
||||
|
||||
out+=("^sep()")
|
||||
out+=("<big><span bgcolor='$WINCLR' bgalpha='${bga}%'><span bgcolor='$CLR'> </span> <span fgcolor='$CLR0'></span> <span fgcolor='$CLR1'></span> <span fgcolor='$CLR2'></span> <span bgcolor='$CLR'> </span></span></big> $REGENERATE,^checkout(regenconky)")
|
||||
out2+=("^tag(regenconky)")
|
||||
out2+=("^sep($REGENERATE)")
|
||||
out2+=("^sep($MONOCHROMATIC)")
|
||||
out2+=("^sep(<i>$CHOOSE_AND_PICK</i>)")
|
||||
out2+=("<big></big> $DARKBG...,conkyctl mono pick dark")
|
||||
out2+=("<big></big> $LIGHTBG...,conkyctl mono pick light")
|
||||
|
||||
out2+=("^sep($GENERATEFROMWP)")
|
||||
out2+=("<big><span bgcolor='${w[-1]}' fgcolor='${w[0]}'> $LIGHTBG <span fgcolor='${w[4]}'></span> <span fgcolor='${w[5]}'></span> </span></big>,w2theme conky light;$me")
|
||||
out2+=("<big><span bgcolor='${w[0]}' fgcolor='${w[-1]}'> $DARKBG <span fgcolor='${w[-4]}'></span> <span fgcolor='${w[-5]}'></span> </span></big>,w2theme conky dark;$me")
|
||||
|
||||
out2+=("^sep($SYSTEM_SCHEMES)")
|
||||
n=1
|
||||
while IFS="|" read -r winclr clr clr0 clr1 clr2 clr3 wintrans outline shades bord bwidth stip scheme_name
|
||||
do
|
||||
((n=n+1))
|
||||
[[ "$wintrans" = true ]] && bga=1 || bga=100
|
||||
out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='$winclr' bgalpha='${bga}%'><span bgcolor='$clr'> </span> <span fgcolor='$clr0'></span> <span fgcolor='$clr1'></span> <span fgcolor='$clr2'></span> <span fgcolor='$clr3'></span> <span bgcolor='$clr'> </span></span></big>,conkyctl applyscheme_all sys ${n};$me")
|
||||
done < <(tail -n +2 "$SYSSCHEMES")
|
||||
|
||||
out2+=("^sep($YOUR_SCHEMES)")
|
||||
out2+=("<big></big> $SAVE_CURRSCHEME,conkyctl savescheme '${cursettings}';$me")
|
||||
out2+=("<big></big> $OPEN_SCHEMEFILE,xdg-open $USERSCHEMES")
|
||||
out2+=("^sep()")
|
||||
|
||||
n=1
|
||||
while IFS="|" read -r winclr clr clr0 clr1 clr2 clr3 wintrans outline shades bord bwidth stip scheme_name
|
||||
do
|
||||
((n=n+1))
|
||||
[[ "$wintrans" = true ]] && bga=1 || bga=100
|
||||
out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='$winclr' bgalpha='${bga}%'><span bgcolor='$clr'> </span> <span fgcolor='$clr0'></span> <span fgcolor='$clr1'></span> <span fgcolor='$clr2'></span> <span fgcolor='$clr3'></span> <span bgcolor='$clr'> </span></span></big>,^checkout(sch${n})")
|
||||
#echo "${own_window_colour}|${default_color}|${color0}|${color1}|${color2}|${themename}" >> "$USERSCHEMES"
|
||||
out3+=("^tag(sch${n}")
|
||||
out3+=("^sep($COLORSCHEME: ${scheme_name})")
|
||||
out3+=("<big></big> $APPLY_SCHEME <big><span bgcolor='$winclr' bgalpha='${bga}%'><span bgcolor='$clr'> </span> <span fgcolor='$clr0'></span> <span fgcolor='$clr1'></span> <span fgcolor='$clr2'></span> <span fgcolor='$clr3'></span> <span bgcolor='$clr'> </span></span></big>,conkyctl applyscheme_all usr ${n};$me")
|
||||
out3+=("^sep($DELETE)")
|
||||
out3+=("<big></big> $DELETE_SCHEME ${scheme_name},conkyctl delscheme ${n};$me")
|
||||
done < <(tail -n +2 "$USERSCHEMES")
|
||||
|
||||
|
||||
|
||||
|
||||
out+=("^sep($_COLORS)")
|
||||
pgrep -af "conky/sysinfo_mbcolor" > /dev/null || out+=("<big><span bgcolor='red' fgcolor='white'> README <small>(important info)</small> </span></big>,conkyctl baseconky_info")
|
||||
if [ "$WINTRANS" == false ];then
|
||||
@@ -481,8 +492,16 @@ if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then
|
||||
out+=("$COLOR_1 <span weight='normal' ${BG} fgcolor='$CLR1'> AbCd </span><span bgcolor='$CLR1'> </span>,^pipe(mbclr '$CLR1' conkyctl color1_all '${COLOR_1}' '$me')")
|
||||
out+=("$COLOR_2 <span weight='bold' ${BG} fgcolor='$CLR2'> </span><span bgcolor='$CLR2'> </span>,^pipe(mbclr '$CLR2' conkyctl color2_all '${COLOR_2}' '$me')")
|
||||
[[ "$CLR3" != "#" ]] && out+=("$COLOR_3 <span weight='bold' ${BG} fgcolor='$CLR3'> AbCd </span><span bgcolor='$CLR3'> </span>,^pipe(mbclr '$CLR3' conkyctl color3_all '${COLOR_3}' '$me')")
|
||||
#out+=("^sep()")
|
||||
|
||||
out+=("^sep($_FEATURES)")
|
||||
out+=(" $MOVEABLEALL,conkyctl makemoveableall")
|
||||
out+=(" $_ADVANCED,^checkout(adv)")
|
||||
out2+=("^tag(adv)")
|
||||
out2+=("^sep($_ADVANCED)")
|
||||
[[ "${conky_leftclick}" == "off" ]] && out2+=("<big></big> $_C_LCLICK,mb-setvar conky_leftclick=on;$me") || out2+=("<big></big> $_C_LCLICK,mb-setvar conky_leftclick=off;$me")
|
||||
[[ "${conky_rightclick}" == "off" ]] && out2+=("<big></big> $_C_RCLICK,mb-setvar conky_rightclick=on;$me") || out2+=("<big></big> $_C_RCLICK,mb-setvar conky_rightclick=off;$me")
|
||||
out+=("^sep()")
|
||||
[[ "${conky_basicmode}" == "on" ]] && out2+=("<big></big> $_C_SIMPLIFIEDMENU,mb-setvar conky_basicmode=off;$me") || out2+=("<big></big> $_C_SIMPLIFIEDMENU,mb-setvar conky_basicmode=on;$me")
|
||||
|
||||
|
||||
|
||||
|
||||
31
bin/conkyctl
31
bin/conkyctl
@@ -493,7 +493,7 @@ languages () {
|
||||
BORDERS="Obramowanie"
|
||||
EDIT="Edytuj plik Conky"
|
||||
RELOAD="Przeładuj"
|
||||
KILL="Zabij"
|
||||
KILL="Wyłącz"
|
||||
LOGOSIZE="Rozmiar logo"
|
||||
SMALL="Małe"
|
||||
NORMAL="Normalne"
|
||||
@@ -504,7 +504,7 @@ languages () {
|
||||
SOLID_LINE="linia ciągła"
|
||||
NOT_WORKING="Nie działa? Naprawmy to :)"
|
||||
MOUNTPOINTS="Dyski (punkty montowania)"
|
||||
_ACTIONS="Działania"
|
||||
_ACTIONS="Zaawansowane"
|
||||
;;
|
||||
*)
|
||||
UNSUPPORTED="partially supported!!!"
|
||||
@@ -512,7 +512,7 @@ languages () {
|
||||
CONVERT_OLD="Try to convert to new syntax?"
|
||||
CONVERT_OLD_TRY="Yes, try to convert"
|
||||
POSITION="Position"
|
||||
MAKEMOVEABLE="Make moveable all..."
|
||||
MAKEMOVEABLE="Rearrange widget positions"
|
||||
MARKNEWPOS="New position (<i>mark on the screen</i>)..."
|
||||
ALIGNMENT="Alignment"
|
||||
TOPLEFT="TopLeft"
|
||||
@@ -565,7 +565,7 @@ languages () {
|
||||
BORDERS="Borders"
|
||||
EDIT="Edit Conky file"
|
||||
RELOAD="Reload"
|
||||
KILL="Kill"
|
||||
KILL="Quit"
|
||||
LOGOSIZE="Logo size"
|
||||
SMALL="Small"
|
||||
NORMAL="Normal"
|
||||
@@ -576,7 +576,7 @@ languages () {
|
||||
SOLID_LINE="solid line"
|
||||
NOT_WORKING="Not working? Try to fix"
|
||||
MOUNTPOINTS="Discs (mount points)"
|
||||
_ACTIONS="Actions"
|
||||
_ACTIONS="Advanced"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
@@ -670,7 +670,9 @@ mapfile -t w < "$WALLPALDIR/$NAME.clr"
|
||||
out+=("^sep(Conky: [ ${title^} ]")
|
||||
out+=("^sep(<span bgcolor='red' fgcolor='white'> ${UNSUPPORTED} </span>)")
|
||||
fi
|
||||
|
||||
### TUKILL
|
||||
out+=(" $KILL ${title^},conkyctl kill ${1##*/};${me}")
|
||||
out+=("^sep()")
|
||||
if [[ "$OLD_SYNTAX" = "true" ]];then
|
||||
out+=("$OLD_SYNTAX_DETECTED,^checkout(oldsyntax)")
|
||||
out2+=("^tag(oldsyntax)")
|
||||
@@ -901,7 +903,7 @@ read SIZE <<< "$(grep minimum_height ${1} | cut -d'=' -f2 | cut -d"," -f1)"
|
||||
[[ "${TYP}" == *"square"* ]] && out+=("<big>綠</big> <b>$_SQUARE</b>,mabox-logo type square") || out+=("<big>祿</big> $_SQUARE,mabox-logo type square")
|
||||
[[ "${TYP}" == *"circle"* ]] && out+=("<big>綠</big> <b>$_CIRCLE</b>,mabox-logo type circle") || out+=("<big>祿</big> $_CIRCLE,mabox-logo type circle")
|
||||
out+=("^sep()")
|
||||
out+=("$_LOGOSIZE [ <b>${SIZE}</b> x <b>${SIZE}</b> ],^checkout(logosize)")
|
||||
out+=("$_LOGOSIZE [ <b>${SIZE}</b>x<b>${SIZE}</b> ],^checkout(logosize)")
|
||||
out2+=("^tag(logosize)")
|
||||
out2+=("^sep($_LOGOSIZE (px))")
|
||||
for s in 32 48 64 96 128 256 512;do
|
||||
@@ -1089,11 +1091,13 @@ if [[ "$FONT" != "" ]];then
|
||||
done
|
||||
fi
|
||||
fi #OLD SYNTAX CHECK
|
||||
# BASICMODE
|
||||
if [[ "${conky_basicmode}" != "on" ]];then
|
||||
out+=("^sep($_ACTIONS)")
|
||||
out+=(" $EDIT ${title^},xdg-open ${1}")
|
||||
out+=("北 $RELOAD ${title^},conkyctl restartone ${1}")
|
||||
out+=("^sep()")
|
||||
out+=(" $KILL ${title^},conkyctl kill ${1##*/};${me}")
|
||||
fi
|
||||
|
||||
}
|
||||
pipemenu () {
|
||||
single "$1"
|
||||
@@ -1174,7 +1178,7 @@ contextmenu () {
|
||||
jgtools_padding=4
|
||||
MENU_PADDING_TOP=${jgtools_padding:-0}
|
||||
|
||||
TABS=140
|
||||
TABS=120
|
||||
jgmenu_icon_size=0
|
||||
|
||||
|
||||
@@ -1186,13 +1190,16 @@ contextmenu () {
|
||||
CONKY_WIDGET_MNGR="<b>Menadżer</b> widżetów <b>Conky</b>";;
|
||||
*)
|
||||
EDIT_CUSTOMCOMMANDS=" Edit cmd menu (<i>left-clik</i>) for <b>${name^}</b>"
|
||||
CONKY_WIDGET_MNGR="<b>Conky</b> Widget <b>Manager</b>"
|
||||
CONKY_WIDGET_MNGR="<b>Conky</b> Widget <b>Manager</b> "
|
||||
;;
|
||||
esac
|
||||
## BASICMODE
|
||||
if [[ "${conky_basicmode}" != "on" ]];then
|
||||
out+=("^sep()")
|
||||
out+=("$EDIT_CUSTOMCOMMANDS,conkyctl cmdmenu_edit ${name}")
|
||||
fi
|
||||
out+=("^sep()")
|
||||
out+=(" ${arrow_string_left} $CONKY_WIDGET_MNGR,colorizer-conky -s")
|
||||
out+=(" ${arrow_string_left} ${arrow_string_left} ${arrow_string_left} $CONKY_WIDGET_MNGR,colorizer-conky -s")
|
||||
|
||||
if [[ "$CONKYCFG" =~ "mount_points" ]]; then
|
||||
out+=("^sep($MOUNTPOINTS)")
|
||||
|
||||
Reference in New Issue
Block a user