big conky update

master 0.9.5
Daniel Napora 2022-12-03 16:23:34 +01:00
parent 4dfcccc9eb
commit 76ac2a37aa
19 changed files with 538 additions and 87 deletions

View File

@ -3,6 +3,14 @@
me="colorizer-conky -s"
CONKYDIR="$HOME/.config/conky"
BASECONKY="$CONKYDIR/sysinfo_mbcolor.conkyrc"
COLORIZERDIR="$HOME/.config/colorizer"
CONKYTHEMEDIR="$COLORIZERDIR/conky/themes"
if [ ! -d "$CONKYTHEMEDIR" ];then
mkdir -p "$CONKYTHEMEDIR"
rsync -a /usr/share/mabox-colorizer/themes/conky/* ${CONKYTHEMEDIR}/
fi
LNG=${LANG:0:2}
if [ ! -f "${BASECONKY}" ]; then
if [ -d "/usr/share/mabox/lang/$LNG/.config/conky" ]; then
@ -22,11 +30,15 @@ fi
case "$LANG" in
pl*)
COLORIZECONKY="Pokoloruj Conky"
COLORIZECONKY="Conky Colorizer"
MOVEABLEALL="Ustaw wszystkie (<i>poprzez przeciąganie</i>)..."
GENERATEFROMWP="Generuj z kolorów tapety"
LIGHTBG="Jasne tło"
DARKBG="Ciemne tło"
GLOBALSETTINGS="Ustawienia globalne (zmień dla wszystkich)"
REGENERATE="Motywy kolorów"
OPENTHEMEDIR="Otwórz katalog motywów"
APPLY_THEME="Zastosuj motyw"
DEFCOLOR="Domyślny kolor <small>(tekst i ramka)</small>"
COLOR_0="Kolor 0 <small>(tekst2)</small>"
COLOR_1="Kolor 1 <small>(większy tekst)</small>"
@ -56,10 +68,14 @@ case "$LANG" in
;;
*)
COLORIZECONKY="Colorize Conky"
MOVEABLEALL="Make moveable all..."
GENERATEFROMWP="Generate from wallpaper colors"
LIGHTBG="Light Background"
DARKBG="Dark Background"
GLOBALSETTINGS="Global settings (apply to all)"
REGENERATE="Color schemes"
OPENTHEMEDIR="Open schemes dir"
APPLY_THEME="Apply colorscheme"
DEFCOLOR="Default color <small>(text and border)</small>"
COLOR_0="Color 0 <small>(text2)</small>"
COLOR_1="Color 1 <small>(bigger text)</small>"
@ -121,26 +137,42 @@ if pgrep -af "conky.*mbcolor" >/dev/null; then
[[ "$WINTRANS" == false ]] && BG="bgcolor='$WINCLR'" || BG=""
out+=("^sep($COLORIZECONKY)")
out+=("^sep($GENERATEFROMWP)")
out+=("$LIGHTBG,w2theme conky light;$me")
out+=("$DARKBG,w2theme conky dark;$me")
out+=(" $MOVEABLEALL,conkyctl makemoveableall")
out+=("^sep(<small><i>$GLOBALSETTINGS</i></small>)")
out+=("<span bgcolor='#282828'> <span fgcolor='#ebdbb2'></span> <span fgcolor='#98971a'></span> <span fgcolor='#d79921'></span> <span fgcolor='#cc241d'></span> </span> $REGENERATE,^checkout(regenconky)")
out2+=("^tag(regenconky)")
out2+=("^sep($REGENERATE)")
out2+=("^sep($GENERATEFROMWP)")
out2+=("$LIGHTBG,w2theme conky light;$me")
out2+=("$DARKBG,w2theme conky dark;$me")
out2+=("^sep($APPLY_THEME)")
for i in "${COLORIZERDIR}"/conky/themes/*.colors
do
source "${i}"
themefilename=${i##*/}
themename=${themefilename%%.col*}
out2+=("<span bgcolor='$own_window_colour'> <span fgcolor='$default_color'></span> <span fgcolor='$color0'></span> <span fgcolor='$color1'></span> <span fgcolor='$color2'></span> </span> $themename,conkyctl settheme_all $themefilename;$me")
done
out2+=("^sep()")
out2+=(" $OPENTHEMEDIR,xdg-open ${COLORIZERDIR}/conky/themes/")
out+=("^sep()")
if [ "$WINTRANS" == false ];then
out+=("<small><span bgcolor='$WINCLR'> </span><span weight='bold' ${BG} fgcolor='$WINCLR'> AbCd </span></small> $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor_all '${BACKGROUND}' '$me')")
else
out+=("<small><span bgcolor='$WINCLR'> transparent </span></small> $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor_all '${BACKGROUND}' '$me')")
fi
out+=("$TRANSPARENT [ <b>$WINTRANS</b> ],^checkout(trans)")
out+=("^sep()")
out+=("<small><span bgcolor='$CLR'> </span><span weight='bold' ${BG} fgcolor='$CLR'> AbCd </span></small> $DEFCOLOR,^pipe(mbclr '$CLR' conkyctl default_color_all '${DEFCOLOR}' '$me')")
out+=("<small><span bgcolor='$CLR0'> </span><span weight='bold' ${BG} fgcolor='$CLR0'> AbCd </span></small> $COLOR_0,^pipe(mbclr '$CLR0' conkyctl color0_all '${COLOR_0}' '$me')")
out+=("<small><span bgcolor='$CLR1'> </span><span weight='bold' ${BG} fgcolor='$CLR1'> AbCd </span></small> $COLOR_1,^pipe(mbclr '$CLR1' conkyctl color1_all '${COLOR_1}' '$me')")
out+=("<small><span bgcolor='$CLR2'> </span><span weight='bold' ${BG} fgcolor='$CLR2'> AbCd </span></small> $COLOR_2,^pipe(mbclr '$CLR2' conkyctl color2_all '${COLOR_2}' '$me')")
out+=("^sep()")
if [ "$WINTRANS" == false ];then
out+=("<small><span bgcolor='$WINCLR'> </span><span weight='bold' ${BG} fgcolor='$WINCLR'> AbCd </span></small> $BACKGROUND,^checkout(trans)")
else
out+=("<small><span>transparent </span></small> $BACKGROUND,^checkout(trans)")
fi
#out+=("^sep()")
out2+=("^tag(trans)")
out2+=("^sep($TRANSPARENT)")
out2+=("$YES,conkyctl transparent_all true;$me")
out2+=("$NO,conkyctl transparent_all false;$me")
out2+=("^sep()")
out2+=("<small><span bgcolor='$WINCLR'> </span></small> $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor_all '${BACKGROUND}' '$me')")
out+=("^sep()")
out+=("$FONTS [ <b>$FONT $FONTSIZE</b> ],^checkout(font)")
out2+=("^tag(font)")

View File

@ -4,6 +4,13 @@
CONKYDIR="$HOME/.config/conky"
BASECONKY="$CONKYDIR/sysinfo_mbcolor.conkyrc"
SESSIONFILE="$CONKYDIR/conky-sessionfile"
COLORIZERDIR="$HOME/.config/colorizer"
CONKYTHEMEDIR="$COLORIZERDIR/conky/themes"
CONKYTHEMEDIR="$COLORIZERDIR/conky/themes"
if [ ! -d "$CONKYTHEMEDIR" ];then
mkdir -p "$CONKYTHEMEDIR"
rsync -a /usr/share/mabox-colorizer/themes/conky/* ${CONKYTHEMEDIR}/
fi
update_session () {
sleep 1
@ -180,6 +187,12 @@ setpos () {
ABORTED_SUMM="Anulowano!"
ABORTED_BODY="\n...operacja anulowana"
;;
es*)
SUMM="Mark new position for ${title^} Conky"
BODY="\nDraw small rectangle to mark new position...\n <i>(ESC or right click to abort)</i>"
ABORTED_SUMM="Aborted!"
ABORTED_BODY="\n... operation aborted!"
;;
*)
SUMM="Mark new position for ${title^} Conky"
BODY="\nDraw small rectangle to mark new position...\n <i>(ESC or right click to abort)</i>"
@ -196,9 +209,9 @@ then
notify-send.sh -i mbcc --replace-file=/tmp/conkyctlfile "${ABORTED_SUMM}" "${ABORTED_BODY}"
else
pos top_left ${1}
# improve gap_calculation here
((X=X+16))
((Y=Y+16))
# improve conky margin calculation here: gap = border_width + border_inner_margin + border_outer_margin
((X=X+17))
((Y=Y+17))
gap_x ${X} ${1}
gap_y ${Y} ${1}
case "$LANG" in
@ -206,6 +219,10 @@ else
THNX_SUMM="Dziękuję!"
THNX_BODY="Zapisano nową pozycję ${title^} \n\tX: <b>$X</b>\n\tY: <b>$Y</b>"
;;
es*)
THNX_SUMM="Thank you!"
THNX_BODY="New position of ${title^} saved! \n\tX: <b>$X</b>\n\tY: <b>$Y</b>"
;;
*)
THNX_SUMM="Thank you!"
THNX_BODY="New position of ${title^} saved! \n\tX: <b>$X</b>\n\tY: <b>$Y</b>"
@ -240,24 +257,58 @@ restartone () {
startone ${1}
}
makemoveableall () {
wmctrl -k on
sd "own_window_type.*$" "own_window_type = 'normal'," ${CONKYDIR}/*mbcolor.conkyrc
case "$LANG" in
pl*)
TITLE="Przenieś Conky dokąd chcesz"
DESC="Możesz teraz przesuwać wszystkie Conky.\nPrzytrzymaj wciśnięty klawisz <b>Alt</b> i przesuń każde Conky gdzie chcesz\n "
CANCEL="Anuluj"
SAVE="Zapisz nowe pozycje"
;;
es*)
TITLE="Move Conkies where you want"
DESC="Move Conkies to desired locations now...\n Hold <b>Alt</b> and drag Conkies one by one.\n"
CANCEL="Cancel"
SAVE="Save new positions"
;;
*)
TITLE="Move Conkies where you want"
DESC="Move Conkies to desired locations now...\n Hold <b>Alt</b> and drag Conkies one by one.\n"
CANCEL="Cancel"
SAVE="Save new positions"
;;
esac
cmd=(
yad --center --borders=20
--title="Move Conkies where you want"
--text="Move Conkies to desired locations now...\n Hold <b>Alt</b> and drag Conkies one by one.\n"
--button="Cancel":1
--button="Save new positions":0
--title="$TITLE"
--text="$DESC"
--button="$CANCEL":1
--button="$SAVE":0
)
"${cmd[@]}"
exval=$?
#notify-send.sh -t 10000 "Exval" "${exval}"
case $exval in
1) makedesktoptypeall;;
0) saveposall;;
252) makedesktoptypeall;;
esac
}
saveposall () {
# save new positions here
while read -r WIN_ID b c X Y rest
do
conffile=$(xprop -id $WIN_ID |grep WM_COMMAND |cut -d'"' -f6)
pos top_left ${conffile}
#notify-send.sh -t 10000 "${X} ${Y}" "${conffile}"
# improve conky margin calculation here: gap = border_width + border_inner_margin + border_outer_margin
((X=X+17))
((Y=Y+17))
gap_x ${X} ${conffile}
gap_y ${Y} ${conffile}
done < <(wmctrl -lpG | grep '1 0 ')
makedesktoptypeall
}
makedesktoptypeall () {
@ -286,6 +337,7 @@ languages () {
case "$LANG" in
pl*)
POSITION="Pozycja"
MAKEMOVEABLE="Ustaw wszystkie (<i>poprzez przeciąganie</i>)..."
MARKNEWPOS="Nowa pozycja (<i>zaznacz na ekranie</i>)..."
ALIGNMENT="Wyrównanie"
TOPLEFT="Góra po lewej"
@ -305,12 +357,18 @@ languages () {
COLOR_1="Kolor 1 <small>(większy tekst)</small>"
COLOR_2="Kolor 2 <small>(pasek/graf)</small>"
BACKGROUND="Kolor tła"
REGENERATE="(Re)Generuj kolory"
REGENERATE="Motywy kolorów"
OPENTHEMEDIR="Otwórz katalog motywów"
APPLY_THEME="Zastosuj motyw"
APPLY_TO_ONE="Zastosuj do "
APPLY_TO_ALL="Zastosuj do wszystkich"
NEWTHEME="Nowy motyw kolorów..."
SAVENEWTHEME="utwórz nowy motyw..."
LIGHTBG="<b>light</b> - jasne tło"
DARKBG="<b>dark</b> - ciemne tło"
RESETCOLORS="Przywróć domyślne kolory"
GENFROMWP="Generuj z kolorów tapety"
TRANSPARENT="Przezroczyste?"
TRANSPARENT="Przezroczyste tło?"
YES="Tak"
NO="Nie"
FONTS="Czcionka"
@ -331,9 +389,11 @@ languages () {
STIPPLED_BORDERS="Nakrapiane"
SOLID_LINE="linia ciągła"
NOT_WORKING="Nie działa? Naprawmy to :)"
MOUNTPOINTS="Dyski (punkty montowania)"
;;
*)
es*)
POSITION="Position"
MAKEMOVEABLE="Make moveable all..."
MARKNEWPOS="New position (<i>mark on the screen</i>)..."
ALIGNMENT="Alignment"
TOPLEFT="TopLeft"
@ -354,11 +414,17 @@ languages () {
COLOR_2="Color 2 <small>(bars/graphs)</small>"
BACKGROUND="Background color"
REGENERATE="(Re)Generate colors"
OPENTHEMEDIR="Open schemes dir"
APPLY_THEME="Color schemes"
APPLY_TO_ONE="Apply to "
APPLY_TO_ALL="Apply to All"
NEWTHEME="New Color scheme..."
SAVENEWTHEME="from current colors..."
LIGHTBG="<b>light</b>"
DARKBG="<b>dark</b>"
RESETCOLORS="Restore default colors"
GENFROMWP="Generate from wallpaper"
TRANSPARENT="Transparent?"
TRANSPARENT="Transparent background?"
YES="Yes"
NO="No"
FONTS="Font"
@ -367,7 +433,7 @@ languages () {
DECREASE="Decrease"
OLINE="Outline"
SHADOW="Shadow"
DRAW="Deaw"
DRAW="Draw"
BORDERS="Borders"
EDIT="Edit file"
RELOAD="Reload"
@ -379,6 +445,63 @@ languages () {
STIPPLED_BORDERS="Stippled borders"
SOLID_LINE="solid line"
NOT_WORKING="Not working? Try to fix"
MOUNTPOINTS="Discs (mount points)"
;;
*)
POSITION="Position"
MAKEMOVEABLE="Make moveable all..."
MARKNEWPOS="New position (<i>mark on the screen</i>)..."
ALIGNMENT="Alignment"
TOPLEFT="TopLeft"
TOP="Top"
TOPRIGHT="TopRight"
LEFT="Left"
CENTER="Center"
RIGHT="Right"
BOTTOMLEFT="BottomLeft"
BOTTOM="Bottom"
BOTTOMRIGHT="BottomRight"
HORIZONTAL_GAP="Horizontal Gap"
VERTICAL_GAP="Vertical Gap"
COLORS="Colors"
DEFCOLOR="Default color <small>(text and border)</small>"
COLOR_0="Color 0 <small>(text2)</small>"
COLOR_1="Color 1 <small>(bigger text)</small>"
COLOR_2="Color 2 <small>(bars/graphs)</small>"
BACKGROUND="Background color"
REGENERATE="(Re)Generate colors"
OPENTHEMEDIR="Open schemes dir"
APPLY_THEME="Color schemes"
APPLY_TO_ONE="Apply to "
APPLY_TO_ALL="Apply to All"
NEWTHEME="New Color scheme..."
SAVENEWTHEME="from current colors..."
LIGHTBG="<b>light</b>"
DARKBG="<b>dark</b>"
RESETCOLORS="Restore default colors"
GENFROMWP="Generate from wallpaper"
TRANSPARENT="Transparent background?"
YES="Yes"
NO="No"
FONTS="Font"
SELECTFONT="Select Font..."
INCREASE="Increase"
DECREASE="Decrease"
OLINE="Outline"
SHADOW="Shadow"
DRAW="Draw"
BORDERS="Borders"
EDIT="Edit file"
RELOAD="Reload"
KILL="Kill"
LOGOSIZE="Logo size"
SMALL="Small"
NORMAL="Normal"
BIG="Big"
STIPPLED_BORDERS="Stippled borders"
SOLID_LINE="solid line"
NOT_WORKING="Not working? Try to fix"
MOUNTPOINTS="Discs (mount points)"
;;
esac
}
@ -390,7 +513,7 @@ single () {
title=${name//_/ }
# breaks mbclr color picking from contextmenu, leave it as "colorizer-conky -s" for now
if [[ "$2" == "s" ]];then
me="colorizer-conky -s"
me="none none"
else
me="colorizer-conky -s"
fi
@ -459,6 +582,8 @@ single () {
for i in 0 10 20 30 40 60 80 100 120 140 160 180 200 220 240 260 280 300 320 340 360; do
out3+=("${i},conkyctl gap_y ${i} ${1};$me")
done
out2+=("^sep()")
out2+=(" $MAKEMOVEABLE,conkyctl makemoveableall")
if [[ "$1" =~ "logo_mbcolor" ]]; then
read LSIZE <<< "$(grep minimum_height ${1} | cut -d'=' -f2 | cut -d"," -f1)"
@ -480,6 +605,13 @@ single () {
EDIT_CONF="Edytuj plik konfiguracyjny"
RELOAD="Przeładuj"
;;
es*)
FONTSIZE="Font size"
QUOTE_FSIZE="Quote"
AUTHOR_FSIZE="Author"
EDIT_CONF="Edit conf file"
RELOAD="Reload"
;;
*)
FONTSIZE="Font size"
QUOTE_FSIZE="Quote"
@ -493,9 +625,6 @@ single () {
out+=("^sep($FONTSIZE)")
out+=("$QUOTE_FSIZE [ <b>$quote_fontsize</b> ],^checkout(qsize)")
out+=("$AUTHOR_FSIZE [ <b>$author_fontsize</b> ],^checkout(asize)")
#out+=("^sep()")
#out+=("$EDIT_CONF,xdg-open '${Q_CFG}'")
#out+=("$RELOAD,conkyctl restartone ${1};$me")
out2+=("^tag(qsize)")
out2+=("^sep($QUOTE_FSIZE)")
for i in 10 11 12 13 14 15 16 18 20; do
@ -509,36 +638,63 @@ single () {
fi
out+=("^sep($COLORS)")
if [[ "$1" != *"logo_mbcolor"* ]]; then
[[ "$CLR" != "#" ]] && out+=("<small><span bgcolor='$CLR'> </span><span ${BG} fgcolor='$CLR'> AbCd </span></small> $DEFCOLOR,^pipe(mbclr '$CLR' conkyctl default_color '${DEFCOLOR}' '$me' ${1})")
[[ "$CLR0" != "#" ]] && out+=("<small><span bgcolor='$CLR0'> </span><span ${BG} fgcolor='$CLR0'> AbCd </span></small> $COLOR_0,^pipe(mbclr '$CLR0' conkyctl color0 '$COLOR_0' '$me' ${1})")
[[ "$CLR1" != "#" ]] && out+=("<small><span bgcolor='$CLR1'> </span><span ${BG} fgcolor='$CLR1'> AbCd </span></small> $COLOR_1,^pipe(mbclr '$CLR1' conkyctl color1 '$COLOR_1' '$me' ${1})")
[[ "$CLR2" != "#" ]] && out+=("<small><span bgcolor='$CLR2'> </span><span ${BG} fgcolor='$CLR2'> AbCd </span></small> $COLOR_2,^pipe(mbclr '$CLR2' conkyctl color2 '$COLOR_2' '$me' ${1})")
out+=("^sep()")
fi
if [ "$WINTRANS" == false ];then
out+=("<small><span bgcolor='$WINCLR'> </span><span ${BG} fgcolor='$WINCLR'> AbCd </span></small> $BACKGROUND,^checkout(transsingle)")
else
out+=("<small><span>transparent </span></small> $BACKGROUND,^checkout(transsingle)")
fi
out+=("^sep()")
if [[ "$1" != *"logo_mbcolor"* ]]; then
out+=("$REGENERATE,^checkout(regensingle)")
out+=("<span bgcolor='#282828'> <span fgcolor='#ebdbb2'></span> <span fgcolor='#98971a'></span> <span fgcolor='#d79921'></span> <span fgcolor='#cc241d'></span> </span> $REGENERATE,^checkout(regensingle)")
out2+=("^tag(regensingle)")
out2+=("^sep($REGENERATE)")
out2+=("$RESETCOLORS,conkyctl resetcolorsone ${1}")
out2+=("^sep($GENFROMWP)")
out2+=("$LIGHTBG,w2theme conkyone light ${1}")
out2+=("$DARKBG,w2theme conkyone dark ${1}")
out2+=("^sep($APPLY_THEME)")
out3+=("^tag(applytoall)")
out3+=("^sep($APPLY_TO_ALL)")
for i in "${COLORIZERDIR}"/conky/themes/*.colors
do
source "${i}"
themefilename=${i##*/}
themename=${themefilename%%.colors}
out2+=("<span bgcolor='$own_window_colour'> <span fgcolor='$default_color'></span> <span fgcolor='$color0'></span> <span fgcolor='$color1'></span> <span fgcolor='$color2'></span> </span> $themename,conkyctl settheme $themefilename $1")
#out3+=("TEST [ ${title^} ],notify-send.sh $themefilename $1")
out3+=("<span bgcolor='$own_window_colour'> <span fgcolor='$default_color'></span> <span fgcolor='$color0'></span> <span fgcolor='$color1'></span> <span fgcolor='$color2'></span> </span> $themename,conkyctl settheme_all $themefilename")
done
out2+=("^sep()")
out2+=(" $OPENTHEMEDIR,xdg-open ${COLORIZERDIR}/conky/themes/")
out2+=("^sep()")
out2+=("$APPLY_TO_ALL,^checkout(applytoall)")
if [[ "$1" =~ "sysinfo_" ]]; then
out2+=("^sep($NEWTHEME)")
out2+=("$SAVENEWTHEME,conkyctl newcolorscheme ${1}")
fi
out+=("^sep()")
fi
out+=("$TRANSPARENT [ <b>$WINTRANS</b> ],^checkout(transsingle)")
if [ "$WINTRANS" == false ];then
out+=("<small><span bgcolor='$WINCLR'> </span><span ${BG} fgcolor='$WINCLR'> AbCd </span></small> $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor '${BACKGROUND}' '$me' ${1})")
else
out+=("<small><span bgcolor='$WINCLR'> transparent </span></small> $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor '${BACKGROUND}' '$me' ${1})")
fi
out+=("^sep()")
if [[ "$1" != *"logo_mbcolor"* ]]; then
[[ "$CLR" != "#" ]] && out+=("<small><span bgcolor='$CLR'> </span><span ${BG} fgcolor='$CLR'> <b>AbCd</b> </span></small> $DEFCOLOR,^pipe(mbclr '$CLR' conkyctl default_color '${DEFCOLOR}' '$me' ${1})")
[[ "$CLR0" != "#" ]] && out+=("<small><span bgcolor='$CLR0'> </span><span ${BG} fgcolor='$CLR0'> <b>AbCd</b> </span></small> $COLOR_0,^pipe(mbclr '$CLR0' conkyctl color0 '$COLOR_0' '$me' ${1})")
[[ "$CLR1" != "#" ]] && out+=("<small><span bgcolor='$CLR1'> </span><span ${BG} fgcolor='$CLR1'> <b>AbCd</b> </span></small> $COLOR_1,^pipe(mbclr '$CLR1' conkyctl color1 '$COLOR_1' '$me' ${1})")
[[ "$CLR2" != "#" ]] && out+=("<small><span bgcolor='$CLR2'> </span><span ${BG} fgcolor='$CLR2'> <b>AbCd</b> </span></small> $COLOR_2,^pipe(mbclr '$CLR2' conkyctl color2 '$COLOR_2' '$me' ${1})")
out+=("^sep()")
fi
out2+=("^tag(transsingle)")
out2+=("^sep($TRANSPARENT)")
out2+=("$YES,conkyctl transparent true ${1};$me")
out2+=("$NO,conkyctl transparent false ${1};$me")
out2+=("^sep()")
out2+=("<small><span bgcolor='$WINCLR'> </span></small> $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor '${BACKGROUND}' '$me' ${1})")
#notify-send.sh "1" "${1}"
if [[ "$1" != *"logo_mbcolor"* ]]; then
if [[ "$1" != *"quoter_mbcolor"* ]]; then
out+=("$FONTS [ <b>$FONT $FONTSIZE</b> ],^checkout(fontsingle)")
@ -655,40 +811,64 @@ contextmenu () {
single "${CONKYCFG}" "s"
out+=("^sep()")
out+=(" ⮜⮜⮜ Colorizer Conky,colorizer-conky -s")
if [[ "$CONKYCFG" =~ "mount_points" ]]; then
out+=("^sep($MOUNTPOINTS)")
while read DEVICE SIZE USED FREE PERCENT MOUNT
do
[[ "${#MOUNT}" -gt "10" ]] && MOUNTLBL=${MOUNT##*/} || MOUNTLBL=${MOUNT}
[[ "${#MOUNTLBL}" -gt "10" ]] && MOUNTLBL=${MOUNTLBL:0:9}
out+=("$MOUNTLBL,^pipe(jgbrowser ${MOUNT})")
done < <(df -h | grep -v "boot" | grep '^/dev')
fi
mkconfigfile
# if conky_contextmenu_colors = conky
echo "color_menu_bg=${WINCLR} 100" >> ${CONFIG_FILE}
echo "color_menu_bg_to=${WINCLR} 100" >> ${CONFIG_FILE}
TXTCOLOR=$(pastel textcolor ${WINCLR}|pastel format hex)
#notify-send.sh "TXTCOLOR" "${TXTCOLOR} ${menu_gradient_pos}"
if [ "$TXTCOLOR" == "#ffffff" ];then
if [ "$TXTCOLOR" == "#ffffff" ];then #bg is dark
TXTCOLOR_NORM="#cccccc"
WINCLR=$(pastel lighten 0.03 ${WINCLR}|pastel format hex)
echo "color_norm_fg=${TXTCOLOR_NORM} 100" >> ${CONFIG_FILE}
echo "color_sel_fg=${TXTCOLOR} 100" >> ${CONFIG_FILE}
echo "color_title_fg=${TXTCOLOR} 60" >> ${CONFIG_FILE}
SELBG=$(pastel darken 0.1 ${WINCLR}|pastel format hex)
SELBG=$(pastel darken 0.05 ${WINCLR}|pastel format hex)
echo "color_sel_bg=${SELBG} 80" >> ${CONFIG_FILE}
echo "color_title_bg=${SELBG} 30" >> ${CONFIG_FILE}
echo "color_title_border=${SELBG} 60" >> ${CONFIG_FILE}
else
else #bg is light
TXTCOLOR_NORM="#333333"
echo "color_norm_fg=${TXTCOLOR_NORM} 100" >> ${CONFIG_FILE}
echo "color_sel_fg=${TXTCOLOR} 100" >> ${CONFIG_FILE}
echo "color_title_fg=${TXTCOLOR} 90" >> ${CONFIG_FILE}
SELBG=$(pastel darken 0.1 ${WINCLR}|pastel format hex)
SELBG=$(pastel darken 0.05 ${WINCLR}|pastel format hex)
echo "color_sel_bg=${SELBG} 80" >> ${CONFIG_FILE}
echo "color_title_bg=${SELBG} 90" >> ${CONFIG_FILE}
echo "color_title_border=${SELBG} 90" >> ${CONFIG_FILE}
fi
echo "color_menu_bg=${WINCLR} 90" >> ${CONFIG_FILE}
echo "color_menu_border=${CLR} 60" >> ${CONFIG_FILE}
echo "menu_border=2" >> ${CONFIG_FILE}
echo "menu_radius=4" >> ${CONFIG_FILE}
echo "color_sep_fg=${CLR} 10" >> ${CONFIG_FILE}
echo "font=${FONT} 10" >> ${CONFIG_FILE}
case "$LANG" in
pl*)
CUSTOM_COMMANDS_SEP="Własne polecenia"
EDIT_CUSTOMCOMMANDS=" Edytuj własne polecenia"
;;
es*)
CUSTOM_COMMANDS_SEP="Custom commands"
EDIT_CUSTOMCOMMANDS=" Edit custom commands"
;;
*)
CUSTOM_COMMANDS_SEP="Custom commands"
EDIT_CUSTOMCOMMANDS=" Edit custom commands"
@ -700,7 +880,6 @@ if [ "$LINES" -gt "0" ]; then
cat <<EOF > ${MENU_ITEMS}
$(printf '%s\n' "${out[@]}")
⮜⮜⮜ Colorizer Conky,colorizer-conky -s
^sep($CUSTOM_COMMANDS_SEP)
<small>$EDIT_CUSTOMCOMMANDS</small>,touch ~/.config/mabox/${name}.csv;sleep 1;xdg-open ~/.config/mabox/${name}.csv
^sep()
@ -711,8 +890,6 @@ EOF
else
cat <<EOF > ${MENU_ITEMS}
$(printf '%s\n' "${out[@]}")
^sep()
⮜⮜⮜ Colorizer Conky,colorizer-conky -s
^sep($CUSTOM_COMMANDS_SEP)
${CUSTOMCOMMANDS}
<small>$EDIT_CUSTOMCOMMANDS</small>,touch ~/.config/mabox/${name}.csv;sleep 1;xdg-open ~/.config/mabox/${name}.csv
@ -723,8 +900,6 @@ fi
else
cat <<EOF > ${MENU_ITEMS}
$(printf '%s\n' "${out[@]}")
^sep()
⮜⮜⮜ Colorizer Conky,colorizer-conky -s
^sep($CUSTOM_COMMANDS_SEP)
<small>$EDIT_CUSTOMCOMMANDS</small>,touch ~/.config/mabox/${name}.csv;sleep 1;xdg-open ~/.config/mabox/${name}.csv
${CUSTOMCOMMANDS}
@ -752,6 +927,12 @@ case "$LANG" in
IP="Adres IP"
DOWNLOAD="Pobieranie"
;;
es*)
NETWORK="NETWORK"
DEVICE="Device"
IP="IP"
DOWNLOAD="Download"
;;
*)
NETWORK="NETWORK"
DEVICE="Device"
@ -776,6 +957,145 @@ EOF
cat /tmp/xx00 > ${CFGFILE}
}
settheme () {
source "$COLORIZERDIR"/conky/themes/${1}
win_bgcolor ${own_window_colour} $2
default_color ${default_color} $2
color0 ${color0} $2
color1 ${color1} $2
color2 ${color2} $2
}
settheme_all () {
source "$COLORIZERDIR"/conky/themes/${1}
win_bgcolor_all ${own_window_colour}
default_color_all ${default_color}
color0_all ${color0}
color1_all ${color1}
color2_all ${color2}
}
savecolorscheme () {
# $1 - themename $2 - source conkyrc
#notify-send.sh "${1}" "${2}"
## get colors
read WINCLR <<< "$(grep own_window_colour ${2} | cut -d'=' -f2 | cut -d"'" -f2)"
[[ $WINCLR =~ ^#.* ]] && : || WINCLR="#${WINCLR}"
read CLR <<< "$(grep default_color ${2} | cut -d'=' -f2 | cut -d"'" -f2)"
[[ $CLR =~ ^#.* ]] && : || CLR="#${CLR}"
read CLR0 <<< "$(grep color0 ${2} | cut -d'=' -f2 | cut -d"'" -f2)"
[[ $CLR0 =~ ^#.* ]] && : || CLR0="#${CLR0}"
read CLR1 <<< "$(grep color1 ${2} | cut -d'=' -f2 | cut -d"'" -f2)"
[[ $CLR1 =~ ^#.* ]] && : || CLR1="#${CLR1}"
read CLR2 <<< "$(grep color2 ${2} | cut -d'=' -f2 | cut -d"'" -f2)"
[[ $CLR2 =~ ^#.* ]] && : || CLR2="#${CLR2}"
cat << EOF > "$CONKYTHEMEDIR/$1".colors
own_window_colour='${WINCLR}'
default_color='${CLR}'
color0='${CLR0}'
color1='${CLR1}'
color2='${CLR2}'
EOF
case "$LANG" in
pl*)
TITLE="Zapisano motyw ${themename}!"
DESC="Czy zastosować motyw <b>${themename}</b> do wszystkich Conky?\n"
NO="Nie, dzieki"
YES="Tak, zastosuj do wszystkich"
;;
es*)
TITLE="Colorscheme ${themename} saved!"
DESC="Do you want to apply <b>${themename}</b> color scheme to all Conky?\n"
NO="No,thanks"
YES="Yes, apply to all"
;;
*)
TITLE="Colorscheme ${themename} saved!"
DESC="Do you want to apply <b>${themename}</b> color scheme to all Conky?\n"
NO="No,thanks"
YES="Yes, apply to all"
;;
esac
cmd=(
yad --center --borders=20
--title="$TITLE"
--text="$DESC"
--button="$NO":1
--button="$YES":0
)
"${cmd[@]}"
exval=$?
case $exval in
1) :;;
0) settheme_all "${themename}.colors";;
252) :;;
esac
}
newcolorscheme () {
#notify-send.sh "NEW" "${1}"
case "$LANG" in
pl*)
SAVE_AS="Zapisz motyw jako..."
LABEL="Nazwa motywu kolorów:"
NAME="nazwa-motywu"
;;
*)
SAVE_AS="Save theme as..."
LABEL="Conky colorscheme name:"
NAME="colorscheme-name"
;;
*)
SAVE_AS="Save theme as..."
LABEL="Conky colorscheme name:"
NAME="colorscheme-name"
;;
esac
themename=$(yad --center --width=300 --title "$SAVE_AS" --entry --entry-label="$LABEL" --entry-text="$NAME") || exit 1
themename="${themename// /-}"
if [[ -f "$CONKYTHEMEDIR/${themename}.colors" ]]; then
# Themefile EXIST overwrite???
case "$LANG" in
pl*)
TITLE="Nadpisać?"
EXIST="Motyw <b>${themename}</b> już istnieje.\nNadpisać?"
CANCEL="Anuluj"
YES="Tak, nadpisz"
;;
es*)
TITLE="Overwrite?"
EXIST="Colorscheme <b>${themename}</b> exist.\nOverwrite?"
CANCEL="Cancel"
YES="Yes, overwrite"
;;
*)
TITLE="Overwrite?"
EXIST="Colorscheme <b>${themename}</b> exist.\nOverwrite?"
CANCEL="Cancel"
YES="Yes, overwrite"
;;
esac
cmd=(
yad --center --borders=20
--title="$TITLE"
--text="$EXIST"
--button="$CANCEL":1
--button="$YES ${themename}":0
)
"${cmd[@]}"
exval=$?
case $exval in
1) :;;
0) savecolorscheme "${themename}" "${1}";;
252) :;;
esac
else # New themefile, create
savecolorscheme "${themename}" "${1}"
fi
}
case "$1" in
transparent_all) transparent_all "$2";;
transparent) transparent "$2" "$3";;
@ -816,6 +1136,9 @@ case "$1" in
saveposall) saveposall;;
resetcolorsall) resetcolorsall ;;
resetcolorsone) resetcolorsone "$2";;
settheme) settheme "$2" "$3";;
settheme_all) settheme_all "$2";;
newcolorscheme) newcolorscheme "$2";;
netdevice) netdevice ;;
*) : ;;
esac

View File

@ -3,7 +3,8 @@
getdata () {
df -h | grep -v "boot" | grep '^/dev' | while read DEVICE SIZE USED FREE PERCENT MOUNT
do
[[ "${#MOUNT}" -gt "12" ]] && MOUNTLBL=${MOUNT##*/} || MOUNTLBL=${MOUNT}
[[ "${#MOUNT}" -gt "10" ]] && MOUNTLBL=${MOUNT##*/} || MOUNTLBL=${MOUNT}
[[ "${#MOUNTLBL}" -gt "10" ]] && MOUNTLBL=${MOUNTLBL:0:9}
echo "$MOUNTLBL\${goto 90}\${color2}\${fs_bar 6,64 $MOUNT}\${color}\${goto 160}$USED\${goto 200}$PERCENT\${alignr}$SIZE"
done
}

View File

@ -109,9 +109,8 @@ Changing the background color will also set:
<ul>
<li>border color to the same color</li>
<li>computed BGCOLOR_TO color for a subtle gradient</li>
<li>accent color in Menu, Sidepanels and other jgmenu-based Mabox tools</li>
</ul>
You can change all of them to you liking afterwards.
You can change them to you liking afterwards.
</em>
<hr />
<h4>Buttons</h4>
@ -171,7 +170,7 @@ You can change all of them to you liking afterwards.
<td><a href="run://obtctl gradient pyramid"><img src="./img/pyramid.png"></a></td>
</tr>
<tr>
<th colspan="2" class="w3-teal">Raised or flat?</th>
<th colspan="2" class="w3-teal">Raised, flat or sunken?</th>
</tr>
<tr>
<td>Raised</td>
@ -181,6 +180,10 @@ You can change all of them to you liking afterwards.
<td>Flat</td>
<td><a href="run://obtctl raised 0"><img src="./img/flat.png"></a></td>
</tr>
<tr>
<td>Sunken</td>
<td><a href="run://obtctl raised 2"><img src="./img/flat.png"></a></td>
</tr>
</table>
<hr />
@ -209,6 +212,16 @@ You can change all of them to you liking afterwards.
<p><strong>Global settings</strong> allow you to change all Conky at once.</p>
<p><strong> Individual settings</strong> allow you to tweak individual Conkies, which can be very convenient to fit some wallpapers.</p>
<h3>NEW! Context menu for individual Conkies</h3>
<p><em>Mabox delivers Conky on steroids ;)</em></p>
<p>For each individual Conky there is a context menu (right click).</p>
<p>The context menu offers interesting possibilities:
<ul>
<li>Change position, colors and other settings for individual Conky</li>
<li>Set predefined color themes</li>
<li>Adding your own commands (for each Conky separately)</li>
</ul></p>
</section>
<section id="Terminal" class="w3-container tab" style="display:none;min-height:100vh">

View File

@ -67,16 +67,16 @@ div.fixeddown {
</section>
<section id="Openbox" class="w3-container tab" style="display:none;min-height:100vh;">
<div class="fixed"><a class="w3-button w3-round w3-tiny w3-lime w3-margin w3-display-topright" href="run://colorizer-ob -s">Launch OBtheme module</a></div>
<div class="fixed"><a class="w3-button w3-round w3-tiny w3-lime w3-margin w3-display-topright" href="run://colorizer-ob -s">Uruchom moduł Openbox</a></div>
<h2>Motyw Openbox</h2>
<p>The Openbox module allows you to easily customize the appearance of window decorations.</p>
<p>It works with MBcolors theme - defaut one.</p>
<p>Moduł Openbox pozwala w łatwy sposób dostosować wygląd dekoracji okien</p>
<p>Działa z motywem domyślnym MBcolors.</p>
<p>You can change some basic settings directly from this screen. For much more options, fine-tunning and colors choices launch OBtheme module.</p>
<p>Możesz zmienić niektóre podstawowe ustawienia bezpośrednio z tego ekranu. Aby uzyskać znacznie więcej opcji dostrajania oraz większy wybór kolorów, uruchom moduł Openbox.</p>
<h4>Kolor tła dla aktywnego okna</h4>
<div class="w3-panel w3-border w3-dark-grey">
<p>You can change active window titlebar color by clicking circles below.</p>
<p>Możesz zmienić kolor paska tytułowego aktywnego okna, klikając kółka poniżej.</p>
<p class="w3-center w3-margin">
<a class="w3-btn w3-circle w3-small w3-margin-bottom" style="background-color:#DDDDDD" href="run://obtctl clractivebg #DDDDDD">&nbsp;</a>
<a class="w3-btn w3-circle w3-small w3-margin-bottom" style="background-color:#a4c400" href="run://obtctl clractivebg #a4c400">&nbsp;</a>
@ -104,18 +104,17 @@ div.fixeddown {
<a class="w3-btn w3-circle w3-small w3-margin-bottom" style="background-color:#222222" href="run://obtctl clractivebg #222222">&nbsp;</a>
</p>
</div>
<em>Note!<br />
Changing the background color will also set:
<em>Zauważ!<br />
Zmiana koloru paska tytułowego ustawi również:
<ul>
<li>border color to the same color</li>
<li>computed BGCOLOR_TO color for a subtle gradient</li>
<li>accent color in Menu, Sidepanels and other jgmenu-based Mabox tools</li>
<li>taki sam kolor obramowania okna</li>
<li>kolor dla subtelnego gradientu</li>
</ul>
You can change all of them to you liking afterwards.
Później możesz je zmienić według własnych upodobań.
</em>
<hr />
<h4>Przyciski</h4>
<p>Click icons below to change buttons</p>
<p>Kliknij ikony poniżej, aby zmienić wygląd przyciskw</p>
<table class="w3-table w3-bordered w3-dark-grey w3-small w3-centered">
<tr class="w3-teal">
<th>Tiny</th>
@ -132,55 +131,59 @@ You can change all of them to you liking afterwards.
</table>
<hr />
<h4>Gradienty</h4>
<p>Openbox title bar can use various types of gradients...</p>
<p>Pasek tytułu Openbox może wykorzystywać różne rodzaje gradientów...</p>
<table class="w3-table w3-bordered w3-dark-grey w3-small">
<tr class="w3-teal">
<th>Gradient type</th>
<th>Image (click to apply)</th>
<th>Typ Gradientu</th>
<th>Obrazek (kliknij aby zastosować)</th>
</tr>
<tr>
<td>Solid color (no gradient)</td>
<td>Jednolity kolor (bez gradientu)</td>
<td><a href="run://obtctl gradient solid"><img src="./img/solid.png"></a></td>
</tr>
<tr>
<td>Vertical</td>
<td>W pionie</td>
<td><a href="run://obtctl gradient vertical"><img src="./img/vertical.png"></a></td>
</tr>
<tr>
<td>Horizontal</td>
<td>W poziomie</td>
<td><a href="run://obtctl gradient horizontal"><img src="./img/horizontal.png"></a></td>
</tr>
<tr>
<td>MirrorHorizontal</td>
<td>Lustro Poziome</td>
<td><a href="run://obtctl gradient mirrorhorizontal"><img src="./img/mirrorhorizontal.png"></a></td>
</tr>
<tr>
<td>SplitVertical</td>
<td>Podział w pionie</td>
<td><a href="run://obtctl gradient splitvertical"><img src="./img/splitvertical.png"></a></td>
</tr>
<tr>
<td>Diagonal</td>
<td>Przekątna</td>
<td><a href="run://obtctl gradient diagonal"><img src="./img/diagonal.png"></a></td>
</tr>
<tr>
<td>CrossDiagonal</td>
<td>Przekątna krzyżowa</td>
<td><a href="run://obtctl gradient crossdiagonal"><img src="./img/crossdiagonal.png"></a></td>
</tr>
<tr>
<td>Pyramid</td>
<td>Piramida</td>
<td><a href="run://obtctl gradient pyramid"><img src="./img/pyramid.png"></a></td>
</tr>
<tr>
<th colspan="2" class="w3-teal">Raised or flat?</th>
<th colspan="2" class="w3-teal">Podniesiony, Płaski czy Wklęsły?</th>
</tr>
<tr>
<td>Raised</td>
<td>Podniesiony</td>
<td><a href="run://obtctl raised 1"><img src="./img/raised.png"></a></td>
</tr>
<tr>
<td>Flat</td>
<td>Płaski</td>
<td><a href="run://obtctl raised 0"><img src="./img/flat.png"></a></td>
</tr>
<tr>
<td>Wklęsły</td>
<td><a href="run://obtctl raised 2"><img src="./img/flat.png"></a></td>
</tr>
</table>
<hr />
@ -208,6 +211,15 @@ You can change all of them to you liking afterwards.
<p><strong>Ustawienia globalne</strong> pozwalają na zmiany dla wszystkich instancji Conky od razu.</p>
<p><strong>Ustawienia indywidualne</strong> umożliwiają dostosowywanie pojedynczych Conky, co może być bardzo przydatne w przypadku niektórych tapet.</p>
<h3>Nowe! Menu kontekstowe dla poszczególnych Conky</h3>
<p><em>Mabox dostarcza Conky na sterydach ;)</em></p>
<p>Dla każdego indywidualnego Conky dostępne jest menu kontekstowe (pod prawym klikiem).</p>
<p>Menu kontekstowe daje ciekawe możliwości:
<ul>
<li>Zmiana pozycji, kolorystyki i innych ustawień dla poszczególnych Conky</li>
<li>Ustawienie predefioniowanych motywów kolorów</li>
<li>Dodawanie własnych poleceń (dla każdego Conky z osobna)</li>
</ul></p>
</section>
<section id="Terminal" class="w3-container tab" style="display:none;min-height:100vh">
@ -229,7 +241,7 @@ You can change all of them to you liking afterwards.
<p><a class="w3-button w3-inline w3-round w3-tiny w3-lime" href="run://jgtint2launcher -s">Dodaj/Usuń Programy do launchera</a></p>
</section>
<section id="Wallpapers" class="w3-container tab" style="display:none;min-height:100vh;">
<div class="fixed"><a class="w3-button w3-round w3-tiny w3-lime w3-margin w3-display-topright" href="run://jgwallpaperchanger -c">Launch Wallpaper Menu</a></div>
<div class="fixed"><a class="w3-button w3-round w3-tiny w3-lime w3-margin w3-display-topright" href="run://jgwallpaperchanger -c">Uruchom menu tapet</a></div>
<h2>Tapety</h2>
<p>Colorizer automatycznie generuje paletę kolorów z aktualnie ustawionej tapety.</p>
<p></p>

View File

@ -0,0 +1,5 @@
own_window_colour='#142c2c'
default_color='#309552'
color0='#accdc7'
color1='#61c4bc'
color2='#E8CB2D'

View File

@ -0,0 +1,5 @@
own_window_colour='#282c34'
default_color='#bbc2cf'
color0='#98be65'
color1='#c678dd'
color2='#da8548'

View File

@ -0,0 +1,5 @@
own_window_colour='#282936'
default_color='#e9e9f4'
color0='#ea51b2'
color1='#00f769'
color2='#ebff87'

View File

@ -0,0 +1,5 @@
own_window_colour='#282828'
default_color='#ebdbb2'
color0='#98971a'
color1='#d79921'
color2='#cc241d'

View File

@ -0,0 +1,5 @@
own_window_colour='#DACEA9'
default_color='#9D0006'
color0='#797410'
color1='#427B58'
color2='#076678'

View File

@ -0,0 +1,5 @@
own_window_colour='#8A1538'
default_color='#f8f8f4'
color0='#d9d9d9'
color1='#310617'
color2='#ff1f1f'

View File

@ -0,0 +1,5 @@
own_window_colour='#1e0528'
default_color='#b900b1'
color0='#ffeeff'
color1='#550068'
color2='#955ae7'

View File

@ -0,0 +1,5 @@
own_window_colour='#00222b'
default_color='#00ccff'
color0='#007a99'
color1='#99ebff'
color2='#66e0ff'

View File

@ -0,0 +1,5 @@
own_window_colour='#2b0c00'
default_color='#ff3600'
color0='#b32700'
color1='#ff9b80'
color2='#661600'

View File

@ -0,0 +1,5 @@
own_window_colour='#403500'
default_color='#ffd300'
color0='#b39500'
color1='#ffe14d'
color2='#806a00'

View File

@ -0,0 +1,5 @@
own_window_colour='#E1E1E1'
default_color='#C18401'
color0='#A0A1A7'
color1='#0184BD'
color2='#FAFAFA'

View File

@ -0,0 +1,5 @@
own_window_colour='#184956'
default_color='#adbcbc'
color0='#ff665c'
color1='#84c747'
color2='#ebc13d'

View File

@ -0,0 +1,5 @@
own_window_colour='#ECE3CC'
default_color='#3A4D53'
color0='#AD8900'
color1='#CC1729'
color2='#428B00'

View File

@ -0,0 +1,5 @@
own_window_colour='#151718'
default_color='#D6D6D6'
color0='#CD3F45'
color1='#9FCA56'
color2='#E6CD69'