master 0.9.16
Daniel Napora 2022-12-23 13:48:01 +01:00
parent 53748b45d0
commit af889291cf
6 changed files with 90 additions and 23 deletions

View File

@ -25,6 +25,8 @@ if [ ! -f $CNF_FILE ]; then
cat <<EOF > ${CNF_FILE}
# Autogenerate color themes on wallpaper change? yes or no
wall2themes=no
# OB window decoration preferred color style: dark, light or none
wall2themes_ob=light
# conky preffered bg color dark, light or none (none = not generate/change colorscheme)
wall2themes_conky=dark
# Menu prefferred bg color dark, light or none (not generate/change colorscheme)
@ -104,6 +106,7 @@ case "$LANG" in
COLORIZER_SETTINGS="Ustawienia Colorizera"
AUTOGEN_THEMES="Autogenerowanie motywów?"
GENERATETHEMES="Generować motywy po zmianie tapety?"
GENOB="Pokolorować Dekoracje Okien?"
GENMENU="Pokolorować menu i panele?"
GENCONKY="Pokolorować Conky?"
GENPYRADIO="Pokolorować PyRadio?"
@ -196,6 +199,7 @@ case "$LANG" in
COLORIZER_SETTINGS="Colorizer Settings"
AUTOGEN_THEMES="Autogenerate themes?"
GENERATETHEMES="Generate themes on wallpaper change?"
GENOB="Colorize Window Decorations?"
GENMENU="Colorize Menus and Panels?"
GENCONKY="Colorize Conky?"
GENPYRADIO="Colorize PyRadio?"
@ -543,6 +547,16 @@ out3+=("^sep($GENERATETHEMES)")
out3+=("$YES,mb-setvar wall2themes=yes $CNF_FILE;colorizer -s")
out3+=("$NO,mb-setvar wall2themes=no $CNF_FILE;colorizer -s")
out2+=("^sep()")
out2+=("$OBTHEME [ <b>${wall2themes_ob}</b> ],^checkout(ob)")
out3+=("^tag(ob)")
out3+=("^sep($GENOB)")
out3+=("$NO,mb-setvar wall2themes_ob=none $CNF_FILE;colorizer -s")
out3+=("^sep()")
out3+=("$LIGHTBG,mb-setvar wall2themes_ob=light $CNF_FILE;colorizer -s")
out3+=("$DARKBG,mb-setvar wall2themes_ob=dark $CNF_FILE;colorizer -s")
out2+=("$MENUPANELS [ <b>${wall2themes_menu}</b> ],^checkout(mp)")
out3+=("^tag(mp)")
out3+=("^sep($GENMENU)")
@ -550,7 +564,7 @@ out3+=("$NO,mb-setvar wall2themes_menu=none $CNF_FILE;colorizer -s")
out3+=("^sep()")
out3+=("$LIGHTBG,mb-setvar wall2themes_menu=light $CNF_FILE;colorizer -s")
out3+=("$DARKBG,mb-setvar wall2themes_menu=dark $CNF_FILE;colorizer -s")
out2+=("^sep()")
out2+=("Conky [ <b>${wall2themes_conky}</b> ],^checkout(conky)")
out3+=("^tag(conky)")
@ -565,7 +579,7 @@ out3+=("$DARKBG,mb-setvar wall2themes_conky=dark $CNF_FILE;colorizer -s")
#out3+=("$YES,mb-setvar conky_diff_colors=yes $CNF_FILE;colorizer -s")
#out3+=("$NO,mb-setvar conky_diff_colors=no $CNF_FILE;colorizer -s")
out2+=("^sep()")
out2+=("PyRadio [ <b>${wall2themes_pyradio}</b> ],^checkout(pyradio)")
out3+=("^tag(pyradio)")
out3+=("^sep($GENPYRADIO)")

View File

@ -22,6 +22,9 @@ me="colorizer-ob -s"
case "$LANG" in
pl*)
OBTHEME_LBL="Motyw OpenBox"
GENERATEFROMWP="Generuj z kolorów tapety..."
LIGHTBG="Jasne tło"
DARKBG="Ciemne tło"
TITLEBAR="Pasek tytułowy"
ACTIVE_BG="Tło aktywnego okna"
INACTIVE_BG="Tło nieaktywnego okna"
@ -74,6 +77,9 @@ case "$LANG" in
;;
*)
OBTHEME_LBL="OpenBox theme"
GENERATEFROMWP="Generate from wallpaper colors..."
LIGHTBG="Light Background"
DARKBG="Dark Background"
TITLEBAR="Title Bar"
ACTIVE_BG="Active Background"
INACTIVE_BG="Inactive Background"
@ -183,6 +189,9 @@ getvalues () {
getvalues
out+=("^sep($OBTHEME_LBL: <i>$OBTHEME</i>)")
out+=("^sep(<i>$GENERATEFROMWP</i>)")
out+=("$LIGHTBG,w2theme pyradio light;$me")
out+=("$DARKBG,w2theme pyradio dark;$me")
out+=("^sep($TITLEBAR)")
out+=("<tt><span bgcolor='$ABG'> </span></tt> $ACTIVE_BG,^pipe(mbclr '$ABG' obtctl clractivebg '${ACTIVE_BG}' '$me')")
[[ ! -z "$ABGTO" ]] && out+=("<tt><span bgcolor='$ABG'> </span><span bgcolor='$ABGTO'> </span></tt> $ACTIVE_BG_TO,^pipe(mbclr '$ABGTO' obtctl clractivebgto '${ACTIVE_BG_TO}' '$me')")

View File

@ -67,7 +67,7 @@ read MB1 MB2 MBFG<<< "$(grep '^Messages Border ' ${THEMERC})"
out+=("^sep($COLORIZE_PYRADIO)")
#out+=("$START_PYRADIO,terminator --geometry=420x440-20-20 -e pyradio")
out+=("$INFO,notify-send.sh -i music '$INFO_HEAD' '$INFO_TXT' -t 20000")
out+=("^sep($GENERATEFROMWP)")
out+=("^sep(<i>$GENERATEFROMWP</i>)")
out+=("$LIGHTBG,w2theme pyradio light;$me")
out+=("$DARKBG,w2theme pyradio dark;$me")
out+=("^sep($SETCOLORS)")

View File

@ -273,18 +273,12 @@ colorize () {
*) : ;;
esac
# Openbox (TUTAJ WARUNEK)
obtctl clractivebg ${w[3]}
TITLE_FG=$(pastel textcolor ${w[3]}|pastel format hex)
if [[ "$TITLE_FG" == *"ffffff"* ]];then
obtctl activetextcolor ${w[-1]}
obtctl activebuttonscolors ${w[-1]}
else
obtctl activetextcolor ${w[0]}
obtctl activebuttonscolors ${w[0]}
fi
obtctl clractivebgto ${w[4]}
obtctl clrnormalbg ${w[0]}
obtctl clrnormalbgto "$(pastel darken 0.1 "${w[0]}"|pastel format hex)"
case "$wall2themes_ob" in
dark) obtheme dark;;
light) obtheme light;;
*) : ;;
esac
# PYRADIO THEME
case "$wall2themes_pyradio" in
dark) pyradio_theme dark;;
@ -322,10 +316,11 @@ reverse () {
*) : ;;
esac
# Openbox (TUTAJ WARUNEK)
obtctl clractivebg ${w[3]}
obtctl clractivebgto ${w[4]}
obtctl clrnormalbg ${w[0]}
obtctl clrnormalbgto "$(pastel darken 0.1 "${w[0]}"|pastel format hex)"
case "$wall2themes_ob" in
dark) obtheme light;;
light) obtheme dark;;
*) : ;;
esac
# PYRADIO THEME
case "$wall2themes_pyradio" in
dark) pyradio_theme light;;

View File

@ -409,7 +409,7 @@ You can add <strong>your own commands</strong> to each Conky, which will be show
</div>
</div>
<div class="w3-row w3-margin-top">
<div class="w3-row">
<div class="w3-third">
<div class="w3-card w3-round w3-padding w3-dark-grey"><span class="w3-right w3-xxlarge"></span>
<p><br /><strong>Window decorations</strong></p>
@ -457,10 +457,35 @@ You can add <strong>your own commands</strong> to each Conky, which will be show
</div>
</div>
</div>
<div class="w3-row w3-margin-top">
<div class="w3-twothird">
<br /><br />
<p>When playing with Colorizer for a long time, music can be a good companion</p>
<p>You can turn on <strong>PyRadio</strong> <kbd>super</kbd>+<kbd>r</kbd> and listen to nice music.<br /><em>Chillout?</em></p>
</div>
<div class="w3-third">
<div class="w3-card w3-round w3-padding w3-teal"><span class="w3-right w3-xxlarge"></span>
<p><br /><strong>PyRadio</strong></p>
<div class="w3-bar-block w3-grey">
<a class="w3-button w3-bar-item w3-tiny" href="run://w2theme pyradio dark">Dark</a>
<a class="w3-button w3-bar-item w3-tiny" href="run://w2theme pyradio light">Bright</a>
</div>
<div class="w3-bar-block w3-grey" style="margin-top:1px;">
<a class="w3-button w3-bar-item w3-tiny w3-hover-green" href="run://colorizer-pyradio -s"><span class="w3-right w3-large"></span> Customize</a>
</div>
<div class="w3-bar-block w3-grey" style="margin-top:1px;">
<a class="w3-button w3-bar-item w3-tiny w3-hover-red" href="run://prtctl resettheme"><span class="w3-right w3-large"></span >Reset</a>
</div>
</div>
</div>
</div>
<br />
<h4>Automatic generation of themes after changing wallpaper</h4>
<p><em>(Experimental)</em></p>
<p>You can set the theme to auto-generate when you change wallpaper.<br /> Use <a class="w3-tag w3-round w3-green w3-small w3-hover-yellow" href="run: //colorizer -s"> Colorizer -> Settings</a> or <a class="w3-tag w3-round w3-green w3-small w3-hover-yellow" href="config://.config/ colorizer/colorizer.conf"> edit configuration file</a> to configure this feature.</p>
<p>You can set the theme to auto-generate when you change wallpaper.<br /> Use <a class="w3-tag w3-round w3-green w3-small w3-hover-yellow" href="run://colorizer -s"> Colorizer -> Settings</a> or <a class="w3-tag w3-round w3-green w3-small w3-hover-yellow" href="config://.config/colorizer/colorizer.conf"> edit configuration file</a> to configure this feature.</p>
<br /><br />
</section>

View File

@ -136,7 +136,7 @@ kbd {
<div class="w3-row w3-margin-top">
<div class="w3-twothird">
<p>Colorizer generuje paletę kolorów na bazie aktualnie ustawionej tapety.</p>
<p>Colorizer generuje paletę kolorów na bazie aktualnie ustawionej tapety</p>
<p>Na bazie takiej palety kolorów możliwe jest zastosowanie dwóch wersji motywów (ciemny i jasny) dla:
<ul>
<li>dekoracji okien OpenBox</li>
@ -160,7 +160,7 @@ kbd {
</div>
</div>
<div class="w3-row w3-margin-top">
<div class="w3-row">
<div class="w3-third">
<div class="w3-card w3-round w3-padding w3-dark-grey"><span class="w3-right w3-xxlarge"></span>
<p><br /><strong>Dekoracje okien</strong></p>
@ -208,6 +208,30 @@ kbd {
</div>
</div>
</div>
<div class="w3-row w3-margin-top">
<div class="w3-twothird">
<br /><br />
<p>Podczas dłuższej zabawy Colorizerem, dobrym kompanem może być muzyka</p>
<p>Możesz włączyć <strong>PyRadio</strong> <kbd>super</kbd>+<kbd>r</kbd> i posłuchać przyjemnej muzyki<br /><em>Polecam Chillout ;)</em></p>
</div>
<div class="w3-third">
<div class="w3-card w3-round w3-padding w3-teal"><span class="w3-right w3-xxlarge"></span>
<p><br /><strong>PyRadio</strong></p>
<div class="w3-bar-block w3-grey">
<a class="w3-button w3-bar-item w3-tiny" href="run://w2theme pyradio dark">Ciemne</a>
<a class="w3-button w3-bar-item w3-tiny" href="run://w2theme pyradio light">Jasne</a>
</div>
<div class="w3-bar-block w3-grey" style="margin-top:1px;">
<a class="w3-button w3-bar-item w3-tiny w3-hover-green" href="run://colorizer-pyradio -s"><span class="w3-right w3-large"></span> Dostosuj</a>
</div>
<div class="w3-bar-block w3-grey" style="margin-top:1px;">
<a class="w3-button w3-bar-item w3-tiny w3-hover-red" href="run://prtctl resettheme"><span class="w3-right w3-large"></span>Resetuj</a>
</div>
</div>
</div>
</div>
<br />
<h4>Automatyczne generowanie motywów po zmianie tapety</h4>
<p><em>(Eksperymentalne)</em></p>