From 65024255741d08693e9379d613f22d43e964fc1f Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Wed, 27 Sep 2023 15:42:16 +0200 Subject: [PATCH] remove autotheming --- usr/bin/jgdesktops | 79 ++------------------------------------ usr/bin/jgwallpaperchanger | 67 -------------------------------- 2 files changed, 4 insertions(+), 142 deletions(-) diff --git a/usr/bin/jgdesktops b/usr/bin/jgdesktops index 39fc0f4..8452872 100755 --- a/usr/bin/jgdesktops +++ b/usr/bin/jgdesktops @@ -43,19 +43,9 @@ case $LANG in TOOLS="Narzędzia" OBTHEME="Motyw Openbox" MENUPANELS="Menu i Panele" - 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?" YES="Tak" NO="Nie" - YESC="Tak (kliknij aby wyłączyć)" - NOC="Nie (kliknij aby włączyć)" - LIGHTBG="light - jasne tło" - DARKBG="dark - ciemne tło" - ;; + ;; es*) TITLE="Windows & Desktops" REMOVE="Eliminar este menú del panel" @@ -93,18 +83,8 @@ case $LANG in TOOLS="Tools" OBTHEME="Openbox Theme" MENUPANELS="Menus/Panels" - AUTOGEN_THEMES="Auto theming - based on wallp colors" - GENERATETHEMES="Generate themes on wallpaper change?" - GENOB="Colorize Window Decorations?" - GENMENU="Colorize Menus and Panels?" - GENCONKY="Colorize Conky?" - GENPYRADIO="Colorize PyRadio?" YES="Yes" NO="No" - YESC="Yes (click to disable)" - NOC="No (click to enable)" - LIGHTBG="with light background" - DARKBG="with dark background" ;; *) TITLE="Windows & Desktops" @@ -144,18 +124,9 @@ case $LANG in COLORIZER_SETTINGS="Colorizer Settings" OBTHEME="Openbox Theme" MENUPANELS="Menus/Panels" - AUTOGEN_THEMES="Auto theming - based on wallp colors" - GENERATETHEMES="Generate themes on wallpaper change?" - GENOB="Colorize Window Decorations?" - GENMENU="Colorize Menus and Panels?" - GENCONKY="Colorize Conky?" - GENPYRADIO="Colorize PyRadio?" YES="Yes" NO="No" - YESC="Yes (click to disable)" - NOC="No (click to enable)" - LIGHTBG="with light background" - DARKBG="with dark background" + ;; esac @@ -246,12 +217,11 @@ if command -v mcorners &> /dev/null;then fi if command -v cortile &> /dev/null;then if pidof cortile &>/dev/null; then - out+=("󰄲 $CORTILE $RUNNING,cortilectl stop;$me") + out+=("󰄲 $CORTILE $RUNNING,cortilectl stop") else - out+=("󰄱 $CORTILE $STOPPED,cortilectl start;$me") + out+=("󰄱 $CORTILE $STOPPED,cortilectl start") fi fi -[[ "$wall2themes" = "yes" ]] && out+=(" $AUTOGEN_THEMES,^checkout(colsettings)") || out+=(" $AUTOGEN_THEMES,^checkout(colsettings)") # DESKTOP MOUSE ACTIONS lclick=$(xml sel -N a=http://openbox.org/3.4/rc -t -v '/a:openbox_config/a:mouse/a:context[@name="Root"]/a:mousebind[@action="Press"][@button="Left"]/a:action/@name' $HOME/.config/openbox/rc.xml) @@ -272,47 +242,6 @@ out+=("󰸉 $WALLCHANGER,^pipe(jgwallpaperchanger)") out+=("󱇙 $DESKGRID,^pipe(jgdeskgrid)") out+=(" $DESKMNGR,^pipe(jgdeskmngr)") -# COLORIZER_CONF SUBMENU -out2+=("^tag(colsettings)") -out2+=("^sep($GENERATETHEMES)") -[[ "$wall2themes" = "yes" ]] && out2+=(" $YESC,mb-setvar wall2themes=no $COLORIZER_CONF;$me") || out2+=(" $NOC,mb-setvar wall2themes=yes $COLORIZER_CONF;$me") - -out2+=("^sep()") - -out2+=("$OBTHEME [ ${wall2themes_ob} ],^checkout(ob)") -out3+=("^tag(ob)") -out3+=("^sep($GENOB)") -out3+=("$NO,mb-setvar wall2themes_ob=none $COLORIZER_CONF;$me") -out3+=("^sep()") -out3+=("$LIGHTBG,mb-setvar wall2themes_ob=light $COLORIZER_CONF;$me") -out3+=("$DARKBG,mb-setvar wall2themes_ob=dark $COLORIZER_CONF;$me") - - -out2+=("$MENUPANELS [ ${wall2themes_menu} ],^checkout(mp)") -out3+=("^tag(mp)") -out3+=("^sep($GENMENU)") -out3+=("$NO,mb-setvar wall2themes_menu=none $COLORIZER_CONF;$me") -out3+=("^sep()") -out3+=("$LIGHTBG,mb-setvar wall2themes_menu=light $COLORIZER_CONF;$me") -out3+=("$DARKBG,mb-setvar wall2themes_menu=dark $COLORIZER_CONF;$me") - - -out2+=("Conky [ ${wall2themes_conky} ],^checkout(conky)") -out3+=("^tag(conky)") -out3+=("^sep($GENCONKY)") -out3+=("$NO,mb-setvar wall2themes_conky=none $COLORIZER_CONF;$me") -out3+=("^sep()") -out3+=("$LIGHTBG,mb-setvar wall2themes_conky=light $COLORIZER_CONF;$me") -out3+=("$DARKBG,mb-setvar wall2themes_conky=dark $COLORIZER_CONF;$me") - - -out2+=("PyRadio [ ${wall2themes_pyradio} ],^checkout(pyradio)") -out3+=("^tag(pyradio)") -out3+=("^sep($GENPYRADIO)") -out3+=("$NO,mb-setvar wall2themes_pyradio=none $COLORIZER_CONF;$me") -out3+=("^sep()") -out3+=("$LIGHTBG,mb-setvar wall2themes_pyradio=light $COLORIZER_CONF;$me") -out3+=("$DARKBG,mb-setvar wall2themes_pyradio=dark $COLORIZER_CONF;$me") #out+=(". ~/.config/mabox/jgdesktops-bottom.csv") diff --git a/usr/bin/jgwallpaperchanger b/usr/bin/jgwallpaperchanger index f4d9d16..4457136 100755 --- a/usr/bin/jgwallpaperchanger +++ b/usr/bin/jgwallpaperchanger @@ -77,18 +77,6 @@ case $LANG in LEFTPANEL="Lewy panel" OBTHEME="Motyw Openbox" MENUPANELS="Menu i Panele" - 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?" - YES="Tak" - NO="Nie" - YESC="Tak (kliknij aby wyłączyć)" - NOC="Nie (kliknij aby włączyć)" - LIGHTBG="light - jasne tło" - DARKBG="dark - ciemne tło" COLORIZER_HELP="Okno główne i Pomoc" COLORIZER_ROOT="Colorizer menu główne" COLORIZER_FONTS="Konfiguruj Czcionki" @@ -123,18 +111,6 @@ case $LANG in LEFTPANEL="Left panel" OBTHEME="Openbox Theme" MENUPANELS="Menus/Panels" - AUTOGEN_THEMES="Auto theming" - GENERATETHEMES="Generate themes on wallpaper change?" - GENOB="Colorize Window Decorations?" - GENMENU="Colorize Menus and Panels?" - GENCONKY="Colorize Conky?" - GENPYRADIO="Colorize PyRadio?" - YES="Yes" - NO="No" - YESC="Yes (click to disable)" - NOC="No (click to enable)" - LIGHTBG="with light background" - DARKBG="with dark background" COLORIZER_HELP="Main Window and Help" COLORIZER_ROOT="Colorizer rootmenu" COLORIZER_FONTS="Configure Fonts" @@ -188,47 +164,6 @@ out2+=("^tag(interval)") for i in 3 5 10 30 60 120 300 600 1800 3600; do out2+=("$(printf " %4s,%s" "$i" "mb-setvar interval=${i} $CONF_FILE;$me")");done -# COLORIZER_CONF SUBMENU -out1+=("^tag(colsettings2)") -out1+=("^sep($GENERATETHEMES)") -[[ "$wall2themes" = "yes" ]] && out1+=(" $YESC,mb-setvar wall2themes=no $COLORIZER_CONF;$me") || out1+=(" $NOC,mb-setvar wall2themes=yes $COLORIZER_CONF;$me") - -out1+=("^sep()") - -out1+=("$OBTHEME [ ${wall2themes_ob} ],^checkout(ob2)") -out2+=("^tag(ob2)") -out2+=("^sep($GENOB)") -out2+=("$NO,mb-setvar wall2themes_ob=none $COLORIZER_CONF;$me") -out2+=("^sep()") -out2+=("$LIGHTBG,mb-setvar wall2themes_ob=light $COLORIZER_CONF;$me") -out2+=("$DARKBG,mb-setvar wall2themes_ob=dark $COLORIZER_CONF;$me") - - -out1+=("$MENUPANELS [ ${wall2themes_menu} ],^checkout(mp2)") -out2+=("^tag(mp2)") -out2+=("^sep($GENMENU)") -out2+=("$NO,mb-setvar wall2themes_menu=none $COLORIZER_CONF;$me") -out2+=("^sep()") -out2+=("$LIGHTBG,mb-setvar wall2themes_menu=light $COLORIZER_CONF;$me") -out2+=("$DARKBG,mb-setvar wall2themes_menu=dark $COLORIZER_CONF;$me") - - -out1+=("Conky [ ${wall2themes_conky} ],^checkout(conky2)") -out2+=("^tag(conky2)") -out2+=("^sep($GENCONKY)") -out2+=("$NO,mb-setvar wall2themes_conky=none $COLORIZER_CONF;$me") -out2+=("^sep()") -out2+=("$LIGHTBG,mb-setvar wall2themes_conky=light $COLORIZER_CONF;$me") -out2+=("$DARKBG,mb-setvar wall2themes_conky=dark $COLORIZER_CONF;$me") - - -out1+=("PyRadio [ ${wall2themes_pyradio} ],^checkout(pyradio2)") -out2+=("^tag(pyradio2)") -out2+=("^sep($GENPYRADIO)") -out2+=("$NO,mb-setvar wall2themes_pyradio=none $COLORIZER_CONF;$me") -out2+=("^sep()") -out2+=("$LIGHTBG,mb-setvar wall2themes_pyradio=light $COLORIZER_CONF;$me") -out2+=("$DARKBG,mb-setvar wall2themes_pyradio=dark $COLORIZER_CONF;$me") ### RUN if [[ $1 == "-s" || $1 == "-c" || $1 == "-u" || $1 == "ipc" ]]; then @@ -252,8 +187,6 @@ case "$1" in out+=("$COLORIZER_PYRADIO,colorizer-pyradio -s") out+=("$COLORIZER_CAVA,colorizer-cava -s") out+=("^sep()") - [[ "$wall2themes" = "yes" ]] && out+=(" $AUTOGEN_THEMES,^checkout(colsettings2)") || out+=(" $AUTOGEN_THEMES,^checkout(colsettings2)") - out+=("^sep()") [[ "$t2_button_lclick_action" == "random" ]] && out+=("$B_LC_ACTION: [ $RAND ],^checkout(laction)") || out+=("$B_LC_ACTION: [ $CHOOSE ],^checkout(laction)") out2+=("^tag(laction)")