From bff8c4d39bf9b3c40137483f2cc2a5878e25b85f Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Mon, 19 Sep 2022 20:59:26 +0200 Subject: [PATCH] massive update :) --- bin/checkupdates.sh | 2 +- bin/colorizer | 219 ++++++++++++-- bin/colorizer-menus | 23 +- bin/colorizer-ob | 59 +++- bin/conkyctl | 50 ++++ bin/jgctl | 41 ++- bin/mbclr | 44 +-- bin/mbgrad | 117 ++++++++ bin/obtctl | 83 ++++-- bin/w2theme | 120 ++++++-- share/mabox-colorizer/gradients_all.inc | 362 ++++++++++++++++++++++++ share/mabox-colorizer/help/en.html | 29 +- share/mabox-colorizer/help/pl.html | 122 ++++---- 13 files changed, 1094 insertions(+), 177 deletions(-) create mode 100755 bin/mbgrad create mode 100644 share/mabox-colorizer/gradients_all.inc diff --git a/bin/checkupdates.sh b/bin/checkupdates.sh index c41d1eb..ff6d511 100755 --- a/bin/checkupdates.sh +++ b/bin/checkupdates.sh @@ -52,7 +52,7 @@ if [ -f /tmp/"$CONKYPID" ]; then PKGS=$(pamac checkupdates -aq| wc -l) if [ "$PKGS" != "0" ]; then if [[ "$update_notifications" == "true" ]];then - notify-send.sh -t 30000 -i mbcc "$AVAIL_UPDATES" "$PKGS_TO_UPDATE $PKGS" -o "$YAY_UPD:terminator -T '$YAY_UPD' -e yay" \ + notify-send.sh -t 0 -i mbcc "$AVAIL_UPDATES" "$PKGS_TO_UPDATE $PKGS" -o "$YAY_UPD:terminator -T '$YAY_UPD' -e yay" \ -o "$PAMAC_UPD:pamac-manager --updates" -o "$DISABLE:mb-setvar update_notifications=false ${CNF_FILE}" fi printf "\${font}\${alignr} $AVAIL_UPDATES: \${color red}" diff --git a/bin/colorizer b/bin/colorizer index c827d1f..8492f97 100755 --- a/bin/colorizer +++ b/bin/colorizer @@ -1,5 +1,20 @@ #!/bin/bash - +# +# colorizer - set of tools for Mabox theming +# Copyright (C) 2022 Daniel Napora +# +# 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 +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . CNF_DIR="$HOME/.config/colorizer" mkdir -p "$CNF_DIR" @@ -23,7 +38,17 @@ user_wallpapers_dir=~/wallpapers # Show related tools (show or hide) related_tools=hide # Colorizer size: full or compact -colorizer_size=compact +colorizer_size=full +# Action for rootmenucolors: accent or select +rootcolors=accent +# Different colors for each/some Conkys: yes or no +conky_diff_colors=yes +# Gradients: change openbox theme? (active window titlebar) +gradient_obtheme=yes +# Gradients: change menu/panels background? +gradient_menu=yes +# Gradients: change Conky bg colors based on gradient +gradient_conkies=no EOF # Copy new nitrogen wrapper cp -a /usr/share/mabox/common/wrappers/nitrogen ~/.local/bin/ @@ -33,7 +58,7 @@ source "$CNF_FILE" case "$LANG" in pl*) - REGENERATE="Regeneruj..." + REGENERATE="(Re)Generuj..." REGENERATEALL="Regeneruj wszystko" ASCONFIGURED="wg konfiguracji" REVERSE="odwrotnie" @@ -43,12 +68,39 @@ case "$LANG" in MENUPANELS="Menu i Panele" TERMINALTHEME="Motyw terminala" WALLCOLORS="Kolory z tapety" - ACCENTINFO="ustaw kolor akcentu" + ACCENTINFO="ustaw kolor akcentu..." + SELECT_ACTION="wybierz działanie..." + COLOR="Kolor" + SETACCENT="Ustaw kolor akcentu" + ACTIVE_WIN="aktywne okno..." + OB_ACTIVE_BG="Tło paska tytułowego" + OB_ACTIVE_BGTO="Tło paska tytułowego 2 (dla gradientu)" + OB_ACTIVE_TEXT="Tytuł aktywnego okna" + OB_ACTIVE_BORDER="Obramowanie" + INACTIVE_WIN="nieaktywne okno..." + OB_INACTIVE_BG="Tło paska tytułowego" + OB_INACTIVE_BGTO="Tło paska tytułowego 2 (dla gradientu)" + OB_INACTIVE_TEXT="Tytuł nieaktywnego okna" + OB_INACTIVE_BORDER="Obramowanie" + CONKY_BGCOLOR_ALL="Kolor tła (wszystkie)" + RUNNING_CONKYS="działające Conky..." + BGCOLOR_OF="Kolor tła dla" + MENU_BGCOLOR="Kolor tła menu" + MENU_SEP_BG="Kolor tła separatora/nagłówka" + MENU_ACTIVE_BG="Kolor aktywnej pozycji (akcent)" + MENU_ITEM_FG="Kolor elementu menu" + MENU_BORDER="Kolor obramowania menu" + ACCENT_COLORS="Popularne kolory akcentu" EDIT_PALETTE="Edytuj paletę kolorów" RANDWALL="Ustaw losową tapetę" SYSWALLPAPER="Tapety systemowe" USERWALLPAPER="Tapety użytkownika" + GRADIENTS="Gradienty" + PRE_GRADIENTS="Gotowe Gradienty" + GRAD_OB="Stosować do motywu OpenBox?" + GRAD_MENU="Stosować do Menu/Paneli?" + GRAD_CONKY="Stosować do Conky?" SETTINGS_AND_HELP="Pomoc i Ustawienia" SETTINGS="Ustawienia" COLORIZER_SETTINGS="Ustawienia Colorizera" @@ -84,10 +136,14 @@ case "$LANG" in CHANGE="Zmień" USERDIR_NOT_EXIST="kalalog nie istnieje" CREATE_USERDIR="Utwórz katalog" + ROOTMENU_COLORS_ACTION="Akcja dla kolorów w menu głównym" + ACCENT="accent - zmień kolor akcentu" + SELECT="select - wybierz akcję..." + DIFF_CONKY_COLORS="Różne kolory dla Conky" HELP="Pomoc" ;; *) - REGENERATE="Regenerate..." + REGENERATE="(Re)Generate..." REGENERATEALL="Regenerate all" ASCONFIGURED="as configured" REVERSE="reverse" @@ -98,11 +154,37 @@ case "$LANG" in TERMINALTHEME="Terminal color scheme" WALLCOLORS="Wallpaper Colors" ACCENTINFO="click to set accent color" + SELECT_ACTION="select action..." + COLOR="Color" + SETACCENT="Set accent color" + ACTIVE_WIN="active window..." + OB_ACTIVE_BG="Background" + OB_ACTIVE_BGTO="Background 2 (for gradients)" + OB_ACTIVE_TEXT="Title text color" + OB_ACTIVE_BORDER="Border" + INACTIVE_WIN="inactive window..." + OB_INACTIVE_BG="Background" + OB_INACTIVE_BGTO="Background 2 (for gradients)" + OB_INACTIVE_TEXT="Title text color" + OB_INACTIVE_BORDER="Border" + CONKY_BGCOLOR_ALL="Background color (all)" + RUNNING_CONKYS="running Conkys..." + BGCOLOR_OF="Background color for" + MENU_BGCOLOR="Menu Background" + MENU_SEP_BG="Separator/Title Background" + MENU_ACTIVE_BG="Active item Background (accent)" + MENU_ITEM_FG="Item Foreground" + MENU_BORDER="Menu Border Color" ACCENT_COLORS="Popular accent colors" EDIT_PALETTE="Edit color palette" RANDWALL="Set random wallpaper" SYSWALLPAPER="System Wallpapers" USERWALLPAPER="User Wallpapers" + GRADIENTS="Gradients" + PRE_GRADIENTS="Gradients" + GRAD_OB="Apply to OpenBox theme?" + GRAD_MENU="Apply to Menu/Panels?" + GRAD_CONKY="Apply to Conkies?" SETTINGS_AND_HELP="Settings and Help" SETTINGS="Settings" COLORIZER_SETTINGS="Colorizer Settings" @@ -138,6 +220,10 @@ case "$LANG" in CHANGE="Change" USERDIR_NOT_EXIST="directory does not exist" CREATE_USERDIR="Create directory" + ROOTMENU_COLORS_ACTION="Rootmenu Colors Action" + ACCENT="accent - chenge accent color" + SELECT="select - select action" + DIFF_CONKY_COLORS="Different colors for each Conky" HELP="About and Help" ;; esac @@ -178,38 +264,88 @@ out+=(" $REGENERATE,^checkout(regen)") out2+=("^sep($REGENERATEALL)") out2+=(" $ASCONFIGURED,w2theme colorize;colorizer -s") out2+=(" $REVERSE,w2theme reverse;colorizer -s") - out2+=("^sep($CURRENTCONF)") - out2+=("$MENUPANELS [ ${wall2themes_menu} ],^checkout(mp)") - out2+=("Conky [ ${wall2themes_conky} ],^checkout(conky)") - out2+=("PyRadio [ ${wall2themes_pyradio} ],^checkout(pyradio)") + #out2+=("^sep($CURRENTCONF)") + #out2+=("$MENUPANELS [ ${wall2themes_menu} ],^checkout(mp)") + #out2+=("Conky [ ${wall2themes_conky} ],^checkout(conky)") + #out2+=("PyRadio [ ${wall2themes_pyradio} ],^checkout(pyradio)") out+=("^sep($MODULES)") out+=("$OBTHEME,^pipe(colorizer-ob)") +out+=("Conky,^pipe(colorizer-conky)") out+=("$MENUPANELS,^pipe(colorizer-menus)") #out+=("TINT2,^pipe(colorizer-tint2)") -out+=("Conky,^pipe(colorizer-conky)") #out+=("Systray HW monitor,^pipe(colorizer-phwmon)") -out+=("^sep()") -out+=("PyRadio,^pipe(colorizer-pyradio)") -#out+=("GTKTHEME,^pipe(colorizer-gtktheme)") + +if pgrep -f pyradio >/dev/null ;then + out+=("^sep()") + out+=("PyRadio,^pipe(colorizer-pyradio)") +fi + out+=("^sep($WALLCOLORS)") -out+=("^sep($ACCENTINFO)") +[[ $rootcolors = select ]]&& out+=("^sep($SELECT_ACTION)")||out+=("^sep($ACCENTINFO)") +n=0 for i in "${w[@]}" do -out+=("$i ,w2theme accent '${i}';colorizer -s") +if [ $rootcolors = select ];then +((n+=1)) +out+=("$i ,^checkout(${i:1}${n}") +out2+=("^tag(${i:1}${n})") +out2+=("^sep($COLOR $i )") +out2+=("$SETACCENT,w2theme accent '${i}';colorizer -s") +out2+=("^sep(OpenBox)") +out2+=("^sep($ACTIVE_WIN)") +out2+=("$OB_ACTIVE_BG,obtctl clractivebg '${i}';colorizer -s") +out2+=("$OB_ACTIVE_BGTO,obtctl clractivebgto '${i}';colorizer -s") +out2+=("$OB_ACTIVE_TEXT,obtctl activetextcolor '${i}';colorizer -s") +out2+=("$OB_ACTIVE_BORDER,obtctl activeborderColor '${i}';colorizer -s") +out2+=("^sep($INACTIVE_WIN)") +out2+=("$OB_INACTIVE_BG,obtctl clrnormalbg '${i}';colorizer -s") +out2+=("$OB_INACTIVE_BGTO,obtctl clrnormalbgto '${i}';colorizer -s") +out2+=("$OB_INACTIVE_TEXT,obtctl inactivetextcolor '${i}';colorizer -s") +out2+=("$OB_INACTIVE_BORDER,obtctl inactiveborderColor '${i}';colorizer -s") + +out2+=("^sep($MENUPANELS)") +out2+=("$MENU_BGCOLOR,jgctl color_menu_bg '${i}';colorizer -s") +out2+=("$MENU_SEP_BG,jgctl color_title_bg '${i}';colorizer -s") +out2+=("$MENU_ITEM_FG,jgctl color_norm_fg '${i}';colorizer -s") +out2+=("$MENU_ACTIVE_BG,jgctl color_sel_bg '${i}';colorizer -s") +out2+=("$MENU_BORDER,jgctl color_menu_border '${i}';colorizer -s") + +out2+=("^sep(Conky)") +out2+=("$CONKY_BGCOLOR_ALL,conkyctl win_bgcolor_all '${i}';colorizer -s") + # array with running conkies - only filenames with full path + readarray -t running < <(pgrep -af "conky.*mbcolor" | cut -d' ' -f4) + +if [[ ${#running[@]} > 0 ]];then + out2+=("^sep($RUNNING_CONKYS)") + for c in ${running[@]};do + filename=${c##*/} + name=${filename%%_mb*} + title=${name//_/ } + out2+=("$BGCOLOR_OF ${title^},conkyctl win_bgcolor '${i}' '${c}';colorizer -s") + done +fi + +else + out+=("$i ,w2theme accent '${i}';colorizer -s") +fi + done out+=("^sep()") out+=("$ACCENT_COLORS,^checkout(acccolors)") out2+=("^tag(acccolors)") out2+=("^sep(Ubuntu)") -for i in ${ubuntu[@]};do out2+=("$i ,w2theme accent '${i}';colorizer -s");done +for i in ${ubuntu[@]};do out2+=("$i ,w2theme accent '${i}';colorizer -s");done out2+=("^sep(Mint)") -for i in ${mint[@]};do out2+=("$i ,w2theme accent '${i}';colorizer -s");done +for i in ${mint[@]};do out2+=("$i ,w2theme accent '${i}';colorizer -s");done out2+=("^sep(Plasma)") -for i in ${plasma[@]};do out2+=("$i ,w2theme accent '${i}';colorizer -s");done +for i in ${plasma[@]};do out2+=("$i ,w2theme accent '${i}';colorizer -s");done -out+=("^sep()") -out+=(" $EDIT_PALETTE,xdg-open $WALLPALDIR/$WALLPAPER.clr") +### TODO Rework below as submenu(edit palette and present palette with HTML helper- to keep it on desktop, allowing to copy colors from it) +##out+=("^sep()") +##out+=(" $EDIT_PALETTE,xdg-open $WALLPALDIR/$WALLPAPER.clr") + +# Przerobić na submenu if [[ "$wall2themes" == "yes" ]];then out+=("^sep($RANDWALL)") syswallp=$(shopt -s nullglob ; set -- /usr/share/backgrounds/*.{jpg,JPG,jpeg,JPEG,png,PNG} ; echo $#) @@ -218,6 +354,12 @@ if [[ -d "${user_wallpapers_dir}" ]]; then userwallp=$(shopt -s nullglob ; set -- $user_wallpapers_dir/*.{jpg,JPG,jpeg,JPEG,png,PNG} ; echo $#) out+=(" $USERWALLPAPER (${userwallp}),nitrogen --random ${user_wallpapers_dir} --set-scaled --save;colorizer -s") fi +out+=("^sep()") +out+=("$WALLPAPERS,^checkout(wallpapersettings)") +fi +if [[ "$gradient_obtheme" == "yes" || "$gradient_menu" == "yes" || "gradient_conkies" == "yes" ]];then +out+=("^sep($GRADIENTS)") +out+=("$PRE_GRADIENTS,^pipe(mbgrad)") fi if [[ "$related_tools" == "show" ]];then @@ -242,6 +384,11 @@ out3+=("^tag(csize)") out3+=("^sep($HEIGHT)") out3+=("$FULL,mb-setvar colorizer_size=full $CNF_FILE;colorizer -s") out3+=("$COMPACT,mb-setvar colorizer_size=compact $CNF_FILE;colorizer -s") +out2+=("$ROOTMENU_COLORS_ACTION [ $rootcolors ],^checkout(rootcolors)") +out3+=("^tag(rootcolors)") +out3+=("^sep($ROOTMENU_COLORS_ACTION)") +out3+=("$ACCENT,mb-setvar rootcolors=accent $CNF_FILE;colorizer -s") +out3+=("$SELECT,mb-setvar rootcolors=select $CNF_FILE;colorizer -s") out2+=("^sep($AUTOGEN_THEMES)") out2+=(" $AUTOGEN_THEMES [ ${wall2themes} ],^checkout(autogen)") @@ -257,6 +404,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 [ ${wall2themes_conky} ],^checkout(conky)") out3+=("^tag(conky)") @@ -265,7 +413,13 @@ out3+=("$NO,mb-setvar wall2themes_conky=none $CNF_FILE;colorizer -s") out3+=("^sep()") out3+=("$LIGHTBG,mb-setvar wall2themes_conky=light $CNF_FILE;colorizer -s") out3+=("$DARKBG,mb-setvar wall2themes_conky=dark $CNF_FILE;colorizer -s") +out2+=("$DIFF_CONKY_COLORS [ $conky_diff_colors ],^checkout(conkycolors)") +out3+=("^tag(conkycolors)") +out3+=("^sep($DIFF_CONKY_COLORS)") +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 [ ${wall2themes_pyradio} ],^checkout(pyradio)") out3+=("^tag(pyradio)") out3+=("^sep($GENPYRADIO)") @@ -273,8 +427,8 @@ out3+=("$NO,mb-setvar wall2themes_pyradio=none $CNF_FILE;colorizer -s") out3+=("^sep()") out3+=("$LIGHTBG,mb-setvar wall2themes_pyradio=light $CNF_FILE;colorizer -s") out3+=("$DARKBG,mb-setvar wall2themes_pyradio=dark $CNF_FILE;colorizer -s") +out2+=("^sep()") -out2+=("^sep($OTHER_SETTINGS)") out2+=("$WALLPAPERS,^checkout(wallpapersettings)") out3+=("^tag(wallpapersettings)") out3+=("^sep($SYSWALLPAPER ($syswallp))") @@ -282,7 +436,7 @@ out3+=("^sep(/usr/share/backgrounds)") out3+=(" $OPENDIR,xdg-open /usr/share/backgrounds") out3+=(" $OPENDIR_VIEWNIOR,viewnior /usr/share/backgrounds") out3+=(" $SETRANDOM,nitrogen --random /usr/share/backgrounds --set-scaled --save;colorizer -s") -out3+=("^sep($USERWALLPAPER)") +out3+=("^sep($USERWALLPAPER ($userwallp))") if [[ -d "${user_wallpapers_dir}" ]]; then # dir exist out3+=("^sep(${user_wallpapers_dir})") @@ -292,12 +446,29 @@ out3+=(" $SETRANDOM,nitrogen --random ${user_wallpapers_dir} --set-scaled -- out3+=("^sep()") out3+=(" $CHANGE ($EDITCONF),xdg-open $CNF_FILE") else -# dir nit exist +# dir not exist out3+=("^sep(${user_wallpapers_dir} - $USERDIR_NOT_EXIST") out3+=(" $CREATE_USERDIR,mkdir -p ${user_wallpapers_dir};colorizer -s") out3+=(" $CHANGE ($EDITCONF),xdg-open $CNF_FILE") fi +out2+=("^sep($GRADIENTS)") +out2+=("$GRAD_OB [ ${gradient_obtheme} ],^checkout(grad_ob)") +out3+=("^tag(grad_ob") +out3+=("^sep($GRAD_OB)") +out3+=("$YES,mb-setvar gradient_obtheme=yes $CNF_FILE;colorizer -s") +out3+=("$NO,mb-setvar gradient_obtheme=no $CNF_FILE;colorizer -s") +out2+=("$GRAD_MENU [ ${gradient_menu} ],^checkout(grad_menu)") +out3+=("^tag(grad_menu") +out3+=("^sep($GRAD_MENU)") +out3+=("$YES,mb-setvar gradient_menu=yes $CNF_FILE;colorizer -s") +out3+=("$NO,mb-setvar gradient_menu=no $CNF_FILE;colorizer -s") +out2+=("$GRAD_CONKY [ ${gradient_conkies} ],^checkout(grad_conky)") +out3+=("^tag(grad_conky") +out3+=("^sep($GRAD_CONKY)") +out3+=("$YES,mb-setvar gradient_conkies=yes $CNF_FILE;colorizer -s") +out3+=("$NO,mb-setvar gradient_conkies=no $CNF_FILE;colorizer -s") +out2+=("^sep($OTHER_SETTINGS)") out2+=("$SHOW_RELATED [ ${related_tools} ],^checkout(related)") out3+=("^tag(related)") out3+=("^sep($SHOW_RELATED)") @@ -372,7 +543,7 @@ if [[ "$1" == "-s" ]]; then cat < ${MENU_ITEMS} @icon,,$((jgtools_padding + 4)),$((jgtools_padding + 4)),270,150,4,left,top,,,${THUMB} @rect,,$((jgtools_padding + 4)),$((jgtools_padding + 100)),270,54,0,left,top,#222222 20,#222222 70, -@text,,$((jgtools_padding + 168)),$((jgtools_padding + 124)),120,30,0,left,top,#FFFFFF ,${WINCLR}, Colorizer +@text,,$((jgtools_padding + 198)),$((jgtools_padding + 124)),120,30,0,left,top,#FFFFFF ,${WINCLR}, Colorizer $(printf '%s\n' "${dots[@]}") #@icon,,$((jgtools_padding + 4)),$((jgtools_padding + 34)),270,120,4,left,top,,,/usr/share/mabox-colorizer/img/colorizer.png $(printf '%s\n' "${out[@]}") diff --git a/bin/colorizer-menus b/bin/colorizer-menus index 9149e43..3192334 100755 --- a/bin/colorizer-menus +++ b/bin/colorizer-menus @@ -12,6 +12,12 @@ case "$jgmenu_theme" in THEMERC="$HOME/.config/mabox/jgobthemes/${jgmenu_theme}.colorrc";; esac +GRADIENT_FILE="$HOME"/.config/colorizer/gradients_menu.inc + +if [ ! -f "$GRADIENT_FILE" ]; then +cp /usr/share/mabox-colorizer/gradients_menu.inc "$GRADIENT_FILE" +fi + # Backup original theme file if [ ! -f "${THEMERC}.bak" ]; then cp ${THEMERC} ${THEMERC}.bak @@ -35,11 +41,12 @@ case "$LANG" in TOP_RIGHT="od góry z prawej (top_right)" BOTTOM_LEFT="z dołu od lewej (bottom_left)" BOTTOM_RIGHT="z dołu od prawej (bottom_right)" + PRE_GRADIENTS="Gotowe gradienty" ITEM="pozycja menu (element)" COLOR_NORM_FG="Kolor tekstu" - COLOR_SEL_BG="Tło zaznaczonej poz." - COLOR_SEL_FG="Tekst zaznaczonej poz." - COLOR_SEL_BORDER="Obramowanie zazn. poz." + COLOR_SEL_BG="Tło aktywnej pozycji" + COLOR_SEL_FG="Tekst aktywnej pozycji" + COLOR_SEL_BORDER="Obramowanie akt. poz." ITEM_BORDER="Obramowanie (px)" ITEM_RADIUS="Zaokrąglenie (px)" COLOR_NORM_BG="Tło" @@ -78,6 +85,7 @@ case "$LANG" in TOP_RIGHT="top_right" BOTTOM_LEFT="bottom_left" BOTTOM_RIGHT="bottom_right" + PRE_GRADIENTS="Predefined gradients" ITEM="item" COLOR_NORM_FG="Text Color" COLOR_SEL_BG="Selected Item Background" @@ -140,14 +148,15 @@ out+=("$(printf '%3s' "$MBGTA") $(printf '%3s' "$MBORDERA") $COLOR_MENU_BORDER,^pipe(mbclr '$MBORDER' jgctl color_menu_border '${COLOR_MENU_BORDER}' '$me')") out+=("^sep()") out+=("$GRADIENT_POS [ $GRADIENT ],^checkout(gradientpos)") +out+=("$PRE_GRADIENTS,^pipe(mbgrad menu)") out+=("^sep($ITEM)") out+=("$(printf '%3s' "$NFGA") AbCd $COLOR_NORM_FG,^pipe(mbclr '$NFG' jgctl color_norm_fg '${COLOR_NORM_FG}' '$me')") +out+=("$ITEM_BORDER [ $IBORDER ],^checkout(itemborder)") +out+=("$ITEM_RADIUS [ $IRADIUS ],^checkout(itemradius)") out+=("$(printf '%3s' "$SBGA") $COLOR_SEL_BG,^pipe(mbclr '$SBG' jgctl color_sel_bg '${COLOR_SEL_BG}' '$me')") out+=("$(printf '%3s' "$SFGA") AbCd $COLOR_SEL_FG,^pipe(mbclr '$SFG' jgctl color_sel_fg '${COLOR_SEL_FG}' '$me')") out+=("$(printf '%3s' "$SBORDERA") $COLOR_SEL_BORDER,^pipe(mbclr '$SBORDER' jgctl color_sel_border '${COLOR_SEL_BORDER}' '$me')") -out+=("$ITEM_BORDER [ $IBORDER ],^checkout(itemborder)") -out+=("$ITEM_RADIUS [ $IRADIUS ],^checkout(itemradius)") out+=("^sep()") [[ ! -z "$NORMBG" ]] && out+=("$(printf '%3s' "$NORMBGA") $COLOR_NORM_BG,^pipe(mbclr '$NORMBG' jgctl color_norm_bg '${COLOR_NORM_BG}' '$me')") @@ -179,13 +188,13 @@ out2+=(" $H_LEFT,jgctl sep_halign left;$me") out2+=(" $H_CENTER,jgctl sep_halign center;$me") out2+=(" $H_RIGHT,jgctl sep_halign right;$me") out2+=("^tag(itemborder)") -out2+=("^sep(ITEM_BORDER)") +out2+=("^sep($ITEM_BORDER)") out2+=("0,jgctl item_border 0;$me") out2+=("^sep()") out2+=("1,jgctl item_border 1;$me") out2+=("2,jgctl item_border 2;$me") out2+=("^tag(itemradius)") -out2+=("^sep(ITEM_RADIUS)") +out2+=("^sep($ITEM_RADIUS)") out2+=("0,jgctl item_radius 0;$me") out2+=("^sep()") out2+=("1,jgctl item_radius 1;$me") diff --git a/bin/colorizer-ob b/bin/colorizer-ob index 5252ccf..2caa934 100755 --- a/bin/colorizer-ob +++ b/bin/colorizer-ob @@ -1,6 +1,12 @@ #!/bin/bash MBCOLORSDIR="$HOME"/.themes/MBcolors/openbox-3/ +GRADIENT_FILE="$HOME"/.config/colorizer/gradients_all.inc +MORE_GRADIENT_FILE="$HOME"/.config/colorizer/gradients_menu.inc + +if [ ! -f "$GRADIENT_FILE" ]; then +cp /usr/share/mabox-colorizer/gradients.inc "$GRADIENT_FILE" +fi if [ ! -d "$MBCOLORSDIR" ]; then mkdir -p ${MBCOLORSDIR} @@ -35,12 +41,15 @@ case "$LANG" in PADDING="Odstęp" VERTICAL="W pionie" HORIZONTAL="W poziomie" - RAISED_OR_FLAT="Podniesiony czy płaski" - FLAT="płaski - flat" - RAISED="podniesiony - raised" + RAISED_OR_FLAT="Płaski, Podniesiony czy Wklęsły" + FLAT="płaski - flat" + RAISED="podniesiony - raised" + SUNKEN="wklęsły - sunken" BUTTONS="Przyciski" GRADIENT_TYPE="Typ Gradientu" SOLID_COLOR="Jednolity kolor (brak gradientu)" + PRE_GRADIENTS="Gotowe gradienty" + GRADIENT_REVERSE="Odwróć kolory Gradientu" SPLITVERTICAL="Podział w pionie" MIRRORHORIZONTAL="LustroPoziome" DIAGONAL="Przekątna" @@ -84,9 +93,10 @@ case "$LANG" in PADDING="Padding" VERTICAL="Vertical" HORIZONTAL="Horizontal" - RAISED_OR_FLAT="Raised or Flat" + RAISED_OR_FLAT="Flat, Raised or Sunken" FLAT="flat" RAISED="raised" + SUNKEN="sunken" BUTTONS="Buttons" GRADIENT_TYPE="Gradient type" SPLITVERTICAL="SplitVertical" @@ -95,6 +105,8 @@ case "$LANG" in CROSSDIAGONAL="CrossDiagonal" PYRAMID="Pyramid" SOLID_COLOR="Solid color (no gradient)" + PRE_GRADIENTS="Predefined gradients" + GRADIENT_REVERSE="Reverse Gradient" ACTIVE_BG_TO="Active Background to" INACTIVE_BG_TO="Inactive Background to" BORDER="Window Border" @@ -173,17 +185,23 @@ getvalues out+=("^sep($OBTHEME_LBL: $OBTHEME)") out+=("^sep($TITLEBAR)") out+=(" $ACTIVE_BG,^pipe(mbclr '$ABG' obtctl clractivebg '${ACTIVE_BG}' '$me')") -out+=(" $INACTIVE_BG,^pipe(mbclr '$NBG' obtctl clrnormalbg '${INACTIVE_BG}' '$me')") +[[ ! -z "$ABGTO" ]] && out+=(" $ACTIVE_BG_TO,^pipe(mbclr '$ABGTO' obtctl clractivebgto '${ACTIVE_BG_TO}' '$me')") out+=(" AbCd $TITLEBAR_TEXT,^checkout(titletext)") +out+=("^sep()") +out+=(" $INACTIVE_BG,^pipe(mbclr '$NBG' obtctl clrnormalbg '${INACTIVE_BG}' '$me')") +[[ ! -z "$ABGTO" ]] && out+=(" $INACTIVE_BG_TO,^pipe(mbclr '$NBGTO' obtctl clrnormalbgto '${INACTIVE_BG_TO}' '$me')") + +out+=("^sep()") out+=("$PADDING [ $PHEIGHT $PWIDTH ],^checkout(padding)") -out+=("$RAISED_OR_FLAT? [ $WINRAISED ],^checkout(raised)") +out+=("\"\"\"$RAISED_OR_FLAT? [ $WINRAISED ]\"\"\",^checkout(raised)") out+=("^sep()") out+=("$BUTTONS,^checkout(tbuttons)") out+=("^sep(Gradient)") out+=("$GRADIENT_TYPE [ ${REST##* } ],^checkout(gradient)") -[[ ! -z "$ABGTO" ]] && out+=(" $ACTIVE_BG_TO,^pipe(mbclr '$ABGTO' obtctl clractivebgto '${ACTIVE_BG_TO}' '$me')") -[[ ! -z "$ABGTO" ]] && out+=(" $INACTIVE_BG_TO,^pipe(mbclr '$NBGTO' obtctl clrnormalbgto '${INACTIVE_BG_TO}' '$me')") +out+=("$PRE_GRADIENTS,^pipe(mbgrad ob)") +out+=(" $GRADIENT_REVERSE,obtctl activegradient '${ABGTO}' '${ABG}';$me") + out+=("^sep($BORDER)") out+=(" $ACTIVE_BORDER,^pipe(mbclr '$ALINE' obtctl activeborderColor '${ACTIVE_BORDER_COLOR}' '$me')") out+=(" $INACTIVE_BORDER,^pipe(mbclr '$NLINE' obtctl inactiveborderColor '${INACTIVE_BORDER_COLOR}' '$me')") @@ -197,7 +215,7 @@ out+=("^sep($RESET)") out+=(" $RESET_THEME,^checkout(resettheme)") out2+=("^tag(resettheme)") out2+=("^sep($AREYOUSURE)") - out2+=("$YES,obctl reset;$me") + out2+=("$YES,obtctl reset;$me") fi #out+=("Edit...,xdg-open ${THEMERC}") @@ -247,9 +265,11 @@ out2+=("3,obtctl paddingHeight 3;$me") out2+=("4,obtctl paddingHeight 4;$me") out2+=("5,obtctl paddingHeight 5;$me") out2+=("6,obtctl paddingHeight 6;$me") -out2+=("7,obtctl paddingHeight 7;$me") out2+=("8,obtctl paddingHeight 8;$me") out2+=("10,obtctl paddingHeight 10;$me") +out2+=("12,obtctl paddingHeight 12;$me") +out2+=("16,obtctl paddingHeight 16;$me") +out2+=("20,obtctl paddingHeight 20;$me") out2+=("^sep($HORIZONTAL)") out2+=("0,obtctl paddingWidth 0;$me") out2+=("^sep()") @@ -258,6 +278,12 @@ out2+=("2,obtctl paddingWidth 2;$me") out2+=("3,obtctl paddingWidth 3;$me") out2+=("4,obtctl paddingWidth 4;$me") out2+=("5,obtctl paddingWidth 5;$me") +out2+=("6,obtctl paddingWidth 6;$me") +out2+=("8,obtctl paddingWidth 8;$me") +out2+=("10,obtctl paddingWidth 10;$me") +out2+=("12,obtctl paddingWidth 12;$me") +out2+=("16,obtctl paddingWidth 16;$me") +out2+=("20,obtctl paddingWidth 20;$me") #BORDER out2+=("^tag(border)") out2+=("^sep($BORDER)") @@ -268,11 +294,18 @@ out2+=("2,obtctl borderWidth 2;$me") out2+=("3,obtctl borderWidth 3;$me") out2+=("4,obtctl borderWidth 4;$me") out2+=("5,obtctl borderWidth 5;$me") +out2+=("6,obtctl borderWidth 6;$me") +out2+=("8,obtctl borderWidth 8;$me") +out2+=("10,obtctl borderWidth 10;$me") +out2+=("12,obtctl borderWidth 12;$me") +out2+=("16,obtctl borderWidth 16;$me") +out2+=("20,obtctl borderWidth 20;$me") #RAISED out2+=("^tag(raised)") -out2+=("^sep($RAISED_OR_FLAT?)") -out2+=("0 ($FLAT),obtctl raised 0;$me") -out2+=("1 ($RAISED),obtctl raised 1;$me") +out2+=("\"\"\"^sep($RAISED_OR_FLAT?)\"\"\"") +out2+=("$FLAT,obtctl raised 0;$me") +out2+=("$RAISED,obtctl raised 1;$me") +out2+=("$SUNKEN,obtctl raised 2;$me") #GRADIENT out2+=("^tag(gradient)") out2+=("^sep($GRADIENT_TYPE)") diff --git a/bin/conkyctl b/bin/conkyctl index 7c92a98..938ab11 100755 --- a/bin/conkyctl +++ b/bin/conkyctl @@ -27,6 +27,8 @@ win_bgcolor_all () { win_bgcolor () { sd "own_window_colour .*=.*$" "own_window_colour = '${1}'," ${2} sd "own_window_transparent.*$" "own_window_transparent = false," ${2} + + #notify-send.sh "${FG_COLOR}" "${2}" } draw_borders_all () { sd "draw_borders.*$" "draw_borders = ${1}," ${CONKYDIR}/*mbcolor.conkyrc @@ -66,6 +68,7 @@ color1 () { color2 () { sd "color2 .*=.*$" "color2 = '${1}'," ${2} } + basefont_inc_all () { read FONTDEF <<< "$(grep "font .*=.*,$" ${BASECONKY} | cut -d'=' -f2,3 |cut -d"'" -f2)" FONT=${FONTDEF%:*} @@ -229,6 +232,13 @@ kill () { pkill -f "conky .*${1}" update_session } +restartone () { + kill ${1} + startone ${1} +} +makemovableall () { +echo "dupa" +} single () { case "$LANG" in @@ -372,6 +382,43 @@ single () { out2+=("$BIG 256px,conkyctl logosize 256;$me") fi + if [[ "$1" =~ "quoter" ]]; then + case "$LANG" in + pl*) + FONTSIZE="Rozmiar czcionki" + QUOTE_FSIZE="Cytat" + AUTHOR_FSIZE="Autor" + EDIT_CONF="Edytuj plik konfiguracyjny" + RELOAD="Przeładuj" + ;; + *) + FONTSIZE="Font size" + QUOTE_FSIZE="Quote" + AUTHOR_FSIZE="Author" + EDIT_CONF="Edit conf file" + RELOAD="Reload" + ;; + esac + Q_CFG="$HOME/.config/quoter/quoter.cfg" + source "$Q_CFG" + out+=("^sep($FONTSIZE)") + out+=("$QUOTE_FSIZE [ $quote_fontsize ],^checkout(qsize)") + out+=("$AUTHOR_FSIZE [ $author_fontsize ],^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 + out2+=("${i},mb-setvar quote_fontsize=$i $Q_CFG;conkyctl restartone ${1};$me") + done + out2+=("^tag(asize)") + out2+=("^sep($AUTHOR_FSIZE)") + for i in 10 11 12 13 14 15 16 18 20; do + out2+=("${i},mb-setvar author_fontsize=$i $Q_CFG;conkyctl restartone ${1};$me") + done + fi + out+=("^sep($COLORS)") if [[ "$1" != *"logo_mbcolor"* ]]; then [[ "$CLR" != "#" ]] && out+=(" AbCd $DEFCOLOR,^pipe(mbclr '$CLR' conkyctl default_color '${DEFCOLOR}' '$me' ${1})") @@ -471,6 +518,9 @@ case "$1" in startone) startone "$2";; startall) startall;; kill) kill "$2";; + restartone) restartone "$2";; + makemovableall) makemovableall;; + saveposall) saveposall;; reset) reset ;; *) : ;; esac diff --git a/bin/jgctl b/bin/jgctl index c2ab530..eaab541 100755 --- a/bin/jgctl +++ b/bin/jgctl @@ -57,6 +57,44 @@ color_menu_border () { menu_gradient_pos () { sd "menu_gradient_pos.*$" "menu_gradient_pos = $1" ${THEMERC} } +gradient () { + read MBG MBGA<<< "$(grep 'color_menu_bg ' ${THEMERC} | cut -d'=' -f2)" + read MBGT MBGTA<<< "$(grep 'color_menu_bg_to ' ${THEMERC} | cut -d'=' -f2)" + sd "color_menu_bg .*$" "color_menu_bg = $1 $MBGA" ${THEMERC} + sd "color_menu_bg_to.*$" "color_menu_bg_to = $2 $MBGTA" ${THEMERC} + ITEM_FG=$(pastel textcolor ${2}|pastel format hex) + read NFG NFGA<<< "$(grep 'color_norm_fg' ${THEMERC} | cut -d'=' -f2)" + sd "color_norm_fg.*$" "color_norm_fg = $ITEM_FG $NFGA" ${THEMERC} +# Title + read TBG TBGA<<< "$(grep 'color_title_bg' ${THEMERC} | cut -d'=' -f2)" + sd "color_title_bg.*$" "color_title_bg = $1 $TBGA" ${THEMERC} + # calculate readable FG color + TITLE_FG=$(pastel textcolor ${1}|pastel format hex) + read TFG TFGA<<< "$(grep 'color_title_fg' ${THEMERC} | cut -d'=' -f2)" + if [[ "${TITLE_FG}" == *"ffffff"* ]];then + TITLE_FGCOLOR=$(pastel mix -f 0.6 '#ffffff' "${2}"|pastel format hex) + else + TITLE_FGCOLOR=$(pastel mix -f 0.6 '#000000' "${2}"|pastel format hex) + fi + sd "color_title_fg.*$" "color_title_fg = ${TITLE_FGCOLOR} $TFGA" ${THEMERC} + read TBORDER TBORDERA<<< "$(grep 'color_title_border' ${THEMERC} | cut -d'=' -f2)" + TITLE_BORDER=$(pastel darken 0.05 ${1}|pastel format hex) + sd "color_title_border.*$" "color_title_border = $TITLE_BORDER $TBORDERA" ${THEMERC} +# Active item + read SBG SBGA<<< "$(grep 'color_sel_bg' ${THEMERC} | cut -d'=' -f2)" + alpha=${SBGA:-100} + sd "color_sel_bg.*$" "color_sel_bg = $2 $alpha" ${THEMERC} + ACTIVE_FG=$(pastel textcolor ${2}|pastel format hex) + read SFG SFGA<<< "$(grep 'color_sel_fg' ${THEMERC} | cut -d'=' -f2)" + sd "color_sel_fg.*$" "color_sel_fg = $ACTIVE_FG $SFGA" ${THEMERC} + # Sep + read SFG SFGA<<< "$(grep 'color_sep_fg' ${THEMERC} | cut -d'=' -f2)" + SEP_FG=$(pastel mix -f 0.5 "${1}" "${2}"|pastel format hex) + sd "color_sep_fg.*$" "color_sep_fg = $SEP_FG $SFGA" ${THEMERC} +# Menu border + read MBORDER MBORDERA<<< "$(grep 'color_menu_border' ${THEMERC} | cut -d'=' -f2)" + sd "color_menu_border.*$" "color_menu_border = $1 $MBORDERA" ${THEMERC} +} sep_halign () { sd "sep_halign.*$" "sep_halign = $1" ${THEMERC} } @@ -135,7 +173,7 @@ color_norm_fg () { } color_sel_bg () { read SBG SBGA<<< "$(grep 'color_sel_bg' ${THEMERC} | cut -d'=' -f2)" - alpha=${SBGA:-50} + alpha=${SBGA:-100} case "${#1}" in 7) #color sd "color_sel_bg.*$" "color_sel_bg = $1 $alpha" ${THEMERC} @@ -173,6 +211,7 @@ case "$1" in color_menu_bg_to) color_menu_bg_to "$2";; color_menu_border) color_menu_border "$2";; menu_gradient_pos) menu_gradient_pos "$2";; + gradient) gradient "$2" "$3";; sep_halign) sep_halign "$2";; color_sep_fg) color_sep_fg "$2";; color_title_bg) color_title_bg "$2";; diff --git a/bin/mbclr b/bin/mbclr index 64e07b5..7e95f70 100755 --- a/bin/mbclr +++ b/bin/mbclr @@ -77,19 +77,19 @@ out+=("^sep($OPACITY)") out+=("$OPACITY [ $OP ],^checkout(opacity)") out2+=("^tag(opacity)") out2+=("^sep($OPACITY [ $OP ]") -out2+=("100 ,jgctl $3 100;${5}") -out2+=(" 95 ,jgctl $3 95 ;${5}") -out2+=(" 90 ,jgctl $3 90 ;${5}") -out2+=(" 80 ,jgctl $3 80 ;${5}") -out2+=(" 70 ,jgctl $3 70 ;${5}") -out2+=(" 60 ,jgctl $3 60 ;${5}") -out2+=(" 50 ,jgctl $3 50 ;${5}") -out2+=(" 40 ,jgctl $3 40 ;${5}") -out2+=(" 30 ,jgctl $3 30 ;${5}") -out2+=(" 20 ,jgctl $3 20 ;${5}") -out2+=(" 10 ,jgctl $3 10 ;${5}") -out2+=(" 5 ,jgctl $3 5 ;${5}") -out2+=(" 0 ,jgctl $3 0 ;${5}") +out2+=("100 ,jgctl $3 100;${5}") +out2+=(" 95 ,jgctl $3 95 ;${5}") +out2+=(" 90 ,jgctl $3 90 ;${5}") +out2+=(" 80 ,jgctl $3 80 ;${5}") +out2+=(" 70 ,jgctl $3 70 ;${5}") +out2+=(" 60 ,jgctl $3 60 ;${5}") +out2+=(" 50 ,jgctl $3 50 ;${5}") +out2+=(" 40 ,jgctl $3 40 ;${5}") +out2+=(" 30 ,jgctl $3 30 ;${5}") +out2+=(" 20 ,jgctl $3 20 ;${5}") +out2+=(" 10 ,jgctl $3 10 ;${5}") +out2+=(" 5 ,jgctl $3 5 ;${5}") +out2+=(" 0 ,jgctl $3 0 ;${5}") fi @@ -104,7 +104,7 @@ out+=(" $SHADES_OF_CURRENT ($1< out+=("^sep($WALLPAPER_COLORS)") for i in "${wallcolors[@]}" do -out+=("$i ,$2 $3 '${i}' ${6};${5}") +out+=("$i ,$2 $3 '${i}' ${6};${5}") done @@ -112,11 +112,11 @@ out+=("^sep()") out+=("$ACCENT_COLORS,^checkout(accents)") out2+=("^tag(accents)") out2+=("^sep(Ubuntu)") -for i in ${ubuntu[@]};do out2+=("$i ,$2 $3 '${i}' ${6};${5}");done +for i in ${ubuntu[@]};do out2+=("$i ,$2 $3 '${i}' ${6};${5}");done out2+=("^sep(Mint)") -for i in ${mint[@]};do out2+=("$i ,$2 $3 '${i}' ${6};${5}");done +for i in ${mint[@]};do out2+=("$i ,$2 $3 '${i}' ${6};${5}");done out2+=("^sep(Plasma)") -for i in ${plasma[@]};do out2+=("$i ,$2 $3 '${i}' ${6};${5}");done +for i in ${plasma[@]};do out2+=("$i ,$2 $3 '${i}' ${6};${5}");done out+=("^sep()") out+=(" $LIGHTCOLORS,^checkout(light)") @@ -124,7 +124,7 @@ out2+=("^tag(light)") out2+=("^sep($LIGHTCOLORS)") for i in "${light[@]}" do -out2+=("$i ,$2 $3 '${i}' ${6};${5}") +out2+=("$i ,$2 $3 '${i}' ${6};${5}") done out+=("^sep()") out+=(" $DARKCOLORS,^checkout(dark)") @@ -132,7 +132,7 @@ out2+=("^tag(dark)") out2+=("^sep($DARKCOLORS)") for i in "${dark[@]}" do -out2+=("$i ,$2 $3 '${i}' ${6};${5}") +out2+=("$i ,$2 $3 '${i}' ${6};${5}") done @@ -142,17 +142,17 @@ out2+=("^sep($SHADES_OF $1)") for i in 3 25 2 15 1 05; do clr=$(pastel lighten 0.$i "${1}" | pastel format hex) if [ "${clr}" != "#ffffff" ];then -out2+=("$clr ,$2 $3 '${clr}' ${6};${5}") +out2+=("$clr ,$2 $3 '${clr}' ${6};${5}") fi done out2+=("^sep()") -out2+=("$1 ,$2 $3 '${1}' ${6};${5}") +out2+=("$1 ,$2 $3 '${1}' ${6};${5}") out2+=("^sep()") for i in 05 1 15 2 25 3; do clr=$(pastel darken 0.$i "${1}" | pastel format hex) if [ "${clr}" != "#000000" ];then -out2+=("$clr ,$2 $3 '${clr}' ${6};${5}") +out2+=("$clr ,$2 $3 '${clr}' ${6};${5}") fi done diff --git a/bin/mbgrad b/bin/mbgrad new file mode 100755 index 0000000..55df425 --- /dev/null +++ b/bin/mbgrad @@ -0,0 +1,117 @@ +#!/bin/bash + +GRADIENT_FILE="$HOME"/.config/colorizer/gradients_all.inc +if [ ! -f $GRADIENT_FILE ]; then +cp -a /usr/share/mabox-colorizer/gradients_all.inc $GRADIENT_FILE +fi + +case "$1" in + ob) + CACHEFILE="$HOME"/.config/colorizer/grad_ob.csv + COMMAND="obtctl activegradient" + me="colorizer-ob -s" + ;; + menu) + CACHEFILE="$HOME"/.config/colorizer/grad_menu.csv + COMMAND="jgctl gradient" + me="colorizer-menus -s" + ;; + *) + CACHEFILE="$HOME"/.config/colorizer/grad_root.csv + COMMAND="w2theme gradient" + me="colorizer -s" + ;; + +esac + + +if [ -f "$CACHEFILE" ]; then +cat "$CACHEFILE" +else + +case $LANG in + pl*) + GRADIENTS="Gradienty" + MORE_GRADIENTS="Więcej..." + ;; + *) + GRADIENTS="Gradients" + MORE_GRADIENTS="More gradients" + ;; +esac + +out2+=("^sep($GRADIENTS)") +n=0 +while read -r FROM TO NAME; +do + ((n++)) + for i in $(pastel gradient -n 24 ${FROM} ${TO}|pastel format hex) + do + tablica+=" " + done + case "$n" in + 31) out2+=("^sep($MORE_GRADIENTS)") + out2+=("$GRADIENTS 30...60,^checkout(grad31)") + out3+=("^tag(grad31)") + out3+=("^sep($GRADIENTS 30...60)");; + 61) out2+=("$GRADIENTS 61...90,^checkout(grad61)") + out3+=("^tag(grad61)") + out3+=("^sep($GRADIENTS 61...90)");; + 91) out2+=("$GRADIENTS 91...120,^checkout(grad91)") + out3+=("^tag(grad91)") + out3+=("^sep($GRADIENTS 91...120)");; + 121) out2+=("$GRADIENTS 121...150,^checkout(grad121)") + out3+=("^tag(grad121)") + out3+=("^sep($GRADIENTS 121...150)");; + 151) out2+=("$GRADIENTS 151...180,^checkout(grad151)") + out3+=("^tag(grad151)") + out3+=("^sep($GRADIENTS 151...180)");; + 181) out2+=("$GRADIENTS 181...210,^checkout(grad181)") + out3+=("^tag(grad181)") + out3+=("^sep($GRADIENTS 181...210)");; + 211) out2+=("$GRADIENTS 211...240,^checkout(grad211)") + out3+=("^tag(grad211)") + out3+=("^sep($GRADIENTS 211...240)");; + 241) out2+=("$GRADIENTS 241...270,^checkout(grad241)") + out3+=("^tag(grad241)") + out3+=("^sep($GRADIENTS 241...270)");; + 271) out2+=("$GRADIENTS 271...300,^checkout(grad271)") + out3+=("^tag(grad271)") + out3+=("^sep($GRADIENTS 271...300)");; + 301) out2+=("$GRADIENTS 301...330,^checkout(grad301)") + out3+=("^tag(grad301)") + out3+=("^sep($GRADIENTS 301...330)");; + 331) out2+=("$GRADIENTS 331...,^checkout(grad331)") + out3+=("^tag(grad331)") + out3+=("^sep($GRADIENTS 331...)");; + *) : ;; + esac + case 1 in + $(($n<=30))) out2+=("$(echo ${tablica}) ${NAME},${COMMAND} '${FROM}' '${TO}';${me}");; + $((30<$n && $n<=60))) out3+=("$(echo ${tablica}) ${NAME},${COMMAND} '${FROM}' '${TO}';$me");; + $((60<$n && $n<=90))) out3+=("$(echo ${tablica}) ${NAME},${COMMAND} '${FROM}' '${TO}';$me");; + $((90<$n && $n<=120))) out3+=("$(echo ${tablica}) ${NAME},${COMMAND} '${FROM}' '${TO}';$me");; + $((120<$n && $n<=150))) out3+=("$(echo ${tablica}) ${NAME},${COMMAND} '${FROM}' '${TO}';$me");; + $((150<$n && $n<=180))) out3+=("$(echo ${tablica}) ${NAME},${COMMAND} '${FROM}' '${TO}';$me");; + $((180<$n && $n<=210))) out3+=("$(echo ${tablica}) ${NAME},${COMMAND} '${FROM}' '${TO}';$me");; + $((210<$n && $n<=240))) out3+=("$(echo ${tablica}) ${NAME},${COMMAND} '${FROM}' '${TO}';$me");; + $((240<$n && $n<=270))) out3+=("$(echo ${tablica}) ${NAME},${COMMAND} '${FROM}' '${TO}';$me");; + $((270<$n && $n<=300))) out3+=("$(echo ${tablica}) ${NAME},${COMMAND} '${FROM}' '${TO}';$me");; + $((300<$n && $n<=330))) out3+=("$(echo ${tablica}) ${NAME},${COMMAND} '${FROM}' '${TO}';$me");; + $((330<$n))) out3+=("$(echo ${tablica}) ${NAME},${COMMAND} '${FROM}' '${TO}';$me");; + *) + : + ;; + esac + tablica=() +done < "${GRADIENT_FILE}" + +printf '%s\n' "${out[@]}" +printf '%s\n' "${out2[@]}" +printf '%s\n' "${out3[@]}" + +printf '%s\n' "${out[@]}" > $CACHEFILE +printf '%s\n' "${out2[@]}" >> $CACHEFILE +printf '%s\n' "${out3[@]}" >> $CACHEFILE + +fi diff --git a/bin/obtctl b/bin/obtctl index 8287575..ab5ccde 100755 --- a/bin/obtctl +++ b/bin/obtctl @@ -12,37 +12,30 @@ THEMERC="$HOME/.themes/$OBTHEME/openbox-3/themerc" theme () { xmlstarlet ed -L -N o="http://openbox.org/3.4/rc" -u '/o:openbox_config/o:theme/o:name' -v "$1" "$HOME/.config/openbox/rc.xml" - openbox --reconfigure } reset () { rm ${THEMERC} mv ${THEMERC}.bak ${THEMERC} - openbox --reconfigure } borderWidth () { sd "^border.width:.*$" "border.width: $1" ${THEMERC} - openbox --reconfigure } activeborderColor () { sd "\.active.border.color:.*$" ".active.border.color: $1" ${THEMERC} - openbox --reconfigure } inactiveborderColor () { sd "\.inactive.border.color:.*$" ".inactive.border.color: $1" ${THEMERC} - openbox --reconfigure } paddingHeight () { sd "^padding.height:.*$" "padding.height: $1" ${THEMERC} - openbox --reconfigure + sd "^padding.width:.*$" "padding.width: $1" ${THEMERC} } paddingWidth () { sd "^padding.width:.*$" "padding.width: $1" ${THEMERC} - openbox --reconfigure } textjustify () { sd "\.text.justify:.*$" ".text.justify: $1" ${THEMERC} - openbox --reconfigure } shadow () { case "$1" in @@ -58,12 +51,11 @@ shadow () { sd "\.active.label.text.font:.*$" ".active.label.text.font: shadow=y:shadowtint=-70:shadowoffset=1" ${THEMERC} sd "\.inactive.label.text.font:.*$" ".inactive.label.text.font: shadow=y:shadowtint=-20:shadowoffset=1" ${THEMERC} ;; - esac - openbox --reconfigure + esac + } handlewidth () { sd "\.handle.width:.*$" ".handle.width: $1" ${THEMERC} - openbox --reconfigure } raised () { #flat or raised @@ -73,12 +65,17 @@ raised () { sd "\.title.bg:.*$" ".title.bg: flat ${REST}" ${THEMERC} sd "\.handle.bg:.*$" ".handle.bg: flat ${REST}" ${THEMERC} sd "\.grip.bg:.*$" ".grip.bg: flat ${REST}" ${THEMERC} - openbox --reconfigure;; + ;; 1) sd "\.title.bg:.*$" ".title.bg: raised ${REST}" ${THEMERC} sd "\.handle.bg:.*$" ".handle.bg: raised ${REST}" ${THEMERC} sd "\.grip.bg:.*$" ".grip.bg: raised ${REST}" ${THEMERC} - openbox --reconfigure;; + ;; + 2) + sd "\.title.bg:.*$" ".title.bg: sunken ${REST}" ${THEMERC} + sd "\.handle.bg:.*$" ".handle.bg: sunken ${REST}" ${THEMERC} + sd "\.grip.bg:.*$" ".grip.bg: sunken ${REST}" ${THEMERC} + ;; esac } gradient () { @@ -89,14 +86,38 @@ gradient () { sd "\.title.bg:.*$" ".title.bg: ${WINRAISED} solid" ${THEMERC} sd "\.handle.bg:.*$" ".handle.bg: ${WINRAISED} solid" ${THEMERC} sd "\.grip.bg:.*$" ".grip.bg: ${WINRAISED} solid" ${THEMERC} - openbox --reconfigure;; + ;; *) sd "\.title.bg:.*$" ".title.bg: ${WINRAISED} gradient ${1}" ${THEMERC} sd "\.handle.bg:.*$" ".handle.bg: ${WINRAISED} gradient ${1}" ${THEMERC} sd "\.grip.bg:.*$" ".grip.bg: ${WINRAISED} gradient ${1}" ${THEMERC} - openbox --reconfigure;; + ;; esac } +activegradient () { + #notify-send.sh "zmiennne obtctl" "${1} ${2}" + #sd "\.active.handle.bg.color:.*$" ".active.handle.bg.color: ${1}" ${THEMERC} + sd "^window.active.title.bg.color:.*$" "window.active.title.bg.color: ${1}" ${THEMERC} + sd "^window.active.title.bg.colorTo:.*$" "window.active.title.bg.colorTo: ${2}" ${THEMERC} + + # Border color = active.title.bg.color (gradient start color) + sd "\.active.border.color:.*$" ".active.border.color: $1" ${THEMERC} + + # calculate color for title.fg and buttons + TITLE_FG=$(pastel textcolor ${1}|pastel format hex) + if [[ "${TITLE_FG}" == *"ffffff"* ]];then + TITLE_FG="#EEEEEE" + else + TITLE_FG="#222222" + fi + sd "\.active.label.text.color:.*$" ".active.label.text.color: ${TITLE_FG}" ${THEMERC} + + # Button colors + activebuttonscolors "${TITLE_FG}" +} +activegradient_reverse () { +: +} activehandle () { case "$1" in no) #no @@ -132,8 +153,8 @@ activehandle () { sd "\.active.handle.bg.colorTo:.*$" ".active.handle.bg.colorTo: ${NBGTO}" ${THEMERC} ;; esac - #openbox --reconfigure } + clractivebg () { colorTo=$(pastel darken 0.1 "${1}"|pastel format hex) #activehandle? @@ -155,11 +176,8 @@ clractivebg () { sd "menu.items.active.bg.color:.*$" "menu.items.active.bg.color: ${1}" ${THEMERC} sd "menu.items.active.bg.colorTo:.*$" "menu.items.active.bg.colorTo: ${colorTo}" ${THEMERC} - - openbox --reconfigure - - } + clrnormalbg () { colorTo=$(pastel darken 0.1 "${1}"|pastel format hex) #normalhandle? @@ -174,8 +192,8 @@ clrnormalbg () { sd "^window.inactive.title.bg.color:.*$" "window.inactive.title.bg.color: ${1}" ${THEMERC} sd "\.inactive.border.color:.*$" ".inactive.border.color: ${1}" ${THEMERC} sd "^window.inactive.title.bg.colorTo:.*$" "window.inactive.title.bg.colorTo: ${colorTo}" ${THEMERC} - openbox --reconfigure } + clractivebgto () { sd "^window.active.title.bg.colorTo:.*$" "window.active.title.bg.colorTo: ${1}" ${THEMERC} #activehandle? @@ -185,8 +203,8 @@ clractivebgto () { sd "\.active.handle.bg.colorTo:.*$" ".active.handle.bg.colorTo: ${1}" ${THEMERC} fi sd "\.active.grip.bg.colorTo:.*$" ".active.grip.bg.colorTo: ${1}" ${THEMERC} - openbox --reconfigure } + clrnormalbgto () { sd "^window.inactive.title.bg.colorTo:.*$" "window.inactive.title.bg.colorTo: ${1}" ${THEMERC} #normalhandle? @@ -196,20 +214,25 @@ clrnormalbgto () { sd "\.inactive.handle.bg.colorTo:.*$" ".inactive.handle.bg.colorTo: ${1}" ${THEMERC} fi sd "\.inactive.grip.bg.colorTo:.*$" ".inactive.grip.bg.colorTo: ${1}" ${THEMERC} - openbox --reconfigure } activetextcolor () { sd "\.active.label.text.color:.*$" ".active.label.text.color: ${1}" ${THEMERC} - openbox --reconfigure } inactivetextcolor () { sd "\.inactive.label.text.color:.*$" ".inactive.label.text.color: ${1}" ${THEMERC} - openbox --reconfigure } buttons () { rm $THEMEDIR/*.xbm cp -a /usr/share/mabox-colorizer/themes/obbuttons/${1}/*.xbm $THEMEDIR/ - openbox --reconfigure +} +activebuttonscolors () { + sd "^window.active.button.*.unpressed.image.color:.*$" "window.active.button.*.unpressed.image.color: ${1}" ${THEMERC} + # Calculate colors for other button states (mix of ${1} and clractivebg + read ABG <<< "$(grep .active.title.bg.color: ${THEMERC} | cut -d':' -f2)" + hover=$(pastel mix -f 0.2 "${1}" "${ABG}"|pastel format hex) + #pressed=$() + #disabled=$() + sd "^window.active.button.*.hover.image.color:.*$" "window.active.button.*.hover.image.color: ${hover}" ${THEMERC} } case "$1" in @@ -225,9 +248,8 @@ case "$1" in handlewidth) handlewidth "$2";; raised) raised "$2";; gradient) gradient "$2";; - activehandle) activehandle "$2" - openbox --reconfigure - ;; + activegradient) activegradient "$2" "$3";; + activehandle) activehandle "$2";; clractivebg) clractivebg "$2";; clractivebgto) clractivebgto "$2";; clrnormalbg) clrnormalbg "$2";; @@ -235,5 +257,8 @@ case "$1" in activetextcolor) activetextcolor "$2";; inactivetextcolor) inactivetextcolor "$2";; buttons) buttons "$2";; + activebuttonscolors) activebuttonscolors "$2";; *) : ;; esac + +openbox --reconfigure diff --git a/bin/w2theme b/bin/w2theme index 59bdd38..8f1f142 100755 --- a/bin/w2theme +++ b/bin/w2theme @@ -18,12 +18,13 @@ fi menu_theme () { case "$1" in dark) #dark bg - jgctl color_menu_bg "${w[0]}" + jgctl color_menu_bg "${w[2]}" jgctl color_menu_bg_to "${w[1]}" + jgctl color_menu_border "${w[3]}" jgctl color_norm_fg "${w[-2]}" - jgctl color_title_bg "${w[2]}" - jgctl color_title_fg "${w[-2]}" - jgctl color_title_border "${w[3]}" + jgctl color_title_bg "${w[1]}" + jgctl color_title_fg "${w[-3]}" + jgctl color_title_border "${w[0]}" jgctl color_sel_bg "${w[4]}" jgctl color_sel_fg "${w[-1]}" jgctl color_sel_border "${w[3]}" @@ -33,6 +34,7 @@ menu_theme () { *) #light bg jgctl color_menu_bg "${w[-1]}" jgctl color_menu_bg_to "${w[-2]}" + jgctl color_menu_border "${w[-3]}" jgctl color_norm_fg "${w[1]}" jgctl color_title_bg "${w[-3]}" jgctl color_title_fg "${w[1]}" @@ -46,6 +48,7 @@ menu_theme () { esac } conky_colors() { + source ~/.config/colorizer/colorizer.conf case "$1" in dark) #dark bg conkyctl win_bgcolor_all "${w[0]}" @@ -53,6 +56,12 @@ conky_colors() { conkyctl color0_all "${w[-3]}" conkyctl color1_all "${w[-4]}" conkyctl color2_all "${w[-5]}" + if [[ $conky_diff_colors == "yes" ]];then + conkyctl win_bgcolor ${w[2]} "$HOME/.config/conky/mabox_tools_mbcolor.conkyrc" + conkyctl win_bgcolor ${w[1]} "$HOME/.config/conky/shortcuts_mbcolor.conkyrc" + conkyctl win_bgcolor ${w[3]} "$HOME/.config/conky/tiling_terminal_mbcolor.conkyrc" + fi + ;; *) #light bg conkyctl win_bgcolor_all "${w[-1]}" @@ -60,6 +69,11 @@ conky_colors() { conkyctl color0_all "${w[2]}" conkyctl color1_all "${w[4]}" conkyctl color2_all "${w[6]}" + if [[ $conky_diff_colors == "yes" ]];then + conkyctl win_bgcolor ${w[-3]} "$HOME/.config/conky/mabox_tools_mbcolor.conkyrc" + conkyctl win_bgcolor ${w[-5]} "$HOME/.config/conky/shortcuts_mbcolor.conkyrc" + conkyctl win_bgcolor ${w[-4]} "$HOME/.config/conky/tiling_terminal_mbcolor.conkyrc" + fi ;; esac } @@ -94,24 +108,87 @@ accent () { colorTo=$(pastel darken 0.2 "${1}"|pastel format hex) obtctl clractivebgto ${colorTo} # JGMENU based menus, sidepanels and tools - jgctl color_title_bg ${1} + #jgctl color_title_bg ${1} #TITLE_FG=$(pastel textcolor ${colorTo}|pastel format hex) - TITLE_FG=$(pastel textcolor ${1}|pastel format hex) + #TITLE_FG=$(pastel textcolor ${1}|pastel format hex) #notify-send.sh "title_fg $TITLE_FG" "${w[1]} ${w[-1]}" - if [[ "${TITLE_FG}" == *"ffffff"* ]];then - FG=${w[-2]} - BBG=${w[1]} - else - FG=${w[2]} - BBG=${w[1]} - fi + #if [[ "${TITLE_FG}" == *"ffffff"* ]];then + #FG=${w[-2]} + #BBG=${w[1]} + #else + #FG=${w[2]} + #BBG=${w[1]} + #fi SEL_FG=$(pastel textcolor ${1}|pastel format hex) - jgctl color_title_fg ${FG} + #jgctl color_title_fg ${FG} #jgctl color_title_border ${BBG} jgctl color_sel_bg ${1} + jgctl color_sel_bg 100 jgctl color_sel_fg ${SEL_FG} } +gradient () { + source ~/.config/colorizer/colorizer.conf + #notify-send.sh "zmiennne" "${1} ${2}" + if [ "$gradient_obtheme" = "yes" ]; then + obtctl activegradient "${1}" "${2}" + fi + if [ "$gradient_menu" = "yes" ]; then + jgctl gradient "${1}" "${2}" + fi + if [ "$gradient_conkies" = "yes" ]; then + conkygradient "${1}" "${2}" + fi +} +conkygradient () { + CONKYDIR="$HOME"/.config/conky + for i in "$CONKYDIR"/*_mbcolor*; do + if [[ "$i" = *"sysinfo_graph"* ]];then + conkyctl win_bgcolor ${1} ${i} + FG_COLOR=$(pastel textcolor ${1}|pastel format hex) + if [[ "${FG_COLOR}" == *"ffffff"* ]]; then + conkyctl default_color ${w[-1]} ${i} + conkyctl color0 ${w[-2]} ${i} + conkyctl color1 ${w[-3]} ${i} + else + conkyctl default_color ${w[0]} ${i} + conkyctl color0 ${w[1]} ${i} + conkyctl color1 ${w[2]} ${i} + fi + conkyctl color2 ${2} ${i} + elif [[ "$i" = *"sysinfo_mb"* ]];then + conkyctl win_bgcolor ${2} ${i} + FG_COLOR=$(pastel textcolor ${2}|pastel format hex) + if [[ "${FG_COLOR}" == *"ffffff"* ]]; then + conkyctl default_color ${w[-1]} ${i} + conkyctl color0 ${w[-2]} ${i} + conkyctl color1 ${w[-3]} ${i} + else + conkyctl default_color ${w[0]} ${i} + conkyctl color0 ${w[1]} ${i} + conkyctl color1 ${w[2]} ${i} + fi + conkyctl color2 ${1} ${i} + elif [[ "$i" == *"logo"* ]];then + : + else + ran="$((RANDOM % 8))" + rand=$((ran + 1)) + BG=$(pastel mix -f 0.${rand} ${1} ${2}|pastel format hex) + conkyctl win_bgcolor ${BG} ${i} + FG_COLOR=$(pastel textcolor ${BG}|pastel format hex) + if [[ "${FG_COLOR}" == *"ffffff"* ]]; then + conkyctl default_color ${w[-1]} ${i} + conkyctl color0 ${w[-2]} ${i} + conkyctl color1 ${w[-3]} ${i} + else + conkyctl default_color ${w[0]} ${i} + conkyctl color0 ${w[1]} ${i} + conkyctl color1 ${w[2]} ${i} + fi + fi + done +} colorize () { source ~/.config/colorizer/colorizer.conf @@ -141,6 +218,14 @@ colorize () { esac # Openbox 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)" @@ -156,8 +241,10 @@ reverse () { source ~/.config/colorizer/colorizer.conf # CONKY case "$wall2themes_conky" in - dark) conky_colors light;; - light) conky_colors dark;; + dark) conky_colors light + ;; + light) conky_colors dark + ;; *) : ;; esac # ACCENT_COLOR @@ -210,6 +297,7 @@ case "$1" in conky) conky_colors "$2";; pyradio) pyradio_theme "$2";; accent) accent "$2";; + gradient) gradient "$2" "$3";; colorize) colorize;; reverse) reverse;; pin) pin;; diff --git a/share/mabox-colorizer/gradients_all.inc b/share/mabox-colorizer/gradients_all.inc new file mode 100644 index 0000000..4925af0 --- /dev/null +++ b/share/mabox-colorizer/gradients_all.inc @@ -0,0 +1,362 @@ +#9400D3 #4B0082 Farhan +#c84e89 #F15F79 Purple +#00F5A0 #00D9F5 Ibtesam +#F7941E #004E8F The Sky And The Sea +#72C6EF #004E8F From Ice To Fire +#FD8112 #0085CA Blue And Orange +#bf5ae0 #a811da Purple Dream +#00416A #E4E5E6 Blu +#fbed96 #abecd6 Summer Breeze +#FFE000 #799F0C Ver +#F7F8F8 #ACBB78 Ver Black +#334d50 #cbcaa5 Anwar +#799F0C #ACBB78 Reaqua +#ffe259 #ffa751 Mango +#00416A #E4E5E6 Bupe +#FFE000 #799F0C Rea +#acb6e5 #86fde8 Windy +#536976 #292E49 Royal Blue +#B79891 #94716B Copper +#9796f0 #fbc7d4 Anamnisar +#BBD2C5 #536976 Petrol +#076585 #ffffff Sky +#00467F #A5CC82 Sel +#000C40 #607D8B Afternoon +#1488CC #2B32B2 Skyline +#ec008c #fc6767 DIMIGO +#cc2b5e #753a88 Purple Love +#2193b0 #6dd5ed Sexy Blue +#e65c00 #F9D423 Blooker20 +#2b5876 #4e4376 Sea Blue +#314755 #26a0da Nimvelo +#ff6e7f #bfe9ff Noon to Dusk +#e52d27 #b31217 YouTube +#603813 #b29f94 Cool Brown +#16A085 #F4D03F Harmonic Energy +#D31027 #EA384D Playing with Reds +#EDE574 #E1F5C4 Sunny Days +#02AAB0 #00CDAC Green Beach +#DA22FF #9733EE Intuitive Purple +#348F50 #56B4D3 Emerald Water +#3CA55C #B5AC49 Lemon Twist +#003973 #E5E5BE Horizon +#E55D87 #5FC3E4 Rose Water +#403B4A #E7E9BB Frozen +#F09819 #EDDE5D Mango Pulp +#FF512F #DD2476 Bloody Mary +#AA076B #61045F Aubergine +#1A2980 #26D0CE Aqua Marine +#FF512F #F09819 Sunrise +#1D2B64 #F8CDDA Purple Paradise +#4CB8C4 #3CD3AD Sea Weed +#DD5E89 #F7BB97 Pinky +#EB3349 #F45C43 Cherry +#1D976C #93F9B9 Mojito +#FF8008 #FFC837 Juicy Orange +#16222A #3A6073 Mirage +#1F1C2C #928DAB Steel Gray +#614385 #516395 Kashmir +#4776E6 #8E54E9 Electric Violet +#085078 #85D8CE Venice Blue +#2BC0E4 #EAECC6 Bora Bora +#134E5E #71B280 Moss +#5C258D #4389A2 Shroom Haze +#757F9A #D7DDE8 Mystic +#232526 #414345 Midnight City +#1CD8D2 #93EDC7 Sea Blizz +#3D7EAA #FFE47A Opa +#283048 #859398 Titanium +#24C6DC #514A9D Mantle +#DC2424 #4A569D Dracula +#ED4264 #FFEDBC Peach +#DAE2F8 #D6A4A4 Moonrise +#ECE9E6 #FFFFFF Clouds +#7474BF #348AC7 Stellar +#EC6F66 #F3A183 Bourbon +#5f2c82 #49a09d Calm Darya +#C04848 #480048 Influenza +#e43a15 #e65245 Shrimpy +#414d0b #727a17 Army +#FC354C #0ABFBC Miaka +#4b6cb7 #182848 Pinot Noir +#f857a6 #ff5858 Day Tripper +#a73737 #7a2828 Namn +#d53369 #cbad6d Blurry Beach +#e9d362 #333333 Vasily +#DE6262 #FFB88C A Lost Memory +#666600 #999966 Petrichor +#FFEEEE #DDEFBB Jonquil +#EFEFBB #D4D3DD Sirius Tamed +#c21500 #ffc500 Kyoto +#215f00 #e4e4d9 Misty Meadow +#50C9C3 #96DEDA Aqualicious +#616161 #9bc5c3 Moor +#ddd6f3 #faaca8 Almost +#5D4157 #A8CABA Forever Lost +#E6DADA #274046 Winter +#f2709c #ff9472 Nelson +#DAD299 #B0DAB9 Autumn +#D3959B #BFE6BA Candy +#00d2ff #3a7bd5 Reef +#870000 #190A05 The Strain +#B993D6 #8CA6DB Dirty Fog +#649173 #DBD5A4 Earthly +#C9FFBF #FFAFBD Virgin +#606c88 #3f4c6b Ash +#FBD3E9 #BB377D Cherryblossoms +#ADD100 #7B920A Parklife +#FF4E50 #F9D423 Dance To Forget +#F0C27B #4B1248 Starfall +#000000 #e74c3c Red Mist +#AAFFA9 #11FFBD Teal Love +#B3FFAB #12FFF7 Neon Life +#780206 #061161 Man of Steel +#9D50BB #6E48AA Amethyst +#556270 #FF6B6B Cheer Up Emo Kid +#70e1f5 #ffd194 Shore +#00c6ff #0072ff Facebook Messenger +#fe8c00 #f83600 SoundCloud +#52c234 #061700 Behongo +#485563 #29323c ServQuick +#83a4d4 #b6fbff Friday +#FDFC47 #24FE41 Martini +#abbaab #ffffff Metallic Toad +#73C8A9 #373B44 Between The Clouds +#D38312 #A83279 Crazy Orange I +#1e130c #9a8478 Hersheys +#948E99 #2E1437 Talking To Mice Elf +#360033 #0b8793 Purple Bliss +#FFA17F #00223E Predawn +#43cea2 #185a9d Endless River +#ffb347 #ffcc33 Pastel Orange at the Sun +#6441A5 #2a0845 Twitch +#ff0084 #33001b Flickr +#00bf8f #001510 Vine +#136a8a #267871 Turquoise flow +#8e9eab #eef2f3 Portrait +#7b4397 #dc2430 Virgin America +#D1913C #FFD194 Koko Caramel +#F1F2B5 #135058 Fresh Turboscent +#6A9113 #141517 Green to dark +#004FF9 #FFF94C Ukraine +#525252 #3d72b4 Curiosity Blue +#BA8B02 #181818 Dark Knight +#ee9ca7 #ffdde1 Piglet +#304352 #d7d2cc Lizard +#CCCCB2 #757519 Sage Persuasion +#2c3e50 #3498db Between Night and Day +#fc00ff #00dbde Timber +#e53935 #e35d5b Passion +#005C97 #363795 Clear Sky +#f46b45 #eea849 Master Card +#00C9FF #92FE9D Back To Earth +#673AB7 #512DA8 Deep Purple +#76b852 #8DC26F Little Leaf +#8E0E00 #1F1C18 Netflix +#FFB75E #ED8F03 Light Orange +#c2e59c #64b3f4 Green and Blue +#403A3E #BE5869 Poncho +#C02425 #F0CB35 Back to the Future +#B24592 #F15F79 Blush +#457fca #5691c8 Inbox +#6a3093 #a044ff Purplin +#eacda3 #d6ae7b Pale Wood +#fd746c #ff9068 Haikus +#114357 #F29492 Pizelex +#1e3c72 #2a5298 Joomla +#2F7336 #AA3A38 Christmas +#5614B0 #DBD65C Minnesota Vikings +#4DA0B0 #D39D38 Miami Dolphins +#5A3F37 #2C7744 Forest +#2980b9 #2c3e50 Nighthawk +#0099F7 #F11712 Superman +#834d9b #d04ed6 Suzy +#4B79A1 #283E51 Dark Skies +#000000 #434343 Deep Space +#4CA1AF #C4E0E5 Decent +#E0EAFC #CFDEF3 Colors Of Sky +#BA5370 #F4E2D8 Purple White +#ff4b1f #1fddff Ali +#f7ff00 #db36a4 Alihossein +#a80077 #66ff00 Shahabi +#1D4350 #A43931 Red Ocean +#EECDA3 #EF629F Tranquil +#16BFFD #CB3066 Transfile +#ff4b1f #ff9068 Sylvia +#FF5F6D #FFC371 Sweet Morning +#2196f3 #f44336 Politics +#00d2ff #928DAB Bright Vault +#3a7bd5 #3a6073 Solid Vault +#0B486B #F56217 Sunset +#e96443 #904e95 Grapefruit Sunset +#2C3E50 #4CA1AF Deep Sea Space +#2C3E50 #FD746C Dusk +#F00000 #DC281E Minimal Red +#141E30 #243B55 Royal +#42275a #734b6d Mauve +#000428 #004e92 Frost +#56ab2f #a8e063 Lush +#cb2d3e #ef473a Firewatch +#f79d00 #64f38c Sherbert +#f85032 #e73827 Blood Red +#fceabb #f8b500 Sun on the Horizon +#808080 #3fada8 IIIT Delhi +#ffd89b #19547b Jupiter +#bdc3c7 #2c3e50 50 Shades of Grey +#BE93C5 #7BC6CC Dania +#A1FFCE #FAFFD1 Limeade +#4ECDC4 #556270 Disco +#3a6186 #89253e Love Couple +#ef32d9 #89fffd Azure Pop +#de6161 #2657eb Nepal +#ff00cc #333399 Cosmic Fusion +#fffc00 #ffffff Snapchat +#ff7e5f #feb47b Ed's Sunset Gradient +#00c3ff #ffff1c Brady Brady Fun Fun +#f4c4f3 #fc67fa Black Rosé +#41295a #2F0743 80's Purple +#ee0979 #ff6a00 Ibiza Sunset +#F3904F #3B4371 Dawn +#67B26F #4ca2cd Mild +#3494E6 #EC6EAD Vice City +#DBE6F6 #C5796D Jaipur +#c0c0aa #1cefff Cocoaa Ice +#DCE35B #45B649 EasyMed +#E8CBC0 #636FA4 Rose Colored Lenses +#F0F2F0 #000C40 What lies Beyond +#FFAFBD #ffc3a0 Roseanna +#43C6AC #F8FFAE Honey Dew +#093028 #237A57 Under the Lake +#43C6AC #191654 The Blue Lagoon +#4568DC #B06AB3 Can You Feel The Love Tonight +#0575E6 #021B79 Very Blue +#200122 #6f0000 Love and Liberty +#44A08D #093637 Orca +#6190E8 #A7BFE8 Venice +#34e89e #0f3443 Pacific Dream +#F7971E #FFD200 Learning and Leading +#C33764 #1D2671 Celestial +#20002c #cbb4d4 Purplepine +#D66D75 #E29587 Sha la la +#30E8BF #FF8235 Mini +#B2FEFA #0ED2F7 Maldives +#4AC29A #BDFFF3 Cinnamint +#E44D26 #F16529 Html +#EB5757 #000000 Coal +#F2994A #F2C94C Sunkist +#56CCF2 #2F80ED Blue Skies +#007991 #78ffd6 Chitty Chitty Bang Bang +#000046 #1CB5E0 Visions of Grandeur +#159957 #155799 Crystal Clear +#c0392b #8e44ad Mello +#EF3B36 #FFFFFF Compare Now +#283c86 #45a247 Meridian +#CB356B #BD3F32 Alive +#36D1DC #5B86E5 Scooter +#000000 #0f9b0f Terminal +#1c92d2 #f2fcfe Telegram +#642B73 #C6426E Crimson Tide +#06beb6 #48b1bf Socialive +#d9a7c7 #fffcdc Broken Hearts +#396afc #2948ff Kimoby Is The New Blue +#C9D6FF #E2E2E2 Dull +#7F00FF #E100FF Purpink +#ff9966 #ff5e62 Orange Coral +#22c1c3 #fdbb2d Summer +#e1eec3 #f05053 Velvet Sun +#6D6027 #D3CBB8 Lithium +#74ebd5 #ACB6E5 Digital Water +#fc4a1a #f7b733 Orange Fun +#00F260 #0575E6 Rainbow Blue +#800080 #ffc0cb Pink Flavour +#CAC531 #F3F9A7 Sulphur +#3C3B3F #605C3C Selenium +#D3CCE3 #E9E4F0 Delicate +#00b09b #96c93d Ohhappiness +#fffbd5 #b20a2c Relaxing Red +#23074d #cc5333 Taran Tado +#c94b4b #4b134f Bighead +#FC466B #3F5EFB Sublime Vivid +#FC5C7D #6A82FB Sublime Light +#108dc7 #ef8e38 Pun Yeta +#11998e #38ef7d Quepal +#3E5151 #DECBA4 Sand to Blue +#bc4e9c #f80759 Shifter +#4e54c8 #8f94fb Moon Purple +#333333 #dd1818 Pure Lust +#a8c0ff #3f2b96 Slight Ocean View +#ad5389 #3c1053 eXpresso +#636363 #a2ab58 Shifty +#DA4453 #89216B Vanusa +#005AA7 #FFFDE4 Evening Night +#FFEFBA #FFFFFF Margo +#00B4DB #0083B0 Blue Raspberry +#FDC830 #F37335 Citrus Peel +#ED213A #93291E Sin City Red +#a8ff78 #78ffd6 Summer Dog +#FF416C #FF4B2B Burning Orange +#654ea3 #eaafc8 Ultra Voilet +#009FFF #ec2F4B By Design +#544a7d #ffd452 Kyoo Tah +#8360c3 #2ebf91 Kye Meh +#dd3e54 #6be585 Kyoo Pal +#659999 #f4791f Metapolis +#f12711 #f5af19 Flare +#c31432 #240b36 Witching Hour +#f953c6 #b91d73 Neuromancer +#1f4037 #99f2c8 Harvey +#8E2DE2 #4A00E0 Amin +#FF0099 #493240 Yoda +#373B44 #4286f4 Dark Ocean +#b92b27 #1565C0 Evening Sunshine +#2193b0 #6dd5ed Cool Blues +#ee9ca7 #ffdde1 Piggy Pink +#bdc3c7 #2c3e50 Grade Grey +#2A2D3E #FECB6E Zenta +#6025F5 #FF5555 Lensod +#004680 #4484BA Dark Blu Two +#7ec6bc #ebe717 Lemon Lime +#de8a41 #2ada53 Mango Papaya +#ff0000 #fdcf58 Flame +#36B1C7 #960B33 Blue Red +#1DA1F2 #009ffc Twitter +#B5B9FF #2B2C49 Blue Slate +#9FA0A8 #5C7852 Space Light Green +#DCFFBD #CC86D1 Flower +#E6AE8C #A8CECF Peach Sea +#00fff0 #0083fe Abbas +#05386b #5cdb95 Emerald Sea +#4284DB #29EAC4 Bleem +#554023 #c99846 Coffee Gold +#516b8b #056b3b Compass +#D70652 #FF025E Andreuzza's +#152331 #000000 Moonwalker +#59CDE9 #0A2A88 Hyper Blue +#81ff8a #64965e Neon Green +#d4fc79 #96e6a1 Dusty Grass +#003d4d #00c996 Visual Blue +#2E3192 #1BFFFF Ocean Blue +#D4145A #FBB03B Sanguine +#009245 #FCEE21 Luscious Lime +#662D8C #ED1E79 Purple Lake +#EE9CA7 #FFDDE1 Piglet +#614385 #516395 Kashmir +#02AABD #00CDAC Green Beach +#FF512F #DD2476 Bloody Mary +#FF5F6D #FFC371 Sweet Morning +#11998E #38EF7D Quepal +#C6EA8D #FE90AF Cactus +#EA8D8D #A890FE Yosemite +#D8B5FF #1EAE98 Antarctica +#FF61D2 #FE9090 Exotic +#BFF098 #6FD6FF Toxic +#4E65FF #92EFFD Orbit +#A9F1DF #FFBBBB No Mans +#C33764 #1D2671 Celestial +#93A5CF #E4EfE9 Clean Mirror +#868F96 #596164 Mountain Rock +#09203F #537895 Eternal Constance +#FFECD2 #FCB69F Juicy Peach +#A1C4FD #C2E9FB Winter Neva +#764BA2 #667EEA Plum Plate +#FDFCFB #E2D1C3 Everlasting Sky diff --git a/share/mabox-colorizer/help/en.html b/share/mabox-colorizer/help/en.html index 1d8a6dc..2cac771 100644 --- a/share/mabox-colorizer/help/en.html +++ b/share/mabox-colorizer/help/en.html @@ -26,10 +26,11 @@ div.fixeddown {
- - + + + Launch Colorizer @@ -184,6 +185,13 @@ You can change all of them to you liking afterwards.
+ + + - + + + +