diff --git a/bin/gtkctl b/bin/gtkctl index 91f77d2..58d2c47 100755 --- a/bin/gtkctl +++ b/bin/gtkctl @@ -39,21 +39,23 @@ adwaita|black|blue|bluegrey|breeze|brown|carmine|cyan|darkcyan|deeporange|green| exit 1 esac -if [ -f "${ICON_DIR}/Papirus-Mabox-$1/index.theme" ];then +[[ "$2" == "-d" ]] && VARIANT="Dark-" || VARIANT="" + +if [ -f "${ICON_DIR}/Papirus-Mabox-${VARIANT}${1}/index.theme" ];then TITLE="Icons theme changed!" -TEXT="Papirus folders color: ${1^}" -icons Papirus-Mabox-$1 -notify-send.sh -u normal -i "${ICON_DIR}/Papirus-Mabox-$1/64x64/places/folder-linux.svg" "$TITLE" "$TEXT" +TEXT="Papirus folders color: ${VARIANT}${1^}" +icons Papirus-Mabox-${VARIANT}${1} +notify-send.sh -u normal -i "${ICON_DIR}/Papirus-Mabox-${VARIANT}${1}/64x64/places/folder-linux.svg" "$TITLE" "$TEXT" else TITLE="Please wait..." -TEXT="Preparing ${1} folder color icons" +TEXT="Preparing ${VARIANT}${1} folder color icons" TITLE2="Success!" -TEXT2="${1^} icons color variant generated successfully" -notify-send.sh -u critical -i /usr/share/icons/Papirus/64x64/places/folder-${1}.svg -R /tmp/papicon "$TITLE" "$TEXT" -papirus-folder-color.sh -c ${1} -notify-send.sh -u normal -i "${ICON_DIR}/Papirus-Mabox-$1/64x64/places/folder-linux.svg" -R /tmp/papicon "$TITLE2" "$TEXT2" -icons Papirus-Mabox-$1 +TEXT2="${VARIANT}${1^} icons color variant generated successfully" +notify-send.sh -u critical -i /usr/share/icons/Papirus/64x64/places/folder-${VARIANT}${1}.svg -R /tmp/papicon "$TITLE" "$TEXT" +papirus-folder-color.sh -c ${1} ${2} +notify-send.sh -u normal -i "${ICON_DIR}/Papirus-Mabox-${VARIANT}${1}/64x64/places/folder-linux.svg" -R /tmp/papicon "$TITLE2" "$TEXT2" +icons Papirus-Mabox-${VARIANT}${1} fi } @@ -65,6 +67,6 @@ case "$1" in get_icons)get_icons "$2";; theme)theme "$2";; icons)icons "$2";; - papcolor)papcolor "$2";; + papcolor)papcolor "$2" "$3";; *):;; esac diff --git a/bin/w2theme b/bin/w2theme index 46f7369..4414187 100755 --- a/bin/w2theme +++ b/bin/w2theme @@ -57,6 +57,7 @@ menu_theme () { jgctl color_sel_fg "${w[-1]}" jgctl color_sel_border "${w[3]}" jgctl color_sep_fg "${w[3]}" + jgctl color_norm_bg "${w[2]}" #sleep 1 ;; *) #light bg @@ -71,6 +72,7 @@ menu_theme () { jgctl color_sel_fg "${w[0]}" jgctl color_sel_border "${w[-4]}" jgctl color_sep_fg "${w[-5]}" + jgctl color_norm_bg "${w[-1]}" #sleep 1 ;; esac diff --git a/share/mabox-colorizer/help/en.html b/share/mabox-colorizer/help/en.html index 8c417c2..a521c10 100644 --- a/share/mabox-colorizer/help/en.html +++ b/share/mabox-colorizer/help/en.html @@ -95,11 +95,14 @@ h5 {font-size: 2vw !important;border-bottom: 1px solid;padding-left: 1em;} flex-direction: column;**/ justify-content: center; } -.grid div.i{background-color:#191919;} -.grid div.i a{text-decoration:none;display:block;border-radius: 4px;margin: -1em;padding:1em;} +.grid div.i{background-color:#191919;padding: 6px 2px 2px 2px;} +.grid div.i a{text-decoration:none;margin-top:4px;} +.grid div.i a.light-gray{border-radius: 4px 0 0 4px;} +.grid div.i a.dark-gray{border-radius: 0 4px 4px 0;} .gi2 {grid-column: span 2;} .gi3 {grid-column: span 3;} .gi4 {grid-column: span 4;} +.gi5 {grid-column: span 5;} .gi22 { grid-column: span 2; grid-row: span 2; @@ -675,141 +678,119 @@ If you add more commands, a menu will be shown.

 Configure directories