Code refactoring

Makefile

@@ -9,4 +9,4 @@ remove:
 	pamac-installer --remove tromjaro-theme-switcher
 
 clean:
-	$(RM) -rf src/ pkg/ icons.zip *.tar.zst
+	$(RM) -rf src/ pkg/ icons.tar.gz *.tar.zst

PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: TROM <contact@tromsite.com>
 pkgname=tromjaro-theme-switcher
-pkgver=2.1
-pkgrel=1
+pkgver=3
+pkgrel=4
 pkgdesc="TROMjaro Theme switcher application"
 arch=('x86_64')
 url="https://git.trom.tf/TROMjaro/theme-switcher-package"
@@ -13,6 +13,8 @@ depends=('tromjaro-fixes'
          'colloid-dracula-gtk-theme-git'
          'colloid-gruvbox-gtk-theme-git'
          'colloid-nord-gtk-theme-git'
+         'colloid-everforest-gtk-theme-git'
+         'colloid-catppuccin-gtk-theme-git'
          'zafiro-icon-theme')
 makedepends=('choosenim')
 provides=('tromjaro-theme-switcher')
@@ -21,7 +23,7 @@ options=(!strip)
 source=("themeSwitcher.nim"
         "tromjaro-theme-switcher.desktop"
         "tromjaro-theme-switcher.svg"
-        "icons.zip::https://www.drive.tromsite.com/s/zFtCp3SkZ4NpKix/download")
+        "icons.tar.gz::https://www.drive.tromsite.com/s/ysM33nJAkpro85b/download/icons.tar.gz")
 sha256sums=('SKIP'
 'SKIP'
 'SKIP'
@@ -32,29 +34,35 @@ prepare() {
 		mkdir -p "$HOME"/.choosenim
 		touch "$HOME"/.choosenim/analytics
 	}
-    echo 'Install Nim if not already installed:'
-    choosenim stable
-    echo 'Update Nim to the latest stable release:'
-    choosenim update stable
+	echo 'Install Nim if not already installed:'
+	choosenim stable
+	echo 'Update Nim to the latest stable release:'
+	choosenim update stable
 	echo 'Refresh nimble package list:'
-    "$HOME"/.nimble/bin/nimble --nim:"$HOME"/.nimble/bin/nim refresh
-    echo 'Install owlkettle from the latest git commit:'
-    "$HOME"/.nimble/bin/nimble --nim:"$HOME"/.nimble/bin/nim install owlkettle
+	"$HOME"/.nimble/bin/nimble --nim:"$HOME"/.nimble/bin/nim refresh
+	echo 'Install owlkettle from the latest git commit:'
+	"$HOME"/.nimble/bin/nimble --nim:"$HOME"/.nimble/bin/nim install owlkettle
 }
 build(){
-    echo 'Compile themeSwitcher.nim for release build:'
-    "$HOME"/.nimble/bin/nim c -d:release --out:${srcdir}/themeSwitcher ${srcdir}/themeSwitcher.nim
+	echo 'Compile themeSwitcher.nim for release build:'
+	"$HOME"/.nimble/bin/nim c -d:release --out:${srcdir}/themeSwitcher ${srcdir}/themeSwitcher.nim
 }
 package() {
-    # copy icons
-    install -d ${pkgdir}/usr/share/tromjaro-theme-switcher/icons
-    install -Dm644 ${srcdir}/icons/*    ${pkgdir}/usr/share/tromjaro-theme-switcher/icons
+	# copy icons
+	install -d ${pkgdir}/usr/share/tromjaro-theme-switcher/icons/Styles
+	install -Dm644 ${srcdir}/icons/Styles/*    ${pkgdir}/usr/share/tromjaro-theme-switcher/icons/Styles
 
-    # copy executables
-    install -Dm644  ${srcdir}/tromjaro-theme-switcher.desktop    ${pkgdir}/usr/share/applications/tromjaro-theme-switcher.desktop
-    install -Dm755  ${srcdir}/themeSwitcher    ${pkgdir}/usr/bin/tromjaro-theme-switcher
+	for source_dir in "${srcdir}/icons/Accent Colors"/*; do
+		dest_dir="${pkgdir}/usr/share/tromjaro-theme-switcher/icons/Accent Colors/${source_dir##*/}"
+		install -d "$dest_dir"
+		install -Dm644 "$source_dir"/*    "$dest_dir"
+	done
 
-   # copy the icon
-    install -d ${pkgdir}/usr/share/icons/hicolor/scalable/apps
-    install -Dm644 ${srcdir}/tromjaro-theme-switcher.svg    ${pkgdir}/usr/share/icons/hicolor/scalable/apps
+	# copy executables
+	install -Dm644  ${srcdir}/tromjaro-theme-switcher.desktop    ${pkgdir}/usr/share/applications/tromjaro-theme-switcher.desktop
+	install -Dm755  ${srcdir}/themeSwitcher    ${pkgdir}/usr/bin/tromjaro-theme-switcher
+
+	# copy the icon
+	install -d ${pkgdir}/usr/share/icons/hicolor/scalable/apps
+	install -Dm644 ${srcdir}/tromjaro-theme-switcher.svg    ${pkgdir}/usr/share/icons/hicolor/scalable/apps
 }

themeSwitcher.nim

@@ -1,60 +1,45 @@
-from std/osproc import execProcess, ProcessOption, startProcess, waitForExit, close
+from std/os import symlinkExists, getConfigDir, walkDirs, `/`
 from std/envvars import existsEnv, getEnv, delEnv, putEnv
-from std/os import symlinkExists, getConfigDir, `/`
 from std/options import Option, some, get, isNone
-from std/strutils import split, endsWith
 from std/strformat import fmt
-import owlkettle
+import pkg/owlkettle
+import ./themes
 
 const
   # Set the directory path where icons are stored
   iconsDir = "/usr/share/tromjaro-theme-switcher/icons"
+  styleIconsDir = iconsDir / "Styles"
+  accentIconsDir = iconsDir / "Accent Colors"
   # GTK CSS for overriding the default icon size of buttons
-  gtkCSS = "button { -gtk-icon-size: 85px; }"
-  applicationID = "com.tromjaro.ThemeSwitcher"
-  themeColors = ["Grey", "Pink", "Green", "Orange", "Purple", "Yellow", "Teal"]
-  themeStyles = ["Light", "Nord", "Dark", "Dark-Nord"]
+  gtkCSS = """
+.style-button {
+  min-width: 5.5em;
+  min-height: 5em;
+  padding: 0.3em;
+  border-radius: 14%;
+}
 
-proc runCommand(command: string, args: openArray[string]): bool =
-  ## This will run a command with the given args and return true upon success
-  let process = startProcess(command, args=args, options={poParentStreams})
-  result = process.waitForExit() == 0
-  process.close()
+.accent-button {
+  -gtk-icon-size: 1.65em;
+  padding: 0.4em;
+  border-radius: 50%;
+}
+"""
 
-proc setIconTheme(iconName: string) =
-  # Change icon theme in XFCE
-  discard runCommand("/usr/bin/xfconf-query",
-    args=["--channel=xsettings", "--property=/Net/IconThemeName", "--create", "--type=string", "--set", iconName])
+var iconsDirs: seq[string]
 
-proc enableDarkPanels(): bool =
-  # Return if dark panels is already enabled
-  if execProcess("/usr/bin/xfconf-query",
-    args=["--channel=xfce4-panel", "--property=/panels/dark-mode"], options={}) == "true\n":
-    return
-  # Try to enable it and return true upon success
-  result = runCommand("/usr/bin/xfconf-query",
-    args=["--channel=xfce4-panel", "--property=/panels/dark-mode", "--create", "--type=bool", "--set=true"])
+for dir in walkDirs(accentIconsDir / "*"):
+  iconsDirs.add(dir)
 
-proc setTheme(themeName: string) =
-
-  var panelNotification: string
-
-  # Set the icon theme and panel color according to the chosen theme
-  if themeName.endsWith("-Dark") or themeName.endsWith("-Dark-Nord"):
-    setIconTheme("zafiro-dark")
-  else:
-    setIconTheme("zafiro")
-    if enableDarkPanels():
-      panelNotification = " with dark panels"
-
-  # Change the main theme to the chosen one
-  discard runCommand("/usr/bin/xfconf-query",
-    args=["--channel=xsettings", "--property=/Net/ThemeName", "--create", "--type=string", "--set", themeName])
-
-  # Send notification about the theme change
-  sendNotification(applicationID, "Theme Switcher", fmt"{themeName} theme{panelNotification} is enabled",
-    icon=fmt"{iconsDir}/{themeName}.svg")
+# Function prototypes
+proc makeThemeButton(shadeName: string, styleName: string): Widget
+proc makeAccentButton(accentColor: string): Widget
+proc accentButtons(): Widget
+proc themeButtons(): Widget
+proc mainGUI(): Widget
 
+# Keep track of current theme button
+var currentTheme = getCurrentTheme()
 
 var
   oldConfigDir: Option[string]
@@ -68,8 +53,8 @@ if symlinkExists(getConfigDir() / "gtk-4.0"):
   configDirChanged = true
 
 # Display the GTK-4 GUI using owlkettle
+
 viewable App:
-  highlightButton: array[2, string]
   hooks:
     build:
       # Reset the user's XDG_CONFIG_HOME variable back to what it was before
@@ -79,53 +64,106 @@ viewable App:
         else:
           putEnv("XDG_CONFIG_HOME", get(oldConfigDir))
 
-      let currentTheme: string = execProcess("/usr/bin/xfconf-query",
-        args=["--channel=xsettings", "--property=/Net/ThemeName"],
-        options={})[0 .. ^2]
-
-      let currentThemeSplit: seq[string] = currentTheme.split('-', 2)
-
-      if currentThemeSplit.len() < 3 or currentThemeSplit[0] != "Colloid":
-        return
-
-      let currentThemeColor = currentThemeSplit[1]
-      let currentThemeStyle = currentThemeSplit[2]
-
-      # Highlight current theme button
-      state.highlightButton = [currentThemeColor, currentThemeStyle]
-
 method view(app: AppState): Widget =
+  result = mainGUI()
+
+brew(appID, gui(App()), icons=iconsDirs, stylesheets=[newStylesheet(gtkCSS)])
+
+
+# Function declarations
+
+proc makeThemeButton(shadeName: string, styleName: string): Widget =
+  let
+    shade = if shadeName == "": "" else: fmt"-{shadeName}"
+    style = if styleName == "Default": "" else: fmt"-{styleName}"
+    color = if currentTheme.color in ["Blue", ""]: "" else: fmt"-{currentTheme.color}"
+    themeString = fmt"Colloid{color}{shade}{style}"
+
   result = gui:
+    Button:
+      Picture:
+        pixbuf = loadPixbuf(fmt"{styleIconsDir}/Colloid{shade}{style}.svg")
+      tooltip = if shadeName == "": styleName else: fmt"{shadeName}-{styleName}"
+      style = if (shadeName, styleName) == (currentTheme.shade, currentTheme.style):
+        [StyleClass("style-button"), ButtonSuggested]
+      else:
+        [StyleClass("style-button"), ButtonFlat]
+
+      proc clicked() =
+        setTheme(themeString)
+        # Highlight this button
+        currentTheme.shade = shadeName
+        currentTheme.style = styleName
+        if currentTheme.color == "":
+          currentTheme.color = "Blue"
+
+proc makeAccentButton(accentColor: string): Widget =
+  let
+    shade = if currentTheme.shade == "": "" else: fmt"-{currentTheme.shade}"
+    style = if currentTheme.style in ["Default", ""]: "" else: fmt"-{currentTheme.style}"
+    color = if accentColor == "Blue": "" else: fmt"-{accentColor}"
+    themeString = fmt"Colloid{color}{shade}{style}"
+
+  result = gui:
+    Button:
+      icon = fmt"{accentColor}{style}{shade}"
+      tooltip = accentColor
+      style = if accentColor == currentTheme.color:
+          [StyleClass("accent-button"), ButtonSuggested]
+        else:
+          [StyleClass("accent-button"), ButtonFlat]
+
+      proc clicked() =
+        setTheme(themeString)
+        # Highlight this button
+        currentTheme.color = accentColor
+        if currentTheme.style == "":
+          currentTheme.style = "Default"
+
+proc themeButtons(): Widget =
+  gui:
+    # Vertical box
+    Box(orient = OrientY, spacing = 5):
+      for shadeName in themeShades:
+        # Horizontal box
+        Box(orient = OrientX, spacing = 5):
+          for styleName in themeStyles:
+            let themeButton = makeThemeButton(shadeName, styleName)
+            insert(themeButton) {.vAlign: AlignCenter, hAlign: AlignCenter.}
+
+proc accentButtons(): Widget =
+  gui:
+    # Horizontal box
+    Box(orient = OrientX, spacing = 3):
+      for accentColor in accentColors:
+        let accentButton = makeAccentButton(accentColor)
+        insert(accentButton) {.vAlign: AlignCenter, hAlign: AlignCenter.}
+
+proc mainGUI(): Widget =
+  gui:
     Window:
       title = "TROMjaro Theme Switcher"
       # Shrink window to the smallest size
-      defaultSize = (0, 0)
-      iconName = "tromjaro-theme-switcher"
+      defaultSize = (1, 1)
+      iconName = appLogo
       # Vertical box
-      Box(orient = OrientY, margin = 7, spacing = 5):
+      Box(orient = OrientY, margin = 13, spacing = 10):
         Label:
-          text="A Theme Switcher for TROMjaro's default theme-set (Colloid) and icon-set (Zafiro)."
-        Label {.vAlign: AlignStart.}:
-          useMarkup = true
-          text="<span size='small'>NOTE: Some apps need to be reopened for the theme to be applied.</span>"
-        for themeStyle in themeStyles:
-          # Horizontal box
-          Box(orient = OrientX, spacing = 5):
-            for themeColor in themeColors:
-              Button {.vAlign: AlignCenter, hAlign: AlignCenter.}:
-                icon = fmt"Colloid-{themeColor}-{themeStyle}"
-                # Teal-Dark-Nord theme will have "(default)" added to its tooltip
-                tooltip = if (themeColor, themeStyle) == ("Teal", "Dark-Nord"):
-                    fmt"{themeColor}-{themeStyle} (default)"
-                  else:
-                    fmt"{themeColor}-{themeStyle}"
-                style = if [themeColor, themeStyle] == app.highlightButton:
-                    ButtonSuggested
-                  else:
-                    ButtonFlat
-                proc clicked() =
-                  setTheme(fmt"Colloid-{themeColor}-{themeStyle}")
-                  # Highlight this button
-                  app.highlightButton = [themeColor, themeStyle]
-
-brew(applicationID, gui(App()), icons=[iconsDir], stylesheets=[newStylesheet(gtkCSS)])
+          useMarkup=true
+          text="<span size='large'>STYLE</span>"
+        # Theme buttons
+        insert(themeButtons())
+        Separator(margin = Margin(top: 5)) {.vAlign: AlignCenter.}
+        Label:
+          useMarkup=true
+          text="<span size='large'>ACCENT COLOR</span>"
+        # Accent buttons
+        insert(accentButtons())
+        Separator(margin = Margin(top: 12)) {.vAlign: AlignCenter.}
+        # Vertical box
+        Box(orient = OrientY):
+          Label:
+            text="A Theme Switcher for TROMjaro's default theme-set (Colloid) and icon-set (Zafiro)."
+          Label {.vAlign: AlignStart.}:
+            useMarkup = true
+            text="<span size='small'>NOTE: Some apps need to be reopened for the theme to be applied.</span>"

themes.nim

@@ -0,0 +1,111 @@
+from std/osproc import execProcess, ProcessOption, startProcess, waitForExit, close
+from std/strutils import split, endsWith, contains
+from std/strformat import fmt
+import pkg/owlkettle
+
+type Theme = tuple[color, shade, style: string]
+
+const
+  themeShades* = ["Light", "", "Dark"]
+  themeStyles* = ["Default", "Nord", "Dracula", "Catppuccin", "Everforest", "Gruvbox"]
+  accentColors* = ["Blue", "Red", "Purple", "Pink", "Teal", "Green", "Yellow", "Orange", "Grey"]
+  appID* = "com.tromjaro.ThemeSwitcher"
+  appLogo* = "tromjaro-theme-switcher"
+
+proc getCurrentTheme*(): Theme =
+  let currentThemeString = execProcess("/usr/bin/xfconf-query",
+    args=["--channel=xsettings", "--property=/Net/ThemeName"],
+    options={})[0 .. ^2]
+
+  # Split the theme string into words
+  let words = currentThemeString.split('-')
+  if words[0] != "Colloid":
+    return
+  var currentTheme: Theme = (color: "Blue", shade: "", style: "Default")
+
+  case len(words):
+    of 1: discard
+
+    # Match against Colloid-Color, Colloid-Shade, Colloid-Style
+    of 2:
+      let word1 = words[1]
+      if word1 in accentColors:
+        currentTheme.color = word1
+      elif word1 in themeShades:
+        currentTheme.shade = word1
+      elif word1 in themeStyles:
+        currentTheme.style = word1
+      else:
+        return
+
+    # Match against Colloid-Color-Shade, Colloid-Shade-Style
+    of 3:
+      let
+        word1 = words[1]
+        word2 = words[2]
+      if (word1 in accentColors) and (word2 in themeShades):
+        currentTheme.color = word1
+        currentTheme.shade = word2
+      elif (word1 in themeShades) and (word2 in themeStyles):
+        currentTheme.shade = word1
+        currentTheme.style = word2
+      else:
+        return
+
+    # Match against Colloid-Color-Shade-Style
+    of 4:
+      let
+        word1 = words[1]
+        word2 = words[2]
+        word3 = words[3]
+      if (word1 in accentColors) and (word2 in themeShades) and (word3 in themeStyles):
+        currentTheme.color = word1
+        currentTheme.shade = word2
+        currentTheme.style = word3
+      else:
+        return
+
+    else:
+      return
+
+  return currentTheme
+
+proc runCommand(command: string, args: openArray[string]): bool =
+  ## This will run a command with the given args and return true upon success
+  let process = startProcess(command, args=args, options={poParentStreams})
+  result = process.waitForExit() == 0
+  process.close()
+
+proc setIconTheme(iconName: string) =
+  # Change icon theme in XFCE
+  discard runCommand("/usr/bin/xfconf-query",
+    args=["--channel=xsettings", "--property=/Net/IconThemeName", "--create", "--type=string", "--set", iconName])
+
+proc enableDarkPanels(): bool =
+  # Return if dark panels is already enabled
+  if execProcess("/usr/bin/xfconf-query",
+    args=["--channel=xfce4-panel", "--property=/panels/dark-mode"], options={}) == "true\n":
+    return
+  # Try to enable it and return true upon success
+  result = runCommand("/usr/bin/xfconf-query",
+    args=["--channel=xfce4-panel", "--property=/panels/dark-mode", "--create", "--type=bool", "--set=true"])
+
+proc setTheme*(themeName: string) =
+
+  var panelNotification: string
+
+  # Set the icon theme and panel color according to the chosen theme
+  if themeName.endsWith("-Dark") or themeName.contains("-Dark-"):
+    setIconTheme("zafiro-dark")
+  else:
+    setIconTheme("zafiro")
+    if enableDarkPanels():
+      panelNotification = " with dark panels"
+
+  # Change the main theme to the chosen one
+  discard runCommand("/usr/bin/xfconf-query",
+    args=["--channel=xsettings", "--property=/Net/ThemeName", "--create", "--type=string", "--set", themeName])
+
+  # Send notification about the theme change
+  sendNotification(appID, "Theme Switcher", fmt"{themeName} theme{panelNotification} is enabled",
+    icon=appLogo)