diff --git a/README.md b/README.md index 902d2101..6c0e6b6b 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,6 @@ Usage: `./install.sh` **[OPTIONS...]** |-t, --theme | Specify theme color variant(s) [default/purple/pink/red/orange/yellow/green/grey/all] (Default: blue)| |-a, --alternative | Install alternative icons (redesigned MacOS default icons)| |-b, --bold | Install bold panel icons version| -|--black | Black panel icons version| |-r,--remove,-u,--uninstall | Uninstall (remove) icon themes| |-h, --help | Show this help| diff --git a/alternative/apps/accessories-screenshot.svg b/alternative/apps/scalable/accessories-screenshot.svg similarity index 100% rename from alternative/apps/accessories-screenshot.svg rename to alternative/apps/scalable/accessories-screenshot.svg diff --git a/alternative/apps/application-default-icon.svg b/alternative/apps/scalable/application-default-icon.svg similarity index 100% rename from alternative/apps/application-default-icon.svg rename to alternative/apps/scalable/application-default-icon.svg diff --git a/alternative/apps/applications-games.svg b/alternative/apps/scalable/applications-games.svg similarity index 100% rename from alternative/apps/applications-games.svg rename to alternative/apps/scalable/applications-games.svg diff --git a/alternative/apps/applications-system.svg b/alternative/apps/scalable/applications-system.svg similarity index 100% rename from alternative/apps/applications-system.svg rename to alternative/apps/scalable/applications-system.svg diff --git a/alternative/apps/calc.svg b/alternative/apps/scalable/calc.svg similarity index 100% rename from alternative/apps/calc.svg rename to alternative/apps/scalable/calc.svg diff --git a/alternative/apps/cheese.svg b/alternative/apps/scalable/cheese.svg similarity index 100% rename from alternative/apps/cheese.svg rename to alternative/apps/scalable/cheese.svg diff --git a/alternative/apps/eog.svg b/alternative/apps/scalable/eog.svg similarity index 100% rename from alternative/apps/eog.svg rename to alternative/apps/scalable/eog.svg diff --git a/alternative/apps/file-manager.svg b/alternative/apps/scalable/file-manager.svg similarity index 100% rename from alternative/apps/file-manager.svg rename to alternative/apps/scalable/file-manager.svg diff --git a/alternative/apps/file-roller.svg b/alternative/apps/scalable/file-roller.svg similarity index 100% rename from alternative/apps/file-roller.svg rename to alternative/apps/scalable/file-roller.svg diff --git a/alternative/apps/gnome-maps.svg b/alternative/apps/scalable/gnome-maps.svg similarity index 100% rename from alternative/apps/gnome-maps.svg rename to alternative/apps/scalable/gnome-maps.svg diff --git a/alternative/apps/gnome-music.svg b/alternative/apps/scalable/gnome-music.svg similarity index 100% rename from alternative/apps/gnome-music.svg rename to alternative/apps/scalable/gnome-music.svg diff --git a/alternative/apps/gnome-todo.svg b/alternative/apps/scalable/gnome-todo.svg similarity index 100% rename from alternative/apps/gnome-todo.svg rename to alternative/apps/scalable/gnome-todo.svg diff --git a/alternative/apps/indicator-weather.svg b/alternative/apps/scalable/indicator-weather.svg similarity index 100% rename from alternative/apps/indicator-weather.svg rename to alternative/apps/scalable/indicator-weather.svg diff --git a/alternative/apps/internet-mail.svg b/alternative/apps/scalable/internet-mail.svg similarity index 100% rename from alternative/apps/internet-mail.svg rename to alternative/apps/scalable/internet-mail.svg diff --git a/alternative/apps/kvantum.svg b/alternative/apps/scalable/kvantum.svg similarity index 100% rename from alternative/apps/kvantum.svg rename to alternative/apps/scalable/kvantum.svg diff --git a/alternative/apps/org.gnome.Totem.svg b/alternative/apps/scalable/org.gnome.Totem.svg similarity index 100% rename from alternative/apps/org.gnome.Totem.svg rename to alternative/apps/scalable/org.gnome.Totem.svg diff --git a/alternative/apps/polari.svg b/alternative/apps/scalable/polari.svg similarity index 100% rename from alternative/apps/polari.svg rename to alternative/apps/scalable/polari.svg diff --git a/alternative/apps/preferences-desktop-plasma-theme.svg b/alternative/apps/scalable/preferences-desktop-plasma-theme.svg similarity index 100% rename from alternative/apps/preferences-desktop-plasma-theme.svg rename to alternative/apps/scalable/preferences-desktop-plasma-theme.svg diff --git a/alternative/apps/preferences-system-time.svg b/alternative/apps/scalable/preferences-system-time.svg similarity index 100% rename from alternative/apps/preferences-system-time.svg rename to alternative/apps/scalable/preferences-system-time.svg diff --git a/alternative/apps/preferences-system.svg b/alternative/apps/scalable/preferences-system.svg similarity index 100% rename from alternative/apps/preferences-system.svg rename to alternative/apps/scalable/preferences-system.svg diff --git a/alternative/apps/shotwell.svg b/alternative/apps/scalable/shotwell.svg similarity index 100% rename from alternative/apps/shotwell.svg rename to alternative/apps/scalable/shotwell.svg diff --git a/alternative/apps/software-properties.svg b/alternative/apps/scalable/software-properties.svg similarity index 100% rename from alternative/apps/software-properties.svg rename to alternative/apps/scalable/software-properties.svg diff --git a/alternative/apps/softwarecenter-debian.svg b/alternative/apps/scalable/softwarecenter-debian.svg similarity index 100% rename from alternative/apps/softwarecenter-debian.svg rename to alternative/apps/scalable/softwarecenter-debian.svg diff --git a/alternative/apps/softwarecenter-manjaro.svg b/alternative/apps/scalable/softwarecenter-manjaro.svg similarity index 100% rename from alternative/apps/softwarecenter-manjaro.svg rename to alternative/apps/scalable/softwarecenter-manjaro.svg diff --git a/alternative/apps/softwarecenter-ubuntu.svg b/alternative/apps/scalable/softwarecenter-ubuntu.svg similarity index 100% rename from alternative/apps/softwarecenter-ubuntu.svg rename to alternative/apps/scalable/softwarecenter-ubuntu.svg diff --git a/alternative/apps/softwarecenter.svg b/alternative/apps/scalable/softwarecenter.svg similarity index 100% rename from alternative/apps/softwarecenter.svg rename to alternative/apps/scalable/softwarecenter.svg diff --git a/alternative/apps/system-software-install.svg b/alternative/apps/scalable/system-software-install.svg similarity index 100% rename from alternative/apps/system-software-install.svg rename to alternative/apps/scalable/system-software-install.svg diff --git a/alternative/apps/system-software-update.svg b/alternative/apps/scalable/system-software-update.svg similarity index 100% rename from alternative/apps/system-software-update.svg rename to alternative/apps/scalable/system-software-update.svg diff --git a/alternative/apps/terminal.svg b/alternative/apps/scalable/terminal.svg similarity index 100% rename from alternative/apps/terminal.svg rename to alternative/apps/scalable/terminal.svg diff --git a/alternative/apps/terminix.svg b/alternative/apps/scalable/terminix.svg similarity index 100% rename from alternative/apps/terminix.svg rename to alternative/apps/scalable/terminix.svg diff --git a/alternative/apps/theme-config.svg b/alternative/apps/scalable/theme-config.svg similarity index 100% rename from alternative/apps/theme-config.svg rename to alternative/apps/scalable/theme-config.svg diff --git a/alternative/apps/web-browser.svg b/alternative/apps/scalable/web-browser.svg similarity index 100% rename from alternative/apps/web-browser.svg rename to alternative/apps/scalable/web-browser.svg diff --git a/alternative/apps/symbolic/gnome-software-symbolic.svg b/alternative/apps/symbolic/gnome-software-symbolic.svg new file mode 100644 index 00000000..6b501b82 --- /dev/null +++ b/alternative/apps/symbolic/gnome-software-symbolic.svg @@ -0,0 +1,3 @@ + + + diff --git a/alternative/apps/symbolic/preferences-system-symbolic.svg b/alternative/apps/symbolic/preferences-system-symbolic.svg new file mode 100644 index 00000000..089f6eb2 --- /dev/null +++ b/alternative/apps/symbolic/preferences-system-symbolic.svg @@ -0,0 +1,3 @@ + + + diff --git a/alternative/apps/symbolic/software-store-symbolic.svg b/alternative/apps/symbolic/software-store-symbolic.svg new file mode 100644 index 00000000..1d0dbe8c --- /dev/null +++ b/alternative/apps/symbolic/software-store-symbolic.svg @@ -0,0 +1,3 @@ + + + diff --git a/alternative/apps/symbolic/system-file-manager-symbolic.svg b/alternative/apps/symbolic/system-file-manager-symbolic.svg new file mode 100644 index 00000000..bf08345b --- /dev/null +++ b/alternative/apps/symbolic/system-file-manager-symbolic.svg @@ -0,0 +1,3 @@ + + + diff --git a/install.sh b/install.sh index 55de2013..4a2e916b 100755 --- a/install.sh +++ b/install.sh @@ -15,7 +15,7 @@ fi SRC_DIR="$(cd "$(dirname "$0")" && pwd)" THEME_NAME=WhiteSur -COLOR_VARIANTS=('' '-dark') +COLOR_VARIANTS=('' '-light' '-dark') THEME_VARIANTS=('' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-grey' '-nord') themes=() @@ -30,8 +30,7 @@ cat << EOF -n, --name NAME Specify theme name (Default: $THEME_NAME) -t, --theme VARIANT Specify theme color variant(s) [default|purple|pink|red|orange|yellow|green|grey|nord|all] (Default: blue) -a, --alternative Install alternative icons for software center and file-manager - -b, --bold Install bold panel icons version - --black Black panel icons version + -b, --bold Install bolder panel icons version (1.5px size) -r, --remove, -u, --uninstall Uninstall (remove) icon themes @@ -72,19 +71,45 @@ install() { cp -r "${SRC_DIR}"/bold/* ${THEME_DIR} fi - cp -r "${SRC_DIR}"/links/{actions,apps,categories,devices,emblems,mimes,places,status} ${THEME_DIR} - if [[ $DESKTOP_SESSION == '/usr/share/xsessions/budgie-desktop' ]]; then cp -r "${SRC_DIR}"/src/status/symbolic-budgie/*.svg ${THEME_DIR}/status/symbolic fi if [[ ${alternative:-} == 'true' ]]; then - cp -r "${SRC_DIR}"/alternative/apps/*.svg ${THEME_DIR}/apps/scalable + cp -r "${SRC_DIR}"/alternative/* ${THEME_DIR} fi if [[ ${theme} != '' ]]; then cp -r "${SRC_DIR}"/colors/color${theme}/*.svg ${THEME_DIR}/places/scalable fi + + cp -r "${SRC_DIR}"/links/{actions,apps,categories,devices,emblems,mimes,places,status} ${THEME_DIR} + fi + + if [[ ${color} == '-light' ]]; then + mkdir -p ${THEME_DIR}/status + cp -r "${SRC_DIR}"/src/status/{16,22,24} ${THEME_DIR}/status + + if [[ ${bold:-} == 'true' ]]; then + cp -r "${SRC_DIR}"/bold/status/{16,22,24} ${THEME_DIR}/status + fi + + # Change icon color for light theme + sed -i "s/#ffffff/#363636/g" "${THEME_DIR}"/status/{16,22,24}/* + + cp -r "${SRC_DIR}"/links/status/{16,22,24} ${THEME_DIR}/status + + cd ${dest} + ln -s ../${name}${theme}/actions ${name}${theme}-light/actions + ln -s ../${name}${theme}/animations ${name}${theme}-light/animations + ln -s ../${name}${theme}/apps ${name}${theme}-light/apps + ln -s ../${name}${theme}/categories ${name}${theme}-light/categories + ln -s ../${name}${theme}/devices ${name}${theme}-light/devices + ln -s ../${name}${theme}/emblems ${name}${theme}-light/emblems + ln -s ../${name}${theme}/mimes ${name}${theme}-light/mimes + ln -s ../${name}${theme}/places ${name}${theme}-light/places + ln -s ../../${name}${theme}/status/32 ${name}${theme}-light/status/32 + ln -s ../../${name}${theme}/status/symbolic ${name}${theme}-light/status/symbolic fi if [[ ${color} == '-dark' ]]; then @@ -97,25 +122,29 @@ install() { cp -r "${SRC_DIR}"/src/mimes/symbolic ${THEME_DIR}/mimes cp -r "${SRC_DIR}"/src/devices/{16,22,24,symbolic} ${THEME_DIR}/devices cp -r "${SRC_DIR}"/src/places/{16,22,24,symbolic} ${THEME_DIR}/places - cp -r "${SRC_DIR}"/src/status/{16,22,24,symbolic} ${THEME_DIR}/status + cp -r "${SRC_DIR}"/src/status/symbolic ${THEME_DIR}/status if [[ ${bold:-} == 'true' ]]; then cp -r "${SRC_DIR}"/bold/* ${THEME_DIR} fi + if [[ ${alternative:-} == 'true' ]]; then + cp -r "${SRC_DIR}"/alternative/apps/symbolic/*.svg ${THEME_DIR}/apps/symbolic + fi + if [[ $DESKTOP_SESSION == '/usr/share/xsessions/budgie-desktop' ]]; then cp -r "${SRC_DIR}"/src/status/symbolic-budgie/*.svg ${THEME_DIR}/status/symbolic fi # Change icon color for dark theme - sed -i "s/#363636/#dedede/g" "${THEME_DIR}"/{actions,devices,places,status}/{16,22,24}/* + sed -i "s/#363636/#dedede/g" "${THEME_DIR}"/{actions,devices,places}/{16,22,24}/* sed -i "s/#363636/#dedede/g" "${THEME_DIR}"/actions/32/* sed -i "s/#363636/#dedede/g" "${THEME_DIR}"/{actions,apps,categories,emblems,devices,mimes,places,status}/symbolic/* cp -r "${SRC_DIR}"/links/actions/{16,22,24,32,symbolic} ${THEME_DIR}/actions cp -r "${SRC_DIR}"/links/devices/{16,22,24,symbolic} ${THEME_DIR}/devices cp -r "${SRC_DIR}"/links/places/{16,22,24,symbolic} ${THEME_DIR}/places - cp -r "${SRC_DIR}"/links/status/{16,22,24,symbolic} ${THEME_DIR}/status + cp -r "${SRC_DIR}"/links/status/symbolic ${THEME_DIR}/status cp -r "${SRC_DIR}"/links/apps/symbolic ${THEME_DIR}/apps cp -r "${SRC_DIR}"/links/categories/symbolic ${THEME_DIR}/categories cp -r "${SRC_DIR}"/links/mimes/symbolic ${THEME_DIR}/mimes @@ -132,6 +161,9 @@ install() { ln -s ../../${name}${theme}/apps/scalable ${name}${theme}-dark/apps/scalable ln -s ../../${name}${theme}/devices/scalable ${name}${theme}-dark/devices/scalable ln -s ../../${name}${theme}/places/scalable ${name}${theme}-dark/places/scalable + ln -s ../../${name}${theme}/status/16 ${name}${theme}-dark/status/16 + ln -s ../../${name}${theme}/status/22 ${name}${theme}-dark/status/22 + ln -s ../../${name}${theme}/status/24 ${name}${theme}-dark/status/24 ln -s ../../${name}${theme}/status/32 ${name}${theme}-dark/status/32 fi @@ -185,11 +217,6 @@ while [[ "$#" -gt 0 ]]; do echo "Installing 'bold' version..." shift ;; - --black) - black='true' - echo "Installing 'black on panel' version..." - shift - ;; -r|--remove|-u|--uninstall) remove='true' shift diff --git a/links/apps/scalable/Geogebra.svg b/links/apps/scalable/Geogebra.svg new file mode 120000 index 00000000..1f18c02a --- /dev/null +++ b/links/apps/scalable/Geogebra.svg @@ -0,0 +1 @@ +geogebra.svg \ No newline at end of file diff --git a/links/apps/scalable/appimagekit-retroarch.svg b/links/apps/scalable/appimagekit-retroarch.svg new file mode 120000 index 00000000..b1f836b8 --- /dev/null +++ b/links/apps/scalable/appimagekit-retroarch.svg @@ -0,0 +1 @@ +retroarch.svg \ No newline at end of file diff --git a/links/apps/scalable/com.belmoussaoui.Authenticator.svg b/links/apps/scalable/com.belmoussaoui.Authenticator.svg new file mode 120000 index 00000000..57c14e16 --- /dev/null +++ b/links/apps/scalable/com.belmoussaoui.Authenticator.svg @@ -0,0 +1 @@ +gnome-twofactorauth.svg \ No newline at end of file diff --git a/links/apps/scalable/com.github.bilelmoussaoui.Authenticator.svg b/links/apps/scalable/com.github.bilelmoussaoui.Authenticator.svg new file mode 120000 index 00000000..57c14e16 --- /dev/null +++ b/links/apps/scalable/com.github.bilelmoussaoui.Authenticator.svg @@ -0,0 +1 @@ +gnome-twofactorauth.svg \ No newline at end of file diff --git a/links/apps/scalable/com.github.hluk.copyq.svg b/links/apps/scalable/com.github.hluk.copyq.svg new file mode 120000 index 00000000..286727a1 --- /dev/null +++ b/links/apps/scalable/com.github.hluk.copyq.svg @@ -0,0 +1 @@ +copyq.svg \ No newline at end of file diff --git a/links/apps/scalable/com.github.taiko2k.tauonmb.svg b/links/apps/scalable/com.github.taiko2k.tauonmb.svg new file mode 120000 index 00000000..971fc62f --- /dev/null +++ b/links/apps/scalable/com.github.taiko2k.tauonmb.svg @@ -0,0 +1 @@ +tauonmb.svg \ No newline at end of file diff --git a/links/apps/scalable/geogebra-classic.svg b/links/apps/scalable/geogebra-classic.svg new file mode 120000 index 00000000..1f18c02a --- /dev/null +++ b/links/apps/scalable/geogebra-classic.svg @@ -0,0 +1 @@ +geogebra.svg \ No newline at end of file diff --git a/links/apps/scalable/no.mifi.losslesscut.svg b/links/apps/scalable/no.mifi.losslesscut.svg new file mode 120000 index 00000000..b9c42292 --- /dev/null +++ b/links/apps/scalable/no.mifi.losslesscut.svg @@ -0,0 +1 @@ +losslesscut.svg \ No newline at end of file diff --git a/links/apps/scalable/org.geogebra.GeoGebra.svg b/links/apps/scalable/org.geogebra.GeoGebra.svg new file mode 120000 index 00000000..1f18c02a --- /dev/null +++ b/links/apps/scalable/org.geogebra.GeoGebra.svg @@ -0,0 +1 @@ +geogebra.svg \ No newline at end of file diff --git a/links/apps/scalable/org.gnome.Authenticator.svg b/links/apps/scalable/org.gnome.Authenticator.svg new file mode 120000 index 00000000..57c14e16 --- /dev/null +++ b/links/apps/scalable/org.gnome.Authenticator.svg @@ -0,0 +1 @@ +gnome-twofactorauth.svg \ No newline at end of file diff --git a/links/apps/scalable/org.koreader.KOReader.svg b/links/apps/scalable/org.koreader.KOReader.svg new file mode 120000 index 00000000..062ec579 --- /dev/null +++ b/links/apps/scalable/org.koreader.KOReader.svg @@ -0,0 +1 @@ +koreader.svg \ No newline at end of file diff --git a/links/apps/scalable/org.libretro.RetroArch.svg b/links/apps/scalable/org.libretro.RetroArch.svg new file mode 120000 index 00000000..b1f836b8 --- /dev/null +++ b/links/apps/scalable/org.libretro.RetroArch.svg @@ -0,0 +1 @@ +retroarch.svg \ No newline at end of file diff --git a/links/apps/scalable/org.shotcut.Shotcut.svg b/links/apps/scalable/org.shotcut.Shotcut.svg new file mode 120000 index 00000000..7aab390a --- /dev/null +++ b/links/apps/scalable/org.shotcut.Shotcut.svg @@ -0,0 +1 @@ +shotcut.svg \ No newline at end of file diff --git a/src/apps/scalable/copyq.svg b/src/apps/scalable/copyq.svg new file mode 100644 index 00000000..48b0946e --- /dev/null +++ b/src/apps/scalable/copyq.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/apps/scalable/geogebra.svg b/src/apps/scalable/geogebra.svg new file mode 100644 index 00000000..e9f9a202 --- /dev/null +++ b/src/apps/scalable/geogebra.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/apps/scalable/gnome-twofactorauth.svg b/src/apps/scalable/gnome-twofactorauth.svg new file mode 100644 index 00000000..4e77d210 --- /dev/null +++ b/src/apps/scalable/gnome-twofactorauth.svg @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/apps/scalable/koreader.svg b/src/apps/scalable/koreader.svg new file mode 100644 index 00000000..8d238edd --- /dev/null +++ b/src/apps/scalable/koreader.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/apps/scalable/losslesscut.svg b/src/apps/scalable/losslesscut.svg new file mode 100644 index 00000000..fe8cd524 --- /dev/null +++ b/src/apps/scalable/losslesscut.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/apps/scalable/retroarch.svg b/src/apps/scalable/retroarch.svg new file mode 100644 index 00000000..6f990adb --- /dev/null +++ b/src/apps/scalable/retroarch.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/apps/scalable/shotcut.svg b/src/apps/scalable/shotcut.svg new file mode 100644 index 00000000..679edd4a --- /dev/null +++ b/src/apps/scalable/shotcut.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/apps/scalable/tauonmb.svg b/src/apps/scalable/tauonmb.svg new file mode 100644 index 00000000..ec29c24b --- /dev/null +++ b/src/apps/scalable/tauonmb.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/status/24/network-wired.svg b/src/status/24/network-wired.svg index ccdaeca2..8c2c0a3c 100644 --- a/src/status/24/network-wired.svg +++ b/src/status/24/network-wired.svg @@ -1,3 +1,3 @@ - +