gitk: add proc run_themeloader

gitk currently accepts a single themeloader file via the config file,
and will source this with errors reported to the console. This is fine
for simple configuration, but will not support interactive theme
exploration from the gui. In particular, a themeloader file must be
sourced only once as the themes defined cannot be re-defined. Also,
errors must be handled rather than just aborting while printing to the
console.  So, add a proc to handle the above, supporting expansion of
the gui config pages.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
This commit is contained in:
Mark Levedahl
2025-09-28 23:04:54 -04:00
parent 83a2de9ca6
commit 830c4578cd

22
gitk
View File

@@ -11861,6 +11861,23 @@ proc choose_extdiff {} {
}
}
proc run_themeloader {f} {
if {![info exists ::_themefiles_seen]} {
set ::_themefiles_seen [dict create]
}
set fn [file normalize $f]
if {![dict exists $::_themefiles_seen $fn]} {
if {[catch {source $fn} err]} {
error_popup "could not interpret: $fn\n$err"
dict set ::_themefiles_seen $fn 0
} else {
dict set ::_themefiles_seen $fn 1
}
}
return [dict get $::_themefiles_seen $fn]
}
proc choosecolor {v vi prefspage x} {
global $v
@@ -12742,7 +12759,10 @@ set nullid2 "0000000000000000000000000000000000000001"
set nullfile "/dev/null"
if {[file exists $themeloader]} {
source $themeloader
if {[run_themeloader $themeloader] == 0} {
puts stderr "Could not interpret themeloader: $themeloader"
exit 1
}
}
set appname "gitk"