Compare commits

..

1 Commits

Author SHA1 Message Date
1cd60b163e gpt 2023-08-06 15:11:51 +02:00
6 changed files with 122 additions and 323 deletions

View File

@ -1,12 +1,12 @@
# makefile for tromjaro-theme-switcher # makefile for theme-switcher
build: build:
makepkg -s makepkg
install: install:
pamac-installer tromjaro-theme-switcher-*.tar.zst pamac-installer theme-switcher-*.tar.xz
remove: remove:
pamac-installer --remove tromjaro-theme-switcher pamac-installer --remove theme-switcher
clean: clean:
$(RM) -rf src/ pkg/ icons.tar.gz *.tar.zst $(RM) -rf src/ pkg/ *.tar.xz

View File

@ -1,68 +1,36 @@
# Maintainer: TROM <contact@tromsite.com> # Maintainer: TROM <contact@tromsite.com>
pkgname=tromjaro-theme-switcher pkgname=tromjaro-theme-switcher
pkgver=3 pkgver=1.2.0
pkgrel=4 pkgrel=1
pkgdesc="TROMjaro Theme switcher application" pkgdesc="TROMjaro Theme switcher application"
arch=('x86_64') arch=(any)
url="https://git.trom.tf/TROMjaro/theme-switcher-package" url=""
license=(unknown) license=(unknown)
depends=('tromjaro-fixes' depends=('yad'
'xfconf' 'zafiro-icon-theme'
'gtk4' 'skeuos-gtk')
'colloid-gtk-theme-git'
'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') provides=('tromjaro-theme-switcher')
backup=() backup=()
options=(!strip) options=(!strip)
source=("themeSwitcher.nim" source=("theme-switcher"
"tromjaro-theme-switcher.desktop" "tromjaro-theme-switcher.desktop"
"tromjaro-theme-switcher.svg" "tromjaro-theme-switcher.svg"
"icons.tar.gz::https://www.drive.tromsite.com/s/ysM33nJAkpro85b/download/icons.tar.gz") "https://www.drive.tromsite.com/s/zFtCp3SkZ4NpKix/download")
sha256sums=('SKIP' sha256sums=('SKIP'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'SKIP') 'SKIP')
prepare() {
# Disable telemetry in choosenim if user is running it for the first time
[ -f "$HOME"/.choosenim/analytics ] || {
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 '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
}
build(){
echo 'Compile themeSwitcher.nim for release build:'
"$HOME"/.nimble/bin/nim c -d:release --out:${srcdir}/themeSwitcher ${srcdir}/themeSwitcher.nim
}
package() { package() {
# copy icons # copy icons
install -d ${pkgdir}/usr/share/tromjaro-theme-switcher/icons/Styles install -d ${pkgdir}/usr/share/tromjaro-theme-switcher/icons
install -Dm644 ${srcdir}/icons/Styles/* ${pkgdir}/usr/share/tromjaro-theme-switcher/icons/Styles install -Dm644 ${srcdir}/icons/* ${pkgdir}/usr/share/tromjaro-theme-switcher/icons
for source_dir in "${srcdir}/icons/Accent Colors"/*; do # copy executables
dest_dir="${pkgdir}/usr/share/tromjaro-theme-switcher/icons/Accent Colors/${source_dir##*/}" install -Dm644 ${srcdir}/tromjaro-theme-switcher.desktop ${pkgdir}/usr/share/applications/tromjaro-theme-switcher.desktop
install -d "$dest_dir" install -Dm755 ${srcdir}/theme-switcher ${pkgdir}/usr/bin/tromjaro-theme-switcher
install -Dm644 "$source_dir"/* "$dest_dir"
done
# copy executables # copy the icon
install -Dm644 ${srcdir}/tromjaro-theme-switcher.desktop ${pkgdir}/usr/share/applications/tromjaro-theme-switcher.desktop install -d ${pkgdir}/usr/share/icons/hicolor/scalable/apps
install -Dm755 ${srcdir}/themeSwitcher ${pkgdir}/usr/bin/tromjaro-theme-switcher install -Dm644 ${srcdir}/tromjaro-theme-switcher.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps
# 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
} }

View File

@ -1,8 +1,6 @@
# TROMjaro Theme switcher # TROMjaro Theme switcher package
A Theme Switcher app for TROMjaro's default theme-set ([Colloid](https://github.com/vinceliuice/Colloid-gtk-theme)) and icon-set ([Zafiro](https://github.com/zayronxio/Zafiro-icons)). It gives you a nice and easy interface to try out different themes quickly. TROMjaro Theme switcher application
<video width="720" height="480" controls autoplay title="Screen recording of the app in action" src="https://git.trom.tf/TROMjaro/theme-switcher-package/raw/branch/main/screenRecord.mp4" type="video/mp4"></video>
## Building the package ## Building the package
@ -18,6 +16,6 @@ To remove just installed package, use:
`make remove` `make remove`
To cleanup the project folder, use: To cleanup the project, use:
`make clean` `make clean`

Binary file not shown.

95
theme-switcher Normal file
View File

@ -0,0 +1,95 @@
#!/bin/bash
icons=/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
xfconf-query -c xfce4-panel -p /panels/dark-mode -n -t bool -s true
}
disable_dark_panels() {
# Disable dark panels
xfconf-query -c xfce4-panel -p /panels/dark-mode -n -t bool -s false
}
show_icon_dialog() {
local icon_path=$1
yad --image "$icon_path" --title "Theme Icon" --window-icon=gtk-dialog-info --no-buttons --timeout=2
}
set_theme() {
local theme=$1
local icon_theme
local enable_dark
case "$theme" in
Colloid-Grey-Dark-Nord | Colloid-Grey | Colloid-Pink | Colloid-Green | Colloid-Orange | Colloid-Purple | Colloid-Teal | Colloid-Yellow | Colloid-Pink-Dark-Nord | Colloid-Green-Dark-Nord | Colloid-Orange-Dark-Nord | Colloid-Purple-Dark-Nord | Colloid-Teal-Dark-Nord | Colloid-Yellow-Dark-Nord | Colloid-Dark-Nord)
icon_theme='zafiro-dark'
enable_dark=true
;;
*)
icon_theme='zafiro'
enable_dark=false
;;
esac
if [ "$enable_dark" = true ]; then
enable_dark_panels
set_icon_theme "$icon_theme"
else
disable_dark_panels
set_icon_theme "$icon_theme"
fi
# Change the main theme to the chosen one
xfconf-query -c xsettings -p /Net/ThemeName -n -t string -s "$theme"
xfconf-query -c xfwm4 -p /general/theme -n -t string -s "$theme"
notify-send "$theme theme was enabled"
}
export -f set_icon_theme set_theme enable_dark_panels disable_dark_panels show_icon_dialog
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 8 --width=1000 --height=400 \
--field=!"$icons/Colloid-Grey.png"!'Colloid-Grey':FBTN "set_theme 'Colloid-Grey'" \
--field=!"$icons/Colloid-Grey-Light.png"!'Colloid-Grey-Light':FBTN "set_theme 'Colloid-Grey-Light'" \
--field=!"$icons/Colloid-Grey-Dark-Nord.png"!'Colloid-Grey-Dark-Nord':FBTN "set_theme 'Colloid-Grey-Dark-Nord'" \
--field=!"$icons/Colloid-Grey-Dark-Gruvbox.png"!'Colloid-Grey-Dark-Gruvbox':FBTN "set_theme 'Colloid-Grey-Dark-Gruvbox'" \
\
--field=!"$icons/Colloid-Pink.png"!'Colloid-Pink':FBTN "set_theme 'Colloid-Pink'" \
--field=!"$icons/Colloid-Pink-Light.png"!'Colloid-Pink-Light':FBTN "set_theme 'Colloid-Pink-Light'" \
--field=!"$icons/Colloid-Pink-Dark-Nord.png"!'Colloid-Pink-Dark-Nord':FBTN "set_theme 'Colloid-Pink-Dark-Nord'" \
--field=!"$icons/Colloid-Pink-Dark-Gruvbox.png"!'Colloid-Pink-Dark-Gruvbox':FBTN "set_theme 'Colloid-Pink-Dark-Gruvbox'" \
\
--field=!"$icons/Colloid-Green.png"!'Colloid-Green':FBTN "set_theme 'Colloid-Green'" \
--field=!"$icons/Colloid-Green-Light.png"!'Colloid-Green-Light':FBTN "set_theme 'Colloid-Green-Light'" \
--field=!"$icons/Colloid-Green-Dark-Nord.png"!'Colloid-Green-Dark-Nord':FBTN "set_theme 'Colloid-Green-Dark-Nord'" \
\
--field=!"$icons/Colloid-Orange.png"!'Colloid-Orange':FBTN "set_theme 'Colloid-Orange'" \
--field=!"$icons/Colloid-Orange-Light.png"!'Colloid-Orange-Light':FBTN "set_theme 'Colloid-Orange-Light'" \
--field=!"$icons/Colloid-Orange-Dark-Nord.png"!'Colloid-Orange-Dark-Nord':FBTN "set_theme 'Colloid-Orange-Dark-Nord'" \
\
--field=!"$icons/Colloid-Purple.png"!'Colloid-Purple':FBTN "set_theme 'Colloid-Purple'" \
--field=!"$icons/Colloid-Purple-Light.png"!'Colloid-Purple-Light':FBTN "set_theme 'Colloid-Purple-Light'" \
--field=!"$icons/Colloid-Purple-Dark-Nord.png"!'Colloid-Purple-Dark-Nord':FBTN "set_theme 'Colloid-Purple-Dark-Nord'" \
\
--field=!"$icons/Colloid-Teal.png"!'Colloid-Teal':FBTN "set_theme 'Colloid-Teal'" \
--field=!"$icons/Colloid-Teal-Light.png"!'Colloid-Teal-Light':FBTN "set_theme 'Colloid-Teal-Light'" \
--field=!"$icons/Colloid-Teal-Dark-Nord.png"!'Colloid-Teal-Dark-Nord':FBTN "set_theme 'Colloid-Teal-Dark-Nord'" \
\
--field=!"$icons/Colloid-Yellow.png"!'Colloid-Yellow':FBTN "set_theme 'Colloid-Yellow'" \
--field=!"$icons/Colloid-Yellow-Light.png"!'Colloid-Yellow-Light':FBTN "set_theme 'Colloid-Yellow-Light'" \
--field=!"$icons/Colloid-Yellow-Dark-Nord.png"!'Colloid-Yellow-Dark-Nord':FBTN "set_theme 'Colloid-Yellow-Dark-Nord'" \
--field=!"$icons/Colloid-Yellow-Dark-Gruvbox.png"!'Colloid-Yellow-Dark-Gruvbox':FBTN "set_theme 'Colloid-Yellow-Dark-Gruvbox'" \
\
--field=!"$icons/Colloid-Dark-Nord.png"!'Colloid-Dark-Nord':FBTN "set_theme 'Colloid-Dark-Nord'" \
--field=!"$icons/Colloid-Pink-Dark-Nord.png"!'Colloid-Pink-Dark-Nord':FBTN "set_theme 'Colloid-Pink-Dark-Nord'" \
--field=!"$icons/Colloid-Green-Dark-Nord.png"!'Colloid-Green-Dark-Nord':FBTN "set_theme 'Colloid-Green-Dark-Nord'" \
--field=!"$icons/Colloid-Orange-Dark-Nord.png"!'Colloid-Orange-Dark-Nord':FBTN "set_theme 'Colloid-Orange-Dark-Nord'" \
--field=!"$icons/Colloid-Purple-Dark-Nord.png"!'Colloid-Purple-Dark-Nord':FBTN "set_theme 'Colloid-Purple-Dark-Nord'" \
--field=!"$icons/Colloid-Teal-Dark-Nord.png"!'Colloid-Teal-Dark-Nord':FBTN "set_theme 'Colloid-Teal-Dark-Nord'" \
--field=!"$icons/Colloid-Yellow-Dark-Nord.png"!'Colloid-Yellow-Dark-Nord':FBTN "set_theme 'Colloid-Yellow-Dark-Nord'" \
--field=!"$icons/Colloid-Dark-Nord.png"!'Colloid-Dark-Nord':FBTN "set_theme 'Colloid-Dark-Nord'"

View File

@ -1,262 +0,0 @@
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/strutils import split, endsWith, contains
from std/options import Option, some, get, isNone
from std/strformat import fmt
import owlkettle
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 = """
.style-button {
min-width: 5.5em;
min-height: 5em;
padding: 0.3em;
border-radius: 14%;
}
.accent-button {
-gtk-icon-size: 1.65em;
padding: 0.4em;
border-radius: 50%;
}
#.accent-button.suggested-action {
# outline-color: black;
# outline-width: 0.05em;
# outline-offset: -0.45em;
}"""
appID = "com.tromjaro.ThemeSwitcher"
appLogo = "tromjaro-theme-switcher"
themeShades = ["Light", "", "Dark"]
themeStyles = ["Default", "Nord", "Dracula", "Catppuccin", "Everforest", "Gruvbox"]
accentColors = ["Blue", "Red", "Purple", "Pink", "Teal", "Green", "Yellow", "Orange", "Grey"]
var iconsDirs: seq[string]
for dir in walkDirs(accentIconsDir / "*"):
iconsDirs.add(dir)
type Theme = tuple[shade: string, style: string, color: string]
# Function prototypes
proc getCurrentTheme(): Theme
proc makeThemeButton(shadeName: string, styleName: string): Widget
proc makeAccentButton(accentColor: string): Widget
proc runCommand(command: string, args: openArray[string]): bool
proc setIconTheme(iconName: string)
proc enableDarkPanels(): bool
proc setTheme(themeName: string)
# Highlight current theme button
var currentTheme = getCurrentTheme()
var
oldConfigDir: Option[string]
configDirChanged: bool
# Prevent loading GTK theme from ~/.config/gtk-4.0 directory when it is a symlink
if symlinkExists(getConfigDir() / "gtk-4.0"):
if existsEnv("XDG_CONFIG_HOME"):
oldConfigDir = some(getEnv("XDG_CONFIG_HOME"))
putEnv("XDG_CONFIG_HOME", "/dev/null")
configDirChanged = true
# Display the GTK-4 GUI using owlkettle
viewable App:
hooks:
build:
# Reset the user's XDG_CONFIG_HOME variable back to what it was before
if configDirChanged == true:
if oldConfigDir.isNone():
delEnv("XDG_CONFIG_HOME")
else:
putEnv("XDG_CONFIG_HOME", get(oldConfigDir))
method view(app: AppState): Widget =
result = gui:
Window:
title = "TROMjaro Theme Switcher"
# Shrink window to the smallest size
defaultSize = (1, 1)
iconName = appLogo
# Vertical box
Box(orient = OrientY, margin = 13, spacing = 10):
Label:
useMarkup=true
text="<span size='large'>STYLE</span>"
# Vertical box
Box(orient = OrientY, spacing = 5):
for shadeName in themeShades:
# Horizontal box
Box(orient = OrientX, spacing = 5):
for styleName in themeStyles:
insert(makeThemeButton(shadeName, styleName)) {.vAlign: AlignCenter, hAlign: AlignCenter.}
Separator(margin = Margin(top: 5)) {.vAlign: AlignCenter.}
Label:
useMarkup=true
text="<span size='large'>ACCENT COLOR</span>"
# Horizontal box
Box(orient = OrientX, spacing = 3):
for accentColor in accentColors:
insert(makeAccentButton(accentColor)) {.vAlign: AlignCenter, hAlign: AlignCenter.}
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>"
brew(appID, gui(App()), icons=iconsDirs, stylesheets=[newStylesheet(gtkCSS)])
# Function declarations
proc getCurrentTheme(): Theme =
let currentThemeString = execProcess("/usr/bin/xfconf-query",
args=["--channel=xsettings", "--property=/Net/ThemeName"],
options={})[0 .. ^2]
let words = currentThemeString.split('-')
if words[0] != "Colloid":
return
var currentTheme: Theme = ("", "Default", "Blue")
case len(words):
of 1: discard
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
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
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
result = currentTheme
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}"
theme = 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(theme)
# 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}"
theme = 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(theme)
# Highlight this button
currentTheme.color = accentColor
if currentTheme.style == "":
currentTheme.style = "Default"
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)