upd
This commit is contained in:
parent
56d8cd14fd
commit
ca19fb7e34
@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# colorizer - set of tools for Mabox (auto)theming
|
||||
# Copyright (C) 2022-2023 Daniel Napora <napcok@gmail.com>
|
||||
# Copyright (C) 2022-2024 Daniel Napora <napcok@gmail.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
@ -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/>.
|
||||
|
||||
. $HOME/.config/mabox/mabox.conf
|
||||
|
||||
CNF_DIR="$HOME/.config/colorizer"
|
||||
mkdir -p "$CNF_DIR"
|
||||
CNF_FILE="$CNF_DIR/colorizer.conf"
|
||||
@ -47,6 +49,7 @@ case "$LANG" in
|
||||
CURRENTCONF="Obecna konfiguracja"
|
||||
MODULES="Moduły"
|
||||
FONTS="Konfiguruj <b>Czcionki</b>"
|
||||
_PICOM="Ustawienia <b>Kompozytora (Picom)</b>"
|
||||
OBTHEME="Motyw <b>Openbox</b>"
|
||||
MENUPANELS="<b>Menu</b> i Panele boczne"
|
||||
COLORIZER_CONKY="<b>Conky</b> Manager i Colorizer"
|
||||
@ -101,6 +104,7 @@ case "$LANG" in
|
||||
RES_MENU="Menu i Paneli"
|
||||
RES_ALL="Wszystko <i>(OB, menu, conky)</i>"
|
||||
COLORIZE="Szybko Pokoloruj lub Resetuj..."
|
||||
_LEFTSIDEPANEL="Lewy panel boczny"
|
||||
;;
|
||||
*)
|
||||
REGENERATE="(Re)Generate from wallpaper colors..."
|
||||
@ -110,6 +114,7 @@ case "$LANG" in
|
||||
CURRENTCONF="Current configuration"
|
||||
MODULES="Modules"
|
||||
FONTS="Configure <b>Fonts</b>"
|
||||
_PICOM="<b>Compositor</b> settings <b>(Picom)</b>"
|
||||
OBTHEME="<b>Openbox</b> Theme"
|
||||
MENUPANELS="<b>Menus/SidePanels</b>"
|
||||
COLORIZER_CONKY="<b>Conky</b> Manager & Colorizer"
|
||||
@ -164,6 +169,7 @@ case "$LANG" in
|
||||
RES_MENU="Menus / Panels"
|
||||
RES_ALL="All <i>(OB, menus, conky)</i>"
|
||||
COLORIZE="Quickly Colorize or Reset..."
|
||||
_LEFTSIDEPANEL="Left Sidepanel"
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -211,6 +217,7 @@ out+=("^sep(Mabox Colorizer)")
|
||||
out+=(" $COLORIZE,^pipe(randomizer c)")
|
||||
out+=("^sep($MODULES)")
|
||||
out+=("<big></big> $FONTS,colorizer-fonts -s")
|
||||
out+=("$_PICOM,jgpicom-pipe -s")
|
||||
out+=("^sep()")
|
||||
out+=("$OBTHEME,colorizer-ob -s")
|
||||
|
||||
@ -264,6 +271,9 @@ out+=(" $HELP,yhtml /usr/share/mabox-colorizer/help/$LNG.html 'Mabox Coloriz
|
||||
else
|
||||
out+=(" $HELP,yhtml /usr/share/mabox-colorizer/help/en.html 'Mabox Colorizer'")
|
||||
fi
|
||||
out+=("^sep()")
|
||||
out+=(" ${arrow_string_left} ${arrow_string_left} $_LEFTSIDEPANEL,mb-jgtools places")
|
||||
|
||||
|
||||
### RESET ACTIONS (replaced by Randomizer)
|
||||
#out+=("^sep($RESET_COLORS)")
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
|
||||
SYSSCHEMES="/usr/share/mabox-colorizer/colorschemes/menus.csv"
|
||||
USERSCHEMES="$HOME/.config/colorizer/menus/userschemes.csv"
|
||||
USERSCHEMES="$HOME/.config/colorizer/menus/userschemes2.csv"
|
||||
|
||||
|
||||
### Wallpaper colors
|
||||
@ -251,6 +251,7 @@ getvalues () {
|
||||
read TFG TFGA<<< "$(grep 'color_title_fg' ${THEMERC} | cut -d'=' -f2)"
|
||||
read TBORDER TBORDERA<<< "$(grep 'color_title_border' ${THEMERC} | cut -d'=' -f2)"
|
||||
read NORMBG NORMBGA<<< "$(grep color_norm_bg ${THEMERC} | cut -d'=' -f2)"
|
||||
[[ "$NORMBG" == "" ]] && NORMBG="${MBG}" NORMBGA=0
|
||||
read NFG NFGA<<< "$(grep color_norm_fg ${THEMERC} | cut -d'=' -f2)"
|
||||
read SBG SBGA<<< "$(grep 'color_sel_bg' ${THEMERC} | cut -d'=' -f2)"
|
||||
read SFG SFGA<<< "$(grep 'color_sel_fg' ${THEMERC} | cut -d'=' -f2)"
|
||||
@ -261,11 +262,12 @@ getvalues () {
|
||||
getvalues
|
||||
|
||||
# Current colors
|
||||
currcolors="${MBG}|${MBGT}|${MBORDER}|${TBG}|${TFG}|${TBORDER}|${NORMBG}|${NFG}|${SBG}|${SFG}|${SBORDER}|${SEPFG}|${GRADIENT}|"
|
||||
currcolors="${MBG}|${MBGA}|${MBGT}|${MBGTA}|${MBORDER}|${MBORDERA}|${TBG}|${TBGA}|${TFG}|${TFGA}|${TBORDER}|${TBORDERA}|${NORMBG}|${NORMBGA}|${NFG}|${NFGA}|${SBG}|${SBGA}|${SFG}|${SFGA}|${SBORDER}|${SBORDERA}|${SEPFG}|${SEPFGA}|${jgtools_border}|${jgtools_radius}|${jgtools_padding}|${submenu_spacing}|${IBORDER}|${IRADIUS}|${arrow_string}|${arrow_string_left}|${SEPHALIGN}|${GRADIENT}|"
|
||||
#echo "${currcolors}" > ~/.config/mabox/.menu_colors
|
||||
notify-send.sh "Currcolors" "${currcolors}"
|
||||
if [ ! -f "$USERSCHEMES" ]; then
|
||||
mkdir -p "$HOME/.config/colorizer/menus/"
|
||||
echo " MBG | MBGT |MBORDER| TBG | TFG |TBORDER|NORMBG | NFG | SBG | SFG |SBORDER| SEPFG |GRADIENT|scheme_name" > "$USERSCHEMES"
|
||||
echo " MBG |opa| MBGT |opa|MBORDER|opa| TBG |opa| TFG |opa|TBORDER|opa|NORMBG |opa| NFG |opa| SBG |opa| SFG |opa|SBORDER|opa| SEPFG |opa|B|R|P|SS|IB|IR|A|AL|SEPHAL|GRADIENT|scheme_name" > "$USERSCHEMES"
|
||||
fi
|
||||
|
||||
out+=("^sep($MENU_THEME: <i>${jgmenu_theme}</i>)")
|
||||
@ -350,7 +352,7 @@ out+=("<big><span bgcolor='${MBG}'> <span fgcolor='${TBG}'></span> <span fgco
|
||||
out2+=("^sep($SYSTEM_SCHEMES)")
|
||||
|
||||
n=1
|
||||
while IFS="|" read -r mbg mbgt mborder tbg tfg tborder normbg nfg sbg sfg sborder sepfg grad scheme_name
|
||||
while IFS="|" read -r mbg mbga mbgt mbgta mborder mbordera tbg tbga tfg tfga tborder tbordera normbg normbga nfg nfga sbg sbga sfg sfga sborder sbordera sepfg sepfga b r p ss ibor irad a al sephal grad scheme_name
|
||||
do
|
||||
((n=n+1))
|
||||
case "$grad" in
|
||||
@ -372,7 +374,7 @@ out+=("<big><span bgcolor='${MBG}'> <span fgcolor='${TBG}'></span> <span fgco
|
||||
out2+=("<big></big> $OPEN_SCHEMEFILE,xdg-open $USERSCHEMES")
|
||||
out2+=("^sep()")
|
||||
n=1
|
||||
while IFS="|" read -r mbg mbgt mborder tbg tfg tborder normbg nfg sbg sfg sborder sepfg grad scheme_name
|
||||
while IFS="|" read -r mbg mbga mbgt mbgta mborder mbordera tbg tbga tfg tfga tborder tbordera normbg normbga nfg nfga sbg sbga sfg sfga sborder sbordera sepfg sepfga b r p ss ibor irad a al sephal grad scheme_name
|
||||
do
|
||||
((n=n+1))
|
||||
case "$grad" in
|
||||
|
||||
@ -366,8 +366,8 @@ out+=("<big><span fgcolor='${ABGTO}'></span> <span fgcolor='${ABG}'></span
|
||||
out2+=("^sep($THEMES)")
|
||||
out2+=("^sep($MONOCHROMATIC)")
|
||||
out2+=("^sep(<i>$CHOOSE_AND_PICK</i>)")
|
||||
out2+=("<big></big> $LIGHTBG...,obtctl mono pick light")
|
||||
out2+=("<big></big> $DARKBG...,obtctl mono pick dark")
|
||||
out2+=("<big></big> $LIGHTBG...,obtctl mono pick light col")
|
||||
out2+=("<big></big> $DARKBG...,obtctl mono pick dark col")
|
||||
out2+=("^sep(<i>$GENERATEFROMWP</i>)")
|
||||
out2+=("<big><span bgcolor='${w[-2]}' fgcolor='#222222'> <span bgcolor='${w[-4]}'> </span> $LIGHTBG <span bgcolor='${w[-4]}'> </span> </span></big>,w2theme ob light;$me")
|
||||
out2+=("<big><span bgcolor='${w[2]}' fgcolor='#E5E5E5'> <span bgcolor='${w[4]}'> </span> $DARKBG <span bgcolor='${w[4]}'> </span> </span></big>,w2theme ob dark;$me")
|
||||
|
||||
69
bin/jgctl
69
bin/jgctl
@ -335,18 +335,18 @@ savescheme () {
|
||||
# ask for scheme name
|
||||
schemename=$(yad --center --width=300 --borders=20 --window-icon=mbcc --title "$SAVE_AS" --text="$DESC" --entry --entry-label="$LABEL" --entry-text="$NAME") || exit 1
|
||||
|
||||
echo "${1}${schemename}" >> "$HOME/.config/colorizer/menus/userschemes.csv"
|
||||
echo "${1}${schemename}" >> "$HOME/.config/colorizer/menus/userschemes2.csv"
|
||||
}
|
||||
applyscheme () {
|
||||
theme MBcolors
|
||||
line=$(awk 'NR == n' n=$1 "$HOME/.config/colorizer/menus/userschemes.csv")
|
||||
line=$(awk 'NR == n' n=$1 "$HOME/.config/colorizer/menus/userschemes2.csv")
|
||||
#notify-send.sh "$1" "${line}"
|
||||
case "$1" in
|
||||
sys) SCHEMEFILE="/usr/share/mabox-colorizer/colorschemes/menus.csv";;
|
||||
usr) SCHEMEFILE="$HOME/.config/colorizer/menus/userschemes.csv";;
|
||||
usr) SCHEMEFILE="$HOME/.config/colorizer/menus/userschemes2.csv";;
|
||||
esac
|
||||
|
||||
while IFS="|" read -r mbg mbgt mborder tbg tfg tborder normbg nfg sbg sfg sborder sepfg grad scheme_name
|
||||
while IFS="|" read -r mbg mbga mbgt mbgta mborder mbordera tbg tbga tfg tfga tborder tbordera normbg normbga nfg nfga sbg sbga sfg sfga sborder sbordera sepfg sepfga b r p ss ibor irad a al sephal grad scheme_name
|
||||
do
|
||||
mb-setvar jgmenu_theme=MBcolors
|
||||
color_menu_bg "${mbg}"
|
||||
@ -363,18 +363,41 @@ color_sel_border "${sborder}"
|
||||
color_sep_fg "${sepfg}"
|
||||
menu_gradient_pos "${grad}"
|
||||
|
||||
item_border 0
|
||||
color_title_bg 100
|
||||
color_menu_bg 100
|
||||
color_menu_bg_to 100
|
||||
color_norm_bg 0
|
||||
#opacity
|
||||
color_menu_bg "${mbga}"
|
||||
color_menu_bg_to "${mbgta}"
|
||||
color_menu_border "${mbordera}"
|
||||
color_title_bg "${tbga}"
|
||||
color_title_fg "${tfga}"
|
||||
color_title_border "${tbordera}"
|
||||
color_norm_bg "${normbga}"
|
||||
color_norm_fg "${nfga}"
|
||||
color_sel_bg "${sbga}"
|
||||
color_sel_fg "${sfga}"
|
||||
color_sel_border "${sbordera}"
|
||||
color_sep_fg "${sepfga}"
|
||||
|
||||
|
||||
item_border "${ibor}"
|
||||
item_radius "${irad}"
|
||||
sep_halign "${sephal}"
|
||||
|
||||
mb-setvar arrow_string=${a}
|
||||
mb-setvar arrow_string_left=${al}
|
||||
|
||||
# missing: ( from mabox.conf )
|
||||
mb-setvar jgtools_border=${b}
|
||||
mb-setvar jgtools_padding=${p}
|
||||
mb-setvar jgtools_radius=${r}
|
||||
mb-setvar submenu_spacing=${ss}
|
||||
|
||||
|
||||
#notify-send.sh "${scheme_name}" "${mbg}"
|
||||
done < <(awk 'NR == n' n=$2 "$SCHEMEFILE")
|
||||
}
|
||||
|
||||
delscheme() {
|
||||
sed -i ${1}d "$HOME/.config/colorizer/menus/userschemes.csv"
|
||||
sed -i ${1}d "$HOME/.config/colorizer/menus/userschemes2.csv"
|
||||
}
|
||||
mono () {
|
||||
lighten=(0.92 0.8 0.65 0.45 0.28)
|
||||
@ -410,6 +433,7 @@ if [ "$2" == "dark" ];then
|
||||
color_title_bg "${pal[9]}"
|
||||
color_title_border "${pal[9]}"
|
||||
color_title_fg "${pal[2]}"
|
||||
color_norm_bg "${pal[8]}"
|
||||
color_norm_fg "${pal[3]}"
|
||||
color_sel_bg "${pal[6]}"
|
||||
color_sel_fg "${pal[1]}"
|
||||
@ -421,12 +445,31 @@ else #light
|
||||
color_title_bg "${pal[3]}"
|
||||
color_title_border "${pal[4]}"
|
||||
color_title_fg "${pal[10]}"
|
||||
color_norm_bg "${pal[2]}"
|
||||
color_norm_fg "${pal[8]}"
|
||||
color_sel_bg "${pal[4]}"
|
||||
color_sel_fg "${pal[10]}"
|
||||
color_sep_fg "${pal[3]}"
|
||||
fi
|
||||
colorizer-menus -s 2>/dev/null
|
||||
# opacity
|
||||
color_norm_bg 0
|
||||
|
||||
case "$3" in
|
||||
col)colorizer-menus -s 2>/dev/null;;
|
||||
stylemenu) jgwallpaperchanger -s jgmenus;;
|
||||
*):;;
|
||||
esac
|
||||
}
|
||||
randomscheme(){
|
||||
mb-setvar jgmenu_theme=MBcolors
|
||||
themefile=$(find /usr/share/mb-jgtools/jgobthemes/ -type f -name *.colorrc |shuf -n 1)
|
||||
#notify-send.sh "Theme:" "${themefile}"
|
||||
cat ${themefile} > ~/.config/mabox/jgobthemes/MBcolors.colorrc
|
||||
}
|
||||
applyoldscheme(){
|
||||
notify-send.sh "th" "${1}"
|
||||
mb-setvar jgmenu_theme=MBcolors
|
||||
cat ${1} > ~/.config/mabox/jgobthemes/MBcolors.colorrc
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
@ -458,9 +501,11 @@ case "$1" in
|
||||
t_icons)t_icons;;
|
||||
border)border "$2";;
|
||||
padding)padding "$2";;
|
||||
mono) mono "$2" "$3";;
|
||||
mono) mono "$2" "$3" "$4";;
|
||||
savescheme) savescheme "$2";;
|
||||
applyscheme) applyscheme "$2" "$3";;
|
||||
delscheme) delscheme "$2";;
|
||||
randomscheme) randomscheme;;
|
||||
applyoldscheme) applyoldscheme "$2";;
|
||||
*) : ;;
|
||||
esac
|
||||
|
||||
@ -885,7 +885,11 @@ else #light
|
||||
inactivetextcolor "${pal[5]}"
|
||||
fi
|
||||
openbox --reconfigure
|
||||
colorizer-ob -s 2>/dev/null
|
||||
case "$3" in
|
||||
col)colorizer-ob -s 2>/dev/null;;
|
||||
stylemenu)jgwallpaperchanger -s obox;;
|
||||
*):;;
|
||||
esac
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
@ -928,7 +932,7 @@ case "$1" in
|
||||
fontslanttoggle) fontslanttoggle;;
|
||||
randomizer) randomizer;;
|
||||
tweak) tweak "$2";;
|
||||
mono) mono "$2" "$3";;
|
||||
mono) mono "$2" "$3" "$4";;
|
||||
savetheme) savetheme "$2";;
|
||||
applyscheme) applyscheme "$2" "$3";;
|
||||
applytheme) applytheme "$2" "$3";;
|
||||
|
||||
@ -6,7 +6,7 @@ ob () {
|
||||
obtctl randomizer
|
||||
}
|
||||
menu () {
|
||||
mb-setvar jgmenu_theme=$(basename -s .colorrc $(ls ~/.config/mabox/jgobthemes/*.colorrc | shuf -n 1))
|
||||
jgctl randomscheme
|
||||
case "$1" in
|
||||
show) colorizer-menus -s;;
|
||||
*):;;
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
MBG | MBGT |MBORDER| TBG | TFG |TBORDER|NORMBG | NFG | SBG | SFG |SBORDER| SEPFG |GRADIENT|scheme_name
|
||||
#383838|#222222|#eeeeee|#325a52|#d3d4bf|#579c8e|#2b303b|#dadada|#579c8e|#ffffff|#579c8e|#4f4f4f|none|Istredd
|
||||
#1E1E1E|#262626|#333333|#383838|#BBBBBB|#222222|#1e1e1e|#9b9b9b|#000000|#FFCC66|#FFCC66|#363636|right|Jaskier
|
||||
#d3d4bf|#d2cda1|#cdc76d|#cdc76d|#0c1d23|#c6b76b|#d3d4bf|#0c1d23|#a29d62|#060b0a|#c6b76b|#a29d62|top_right|Jaskier Light
|
||||
#38373c|#424247|#2a2a2c|#2a2a2d|#d0d0ce|#151517|#2b303b|#c8c8c4|#59595a|#f8f8f8|#373739|#2a2a2c|bottom_left|GreyBird Dark
|
||||
#ececea|#e0e0de|#d0d0ce|#d0d0ce|#1e1e20|#c0c0be|#2b303b|#1e1e20|#b0b0af|#151517|#c0c0be|#b0b0af|bottom_left|GreyBird Light
|
||||
MBG |op| MBGT |op|MBORDER|op| TBG |op| TFG |op|TBORDER|op|NORMBG |op| NFG |op| SBG |op| SFG |op|SBORDER|op| SEPFG |op|B|R|P|SS|IB|IR|A|AL|SEPHAL|GRADIENT|scheme_name
|
||||
#383838|90|#222222|90|#eeeeee|90|#325a52|100|#d3d4bf|90|#579c8e|40|#383838|0|#dadada|90|#579c8e|90|#ffffff|100|#061307|60|#4f4f4f|30|0|2|8|4|0|3|||center|none|Istredd
|
||||
#383838|90|#222222|90|#eeeeee|90|#325a52|100|#d3d4bf|90|#579c8e|40|#383838|100|#dadada|90|#e8cc2d|70|#0d0d0d|100|#061307|60|#4f4f4f|30|0|2|8|4|0|3|||center|right|Istredd v2
|
||||
#1E1E1E|90|#262626|90|#333333|90|#383838|90|#BBBBBB|90|#222222|90|#1e1e1e|90|#9b9b9b|90|#000000|90|#FFCC66|90|#FFCC66|90|#363636|20|0|2|8|8|0|2|||center|right|Jaskier
|
||||
#d3d4bf|90|#d2cda1|90|#cdc76d|90|#cdc76d|90|#0c1d23|90|#c6b76b|90|#d3d4bf|90|#0c1d23|90|#e8e8dd|100|#060b0a|90|#c6b76b|90|#a29d62|20|0|2|8|8|0|2|||center|top_right|Jaskier Light
|
||||
#38373c|90|#424247|90|#2a2a2c|90|#2a2a2d|90|#d0d0ce|90|#151517|90|#38373c|90|#c8c8c4|90|#59595a|90|#f8f8f8|90|#373739|90|#2a2a2c|20|0|2|8|8|0|2|||center|bottom_left|GreyBird Dark
|
||||
#ececea|90|#e0e0de|90|#d0d0ce|90|#d0d0ce|90|#1e1e20|90|#c0c0be|90|#e0e0de|90|#1e1e20|90|#b0b0af|90|#151517|90|#c0c0be|90|#b0b0af|20|0|2|8|8|0|2|||center|bottom_left|GreyBird Light
|
||||
|
||||
|
@ -5,5 +5,7 @@
|
||||
#D9D9D9|#B6B6B6|#0F0F0F|#BDBBB9|#D9D9D9|#B4B4B4|#656565|#BFBCBB|vertical|left|2|2|1|0|raised|bold|11|Ubuntu Bold|NLIMC|Bold|Normal|Light Grey
|
||||
#CE5C00|#9b4600|#E5E5E5|#CE5C00|#D3D7CF|#B4B4B4|#656565|#BFBCBB|mirrorhorizontal|center|2|2|1|0|raised|dots|11|Noto Sans|NLIMC|Normal|Normal|Orange
|
||||
#F7941E|#004E8F|#E5E5E5|#F7941E|#4a2c09|#00172b|#656565|#4a2c09|mirrorhorizontal|center|4|4|1|0|raised|big-14|13|Ubuntu|NLIMC|Normal|Normal|Sky and Sea
|
||||
#bda9a9|#D3C6C6|#222222|#EBDCDD|#D2C6C5|#D2C6C5|#837B7C|#D2C6C5|mirrorhorizontal|center|4|4|0|6|flat|bold|11|Ubuntu|LIMC|Bold|Normal|BL Boron Light
|
||||
#bda9a9|#D3C6C6|#222222|#EBDCDD|#D2C6C5|#D2C6C5|#837B7C|#D2C6C5|mirrorhorizontal|center|4|4|0|6|sunken|bold|11|Ubuntu|LIMC|Bold|Normal|BL Boron Light
|
||||
#765BAB|#5e478c|#FFFFFF|#242424|#373737|#1e1e1e|#9A9A9A|#373737|solid|center|2|2|4|1|flat|tiny|10|Cantarell|NDSLIMC|Normal|Normal|Lean
|
||||
#0395E2|#02669c|#E5E5E5|#0395E2|#201d29|#09080b|#898989|#201d29|splitvertical|center|4|4|3|1|flat|bold|11|Ubuntu|NLIMC|Bold|Normal|Split Blue
|
||||
#393c47|#75443b|#E5E5E5|#393c47|#201d29|#09080b|#898989|#201d29|mirrorhorizontal|center|2|2|4|4|flat|tiny|8|Ubuntu|NLIMC|Bold|Normal|MirrHor Brown
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user