From d0baf27b324e80ae81b04c2827c6079ca72a86bb Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Thu, 31 Oct 2024 11:04:00 +0800 Subject: [PATCH] Fixed issues --- install.sh | 217 +++++++++++++++++- lib_colors.sh | 191 --------------- src/apps/scalable/arduino.svg | 8 +- src/apps/scalable/com.leinardi.gst.svg | 12 +- src/apps/scalable/deluge.svg | 10 +- src/apps/scalable/eudic.svg | 18 +- src/apps/scalable/file-manager.svg | 26 ++- src/apps/scalable/gpt.svg | 8 +- src/apps/scalable/monkeytype.svg | 8 +- src/apps/scalable/org.xfce.Gigolo.svg | 30 ++- .../scalable/org.xfce.panel.directorymenu.svg | 27 ++- src/apps/scalable/wine-winefile.svg | 18 +- src/devices/symbolic/auth-otp-symbolic.svg | 8 + .../symbolic/computer-chip-symbolic.svg | 10 + src/devices/symbolic/dock-symbolic.svg | 9 + src/devices/symbolic/dock-usb-symbolic.svg | 6 + src/devices/symbolic/gpu-symbolic.svg | 4 + src/devices/symbolic/usb-hub-symbolic.svg | 3 + .../symbolic/usb-receiver-symbolic.svg | 11 + 19 files changed, 412 insertions(+), 212 deletions(-) delete mode 100755 lib_colors.sh create mode 100644 src/devices/symbolic/auth-otp-symbolic.svg create mode 100644 src/devices/symbolic/computer-chip-symbolic.svg create mode 100644 src/devices/symbolic/dock-symbolic.svg create mode 100644 src/devices/symbolic/dock-usb-symbolic.svg create mode 100644 src/devices/symbolic/gpu-symbolic.svg create mode 100644 src/devices/symbolic/usb-hub-symbolic.svg create mode 100644 src/devices/symbolic/usb-receiver-symbolic.svg diff --git a/install.sh b/install.sh index dcc6f28c..ace48ad6 100755 --- a/install.sh +++ b/install.sh @@ -14,12 +14,14 @@ fi SRC_DIR="$(cd "$(dirname "$0")" && pwd)" -source "${SRC_DIR}/lib_colors.sh" - THEME_NAME=Colloid -COLOR_VARIANTS=('-Light' '-Dark' '') THEME_VARIANTS=('' '-Purple' '-Pink' '-Red' '-Orange' '-Yellow' '-Green' '-Teal' '-Grey') SCHEME_VARIANTS=('' '-Nord' '-Dracula' '-Gruvbox' '-Everforest' '-Catppuccin') +COLOR_VARIANTS=('-Light' '-Dark' '') + +themes=() +schemes=() +colors=() usage() { cat << EOF @@ -62,9 +64,10 @@ install() { colors_folder - if [[ "${theme}" != '' ]]; then + if [[ "${scheme}" != '' ]]; then cp -r "${SRC_DIR}"/notint/*.svg "${THEME_DIR}"/places/scalable sed -i "s/#60c0f0/${theme_color}/g" "${THEME_DIR}"/places/scalable/*.svg + sed -i "s/#60c0f0/${theme_color}/g" "${THEME_DIR}"/apps/scalable/*.svg fi cp -r "${SRC_DIR}"/links/* "${THEME_DIR}" @@ -133,6 +136,198 @@ install() { gtk-update-icon-cache "${THEME_DIR}" } +colors_folder() { + case "$theme" in + '') + theme_color='#5b9bf8' + ;; + -Purple) + theme_color='#BA68C8' + ;; + -Pink) + theme_color='#F06292' + ;; + -Red) + theme_color='#F44336' + ;; + -Orange) + theme_color='#FB8C00' + ;; + -Yellow) + theme_color='#FFD600' + ;; + -Green) + theme_color='#66BB6A' + ;; + -Teal) + theme_color='#4DB6AC' + ;; + -Grey) + theme_color='#888888' + ;; + esac + + if [[ "$scheme" == '-Nord' ]]; then + case "$theme" in + '') + theme_color='#89a3c2' + ;; + -Purple) + theme_color='#c89dbf' + ;; + -Pink) + theme_color='#dc98b1' + ;; + -Red) + theme_color='#d4878f' + ;; + -Orange) + theme_color='#dca493' + ;; + -Yellow) + theme_color='#eac985' + ;; + -Green) + theme_color='#a0c082' + ;; + -Teal) + theme_color='#83b9b8' + ;; + -Grey) + theme_color='#757a99' + ;; + esac + fi + + if [[ "$scheme" == '-Dracula' ]]; then + case "$theme" in + '') + theme_color='#6272a4' + ;; + -Purple) + theme_color='#bd93f9' + ;; + -Pink) + theme_color='#ff79c6' + ;; + -Red) + theme_color='#ff5555' + ;; + -Orange) + theme_color='#ffb86c' + ;; + -Yellow) + theme_color='#f1fa8c' + ;; + -Green) + theme_color='#50fa7b' + ;; + -Teal) + theme_color='#50fae9' + ;; + -Grey) + theme_color='#757a99' + ;; + esac + fi + + if [[ "$scheme" == '-Gruvbox' ]]; then + case "$theme" in + '') + theme_color='#83a598' + ;; + -Purple) + theme_color='#d386cd' + ;; + -Pink) + theme_color='#d3869b' + ;; + -Red) + theme_color='#fb4934' + ;; + -Orange) + theme_color='#fe8019' + ;; + -Yellow) + theme_color='#fabd2f' + ;; + -Green) + theme_color='#b8bb26' + ;; + -Teal) + theme_color='#8ec07c' + ;; + -Grey) + theme_color='#868686' + ;; + esac + fi + + if [[ "$scheme" == '-Everforest' ]]; then + case "$theme" in + '') + theme_color='#7fbbb3' + ;; + -Purple) + theme_color='#D699B6' + ;; + -Pink) + theme_color='#d3869b' + ;; + -Red) + theme_color='#E67E80' + ;; + -Orange) + theme_color='#E69875' + ;; + -Yellow) + theme_color='#DBBC7F' + ;; + -Green) + theme_color='#A7C080' + ;; + -Teal) + theme_color='#83C092' + ;; + -Grey) + theme_color='#7a8478' + ;; + esac + fi + + if [[ "$scheme" == '-Catppuccin' ]]; then + case "$theme" in + '') + theme_color='#8caaee' + ;; + -Purple) + theme_color='#ca9ee6' + ;; + -Pink) + theme_color='#f4b8e4' + ;; + -Red) + theme_color='#ea999c' + ;; + -Orange) + theme_color='#fe8019' + ;; + -Yellow) + theme_color='#ef9f76' + ;; + -Green) + theme_color='#a6d189' + ;; + -Teal) + theme_color='#81c8be' + ;; + -Grey) + theme_color='#7c7f93' + ;; + esac + fi +} + while [[ "$#" -gt 0 ]]; do case "${1:-}" in -d|--dest) @@ -164,32 +359,32 @@ while [[ "$#" -gt 0 ]]; do ;; nord) schemes+=("${SCHEME_VARIANTS[1]}") - echo -e "\nNord ColorScheme version! ..." + echo -e "\nNord ColorScheme version! ...\n" shift ;; dracula) schemes+=("${SCHEME_VARIANTS[2]}") - echo -e "\nDracula ColorScheme version! ..." + echo -e "\nDracula ColorScheme version! ...\n" shift ;; gruvbox) schemes+=("${SCHEME_VARIANTS[3]}") - echo -e "\nGruvbox ColorScheme version! ..." + echo -e "\nGruvbox ColorScheme version! ...\n" shift ;; everforest) schemes+=("${SCHEME_VARIANTS[4]}") - echo -e "\nEverforest ColorScheme version! ..." + echo -e "\nEverforest ColorScheme version! ...\n" shift ;; catppuccin) schemes+=("${SCHEME_VARIANTS[5]}") - echo -e "\nCatppuccin ColorScheme version! ..." + echo -e "\nCatppuccin ColorScheme version! ...\n" shift ;; all) schemes+=("${SCHEME_VARIANTS[@]}") - echo -e "\All ColorSchemes version! ..." + echo -e "\All ColorSchemes version! ...\n" shift ;; -*|--*) @@ -313,7 +508,7 @@ install_theme() { done } -clean_old_theme +#clean_old_theme if [[ "${remove}" == 'true' ]]; then remove_theme diff --git a/lib_colors.sh b/lib_colors.sh deleted file mode 100755 index 62d66c50..00000000 --- a/lib_colors.sh +++ /dev/null @@ -1,191 +0,0 @@ -colors_folder() { - case "$theme" in - '') - theme_color='#5b9bf8' - ;; - -Purple) - theme_color='#BA68C8' - ;; - -Pink) - theme_color='#F06292' - ;; - -Red) - theme_color='#F44336' - ;; - -Orange) - theme_color='#FB8C00' - ;; - -Yellow) - theme_color='#FFD600' - ;; - -Green) - theme_color='#66BB6A' - ;; - -Teal) - theme_color='#4DB6AC' - ;; - -Grey) - theme_color='#888888' - ;; - esac - - if [[ "$scheme" == '-Nord' ]]; then - case "$theme" in - '') - theme_color='#89a3c2' - ;; - -Purple) - theme_color='#c89dbf' - ;; - -Pink) - theme_color='#dc98b1' - ;; - -Red) - theme_color='#d4878f' - ;; - -Orange) - theme_color='#dca493' - ;; - -Yellow) - theme_color='#eac985' - ;; - -Green) - theme_color='#a0c082' - ;; - -Teal) - theme_color='#83b9b8' - ;; - -Grey) - theme_color='#757a99' - ;; - esac - fi - - if [[ "$scheme" == '-Dracula' ]]; then - case "$theme" in - '') - theme_color='#6272a4' - ;; - -Purple) - theme_color='#bd93f9' - ;; - -Pink) - theme_color='#ff79c6' - ;; - -Red) - theme_color='#ff5555' - ;; - -Orange) - theme_color='#ffb86c' - ;; - -Yellow) - theme_color='#f1fa8c' - ;; - -Green) - theme_color='#50fa7b' - ;; - -Teal) - theme_color='#50fae9' - ;; - -Grey) - theme_color='#757a99' - ;; - esac - fi - - if [[ "$scheme" == '-Gruvbox' ]]; then - case "$theme" in - '') - theme_color='#83a598' - ;; - -Purple) - theme_color='#d386cd' - ;; - -Pink) - theme_color='#d3869b' - ;; - -Red) - theme_color='#fb4934' - ;; - -Orange) - theme_color='#fe8019' - ;; - -Yellow) - theme_color='#fabd2f' - ;; - -Green) - theme_color='#b8bb26' - ;; - -Teal) - theme_color='#8ec07c' - ;; - -Grey) - theme_color='#868686' - ;; - esac - fi - - if [[ "$scheme" == '-Everforest' ]]; then - case "$theme" in - '') - theme_color='#7fbbb3' - ;; - -Purple) - theme_color='#D699B6' - ;; - -Pink) - theme_color='#d3869b' - ;; - -Red) - theme_color='#E67E80' - ;; - -Orange) - theme_color='#E69875' - ;; - -Yellow) - theme_color='#DBBC7F' - ;; - -Green) - theme_color='#A7C080' - ;; - -Teal) - theme_color='#83C092' - ;; - -Grey) - theme_color='#7a8478' - ;; - esac - fi - - if [[ "$scheme" == '-Catppuccin' ]]; then - case "$theme" in - '') - theme_color='#8caaee' - ;; - -Purple) - theme_color='#ca9ee6' - ;; - -Pink) - theme_color='#f4b8e4' - ;; - -Red) - theme_color='#ea999c' - ;; - -Orange) - theme_color='#fe8019' - ;; - -Yellow) - theme_color='#ef9f76' - ;; - -Green) - theme_color='#a6d189' - ;; - -Teal) - theme_color='#81c8be' - ;; - -Grey) - theme_color='#7c7f93' - ;; - esac - fi -} diff --git a/src/apps/scalable/arduino.svg b/src/apps/scalable/arduino.svg index 480f5917..3b8b21ef 100644 --- a/src/apps/scalable/arduino.svg +++ b/src/apps/scalable/arduino.svg @@ -1 +1,7 @@ - \ No newline at end of file + + + + + + + diff --git a/src/apps/scalable/com.leinardi.gst.svg b/src/apps/scalable/com.leinardi.gst.svg index 6b95f3ce..c01a651a 100644 --- a/src/apps/scalable/com.leinardi.gst.svg +++ b/src/apps/scalable/com.leinardi.gst.svg @@ -1 +1,11 @@ - \ No newline at end of file + + + + + + + + + + + diff --git a/src/apps/scalable/deluge.svg b/src/apps/scalable/deluge.svg index ca3b31bf..cbcbe0ce 100644 --- a/src/apps/scalable/deluge.svg +++ b/src/apps/scalable/deluge.svg @@ -1 +1,9 @@ - \ No newline at end of file + + + + + + + + + diff --git a/src/apps/scalable/eudic.svg b/src/apps/scalable/eudic.svg index c6db0c22..faa7fe42 100644 --- a/src/apps/scalable/eudic.svg +++ b/src/apps/scalable/eudic.svg @@ -1 +1,17 @@ -Dictionary - ThesaurusAa \ No newline at end of file + + + + + + + + + + + + + + + + + diff --git a/src/apps/scalable/file-manager.svg b/src/apps/scalable/file-manager.svg index 52c7f373..27b95743 100644 --- a/src/apps/scalable/file-manager.svg +++ b/src/apps/scalable/file-manager.svg @@ -1 +1,25 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/apps/scalable/gpt.svg b/src/apps/scalable/gpt.svg index 5fc4e808..47d64354 100644 --- a/src/apps/scalable/gpt.svg +++ b/src/apps/scalable/gpt.svg @@ -1 +1,7 @@ - \ No newline at end of file + + + + + + + diff --git a/src/apps/scalable/monkeytype.svg b/src/apps/scalable/monkeytype.svg index fc497c40..a0a53f36 100644 --- a/src/apps/scalable/monkeytype.svg +++ b/src/apps/scalable/monkeytype.svg @@ -1 +1,7 @@ - \ No newline at end of file + + + + + + + diff --git a/src/apps/scalable/org.xfce.Gigolo.svg b/src/apps/scalable/org.xfce.Gigolo.svg index 2d7a72b3..333e6809 100644 --- a/src/apps/scalable/org.xfce.Gigolo.svg +++ b/src/apps/scalable/org.xfce.Gigolo.svg @@ -1 +1,29 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/apps/scalable/org.xfce.panel.directorymenu.svg b/src/apps/scalable/org.xfce.panel.directorymenu.svg index d313602c..d55aa62d 100644 --- a/src/apps/scalable/org.xfce.panel.directorymenu.svg +++ b/src/apps/scalable/org.xfce.panel.directorymenu.svg @@ -1 +1,26 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/apps/scalable/wine-winefile.svg b/src/apps/scalable/wine-winefile.svg index 21589aa1..96e9ea58 100644 --- a/src/apps/scalable/wine-winefile.svg +++ b/src/apps/scalable/wine-winefile.svg @@ -1 +1,17 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + diff --git a/src/devices/symbolic/auth-otp-symbolic.svg b/src/devices/symbolic/auth-otp-symbolic.svg new file mode 100644 index 00000000..8bd9a913 --- /dev/null +++ b/src/devices/symbolic/auth-otp-symbolic.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/devices/symbolic/computer-chip-symbolic.svg b/src/devices/symbolic/computer-chip-symbolic.svg new file mode 100644 index 00000000..b55710b0 --- /dev/null +++ b/src/devices/symbolic/computer-chip-symbolic.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/devices/symbolic/dock-symbolic.svg b/src/devices/symbolic/dock-symbolic.svg new file mode 100644 index 00000000..c3c0cdd6 --- /dev/null +++ b/src/devices/symbolic/dock-symbolic.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/devices/symbolic/dock-usb-symbolic.svg b/src/devices/symbolic/dock-usb-symbolic.svg new file mode 100644 index 00000000..b81ce47a --- /dev/null +++ b/src/devices/symbolic/dock-usb-symbolic.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/devices/symbolic/gpu-symbolic.svg b/src/devices/symbolic/gpu-symbolic.svg new file mode 100644 index 00000000..4d901226 --- /dev/null +++ b/src/devices/symbolic/gpu-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/devices/symbolic/usb-hub-symbolic.svg b/src/devices/symbolic/usb-hub-symbolic.svg new file mode 100644 index 00000000..4a828668 --- /dev/null +++ b/src/devices/symbolic/usb-hub-symbolic.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/devices/symbolic/usb-receiver-symbolic.svg b/src/devices/symbolic/usb-receiver-symbolic.svg new file mode 100644 index 00000000..e829d4cb --- /dev/null +++ b/src/devices/symbolic/usb-receiver-symbolic.svg @@ -0,0 +1,11 @@ + + + + + + + + + + +