PKGBUILD

@@ -3,38 +3,23 @@ pkgname=tromjaro-theme-switcher
 pkgver=1.4
 pkgrel=3
 pkgdesc="TROMjaro Theme switcher application"
-arch=('x86_64')
+arch=(any)
-url="https://git.trom.tf/TROMjaro/theme-switcher-package"
+url=""
 license=(unknown)
-depends=('tromjaro-fixes'
+depends=('yad'
-         'xfconf'
-         'gtk4'
          'colloid-gtk-theme-git'
          'zafiro-icon-theme')
-makedepends=('choosenim')
 provides=('tromjaro-theme-switcher')
 backup=()
 options=(!strip)
-source=("themeSwitcher.nim"
+source=("theme-switcher"
         "tromjaro-theme-switcher.desktop"
         "tromjaro-theme-switcher.svg"
-        "icons.zip::https://www.drive.tromsite.com/s/zFtCp3SkZ4NpKix/download")
+        "https://www.drive.tromsite.com/s/zFtCp3SkZ4NpKix/download")
 sha256sums=('SKIP'
 'SKIP'
 'SKIP'
 'SKIP')
-prepare() {
-    echo 'Install Nim if not already installed:'
-    choosenim stable
-    echo 'Update Nim to the latest stable release:'
-    choosenim update stable
-    echo 'Install owlkettle from the latest git commit:'
-    "$HOME"/.nimble/bin/nimble install owlkettle@#head
-}
-build(){
-    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
@@ -42,9 +27,10 @@ package() {
 
     # 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
+	install -Dm755  ${srcdir}/theme-switcher                    ${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
+
 }

theme-switcher

@@ -0,0 +1,63 @@
+#!/bin/bash
+
+# Set the directory path where icons are stored
+declare -r icons_dir=/usr/share/tromjaro-theme-switcher/icons
+
+set_icon_theme() {
+	# Change icon theme in XFCE
+	xfconf-query -c xsettings -p /Net/IconThemeName -n -t string -s "$1"
+}
+
+enable_dark_panels() {
+	# Enable dark panels if not already enabled
+	[ "$(xfconf-query -c xfce4-panel -p /panels/dark-mode)" != 'true' ] &&
+		xfconf-query -c xfce4-panel -p /panels/dark-mode -n -t bool -s true &&
+		panel_notification=" with dark panels"
+}
+
+set_theme() {
+	local -r theme="$1"
+	unset panel_notification
+
+	# Set the icon theme and panel color according to the chosen theme
+	case "$theme" in
+		*'-Dark'|*'-Dark-Nord')
+			set_icon_theme 'zafiro-dark'
+		;;
+		*)
+			set_icon_theme 'zafiro'
+			enable_dark_panels
+		;;
+	esac
+
+	# Change the main theme to the chosen one
+	xfconf-query -c xsettings -p /Net/ThemeName -n -t string -s "$theme"
+
+	# Send notification about the theme change
+	notify-send 'Theme Switcher' "$theme theme$panel_notification was enabled"
+}
+
+# Export functions to make them available inside yad
+export -f set_icon_theme enable_dark_panels set_theme
+
+# A collection of tooltips that appear when you hover over a theme button
+declare -r themes_tooltip=('Grey-Light' 'Grey-Nord' 'Grey-Dark' 'Grey-Dark-Nord' 'Pink-Light' 'Pink-Nord' 'Pink-Dark' 'Pink-Dark-Nord' 'Green-Light' 'Green-Nord' 'Green-Dark' 'Green-Dark-Nord' 'Orange-Light' 'Orange-Nord' 'Orange-Dark' 'Orange-Dark-Nord' 'Purple-Light' 'Purple-Nord' 'Purple-Dark' 'Purple-Dark-Nord' 'Yellow-Light' 'Yellow-Nord' 'Yellow-Dark' 'Yellow-Dark-Nord' 'Teal-Light' 'Teal-Nord' 'Teal-Dark' 'Teal-Dark-Nord (default)')
+
+# Build the command line arguments we need to pass to yad to display the theme buttons
+build_cmdline_args() {
+	for tooltip in "${themes_tooltip[@]}"; do
+		# Stripping the text after space gives you the theme name
+		local theme="Colloid-${tooltip% *}"
+		local theme_icon_path="$icons_dir/$theme.png"
+		printf '%s\n' "--field=!$theme_icon_path!$tooltip:BTN" "set_theme '$theme'"
+	done
+}
+
+# Save those arguments to an array named cmdline_args
+readarray -t cmdline_args < <(build_cmdline_args)
+
+# Display the GUI interface using yad
+yad --no-buttons --center --keep-icon-size --use-interp --title 'TROMjaro Theme Switcher' \
+	--text-align=center --text "A Theme Switcher for TROMjaro's default theme-set (Colloid) and icon-set (Zafiro)." \
+	--form --columns 7 --css='button:focus:not(:hover) { box-shadow: none; }' \
+	"${cmdline_args[@]}"

themeSwitcher.nim

@@ -1,125 +0,0 @@
-from std/osproc import execProcess, ProcessOption, startProcess, waitForExit, close
-from std/os import symlinkExists, getConfigDir, putEnv, `/`
-from std/strutils import split, endsWith, strip
-from std/algorithm import fill
-from std/strformat import fmt
-import owlkettle
-
-const
-  # Set the directory path where icons are stored
-  iconsDir = "/usr/share/tromjaro-theme-switcher/icons"
-  # GTK CSS for overriding the default icon size of buttons
-  gtkCSS = "button { -gtk-icon-size: 22mm; }"
-  themeColors = ["Grey", "Pink", "Green", "Orange", "Purple", "Yellow", "Teal"]
-  themeStyles = ["Light", "Nord", "Dark", "Dark-Nord"]
-
-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.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("com.tromjaro.ThemeSwitcher", "Theme Switcher", fmt"{themeName} theme{panelNotification} is enabled",
-    icon=fmt"{iconsDir}/{themeName}.svg")
-
-
-# Prevent loading GTK theme from ~/.config/gtk-4.0 directory when it is a symlink
-if symlinkExists(getConfigDir() / "gtk-4.0"):
-  putEnv("XDG_CONFIG_HOME", "/dev/null")
-
-var
-  lastClickedButton: array[2, int]
-
-# Display the GTK-4 GUI using owlkettle
-viewable App:
-  # 2D array storing the style for each button
-  buttonStyles: array[themeStyles.len(),array[themeColors.len(), StyleClass]]
-  hooks:
-    build:
-      # Make all buttons flat by default
-      for index in 0..state.buttonStyles.high():
-        fill(state.buttonStyles[index], ButtonFlat)
-
-      let currentTheme: string = execProcess("/usr/bin/xfconf-query",
-        args=["--channel=xsettings", "--property=/Net/ThemeName"],
-        options={}).strip(leading=false, trailing=true, chars={'\n'})
-
-      let currentThemeSplit: seq[string] = currentTheme.split('-', 2)
-
-      if currentThemeSplit.len() < 3 or currentThemeSplit[0] != "Colloid":
-        return
-
-      let currentThemeColorIndex = find(themeColors, currentThemeSplit[1])
-      let currentThemeStyleIndex = find(themeStyles, currentThemeSplit[2])
-
-      if -1 in [currentThemeColorIndex, currentThemeStyleIndex]:
-        return
-
-      # Highlight current theme button
-      state.buttonStyles[currentThemeStyleIndex][currentThemeColorIndex] = ButtonSuggested
-      lastClickedButton = [currentThemeStyleIndex, currentThemeColorIndex]
-
-method view(app: AppState): Widget =
-  result = gui:
-    Window:
-      title = "TROMjaro Theme Switcher"
-      # Shrink window to the smallest size
-      defaultSize = (0, 0)
-      # Vertical box
-      Box(orient = OrientY, margin = 7, spacing = 5):
-        Label:
-          text= "A Theme Switcher for TROMjaro's default theme-set (Colloid) and icon-set (Zafiro)."
-        for y, themeStyle in themeStyles:
-          # Horizontal box
-          Box(orient = OrientX, spacing = 5):
-            for x, 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 = app.buttonStyles[y][x]
-                proc clicked() =
-                  var thisButton = [y, x]
-                  setTheme(fmt"Colloid-{themeColor}-{themeStyle}")
-                  # Highlight this button
-                  app.buttonStyles[y][x] = ButtonSuggested
-                  if lastClickedButton != thisButton:
-                    # Remove highlight from lastClickedButton
-                    app.buttonStyles[lastClickedButton[0]][lastClickedButton[1]] = ButtonFlat
-                    lastClickedButton = thisButton
-
-brew("com.tromjaro.ThemeSwitcher", gui(App()), icons=[iconsDir], stylesheets=[newStylesheet(gtkCSS)])