aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIOhannes m zmölnig <zmoelnig@users.sourceforge.net>2013-10-28 14:14:48 +0000
committerIOhannes m zmölnig <zmoelnig@users.sourceforge.net>2013-10-28 14:14:48 +0000
commitb249ca69a00fdd997a3998286c85ac68447f781b (patch)
treea8500163d5599ff2146b165be271b60456fdac93
parent2f2a7d9155cbb914f598891f641e93db2bc748e4 (diff)
honour PD_KIOSK_CONFIG envvar for setting kiosk-config file
svn path=/trunk/guiplugins/kiosk-plugin/; revision=17223
-rw-r--r--kiosk-plugin.tcl9
1 files changed, 7 insertions, 2 deletions
diff --git a/kiosk-plugin.tcl b/kiosk-plugin.tcl
index 48886bf..d173d17 100644
--- a/kiosk-plugin.tcl
+++ b/kiosk-plugin.tcl
@@ -33,6 +33,7 @@ set ::kiosk::config(GeometryMain) ""
proc ::kiosk::readconfig {{fname kiosk.cfg}} {
+ set orgname $fname
if {[file exists $fname]} {
set fp [open $fname r]
} else {
@@ -40,7 +41,7 @@ proc ::kiosk::readconfig {{fname kiosk.cfg}} {
if {[file exists $fname]} {
set fp [open $fname r]
} else {
- puts "kiosk.cfg not found"
+ puts "kiosk-configuration not found: $orgname"
return False
}
}
@@ -125,7 +126,11 @@ proc ::kiosk::makekiosk {mywin} {
######################################
## read the default configuration file "kiosk.cfg"
-::kiosk::readconfig
+if { [info exists ::env(PD_KIOSK_CONFIG) ] } {
+ ::kiosk::readconfig $::env(PD_KIOSK_CONFIG)
+} {
+ ::kiosk::readconfig
+}
###### do some global KIOSK-settings