Revision: 42194
http://brlcad.svn.sourceforge.net/brlcad/?rev=42194&view=rev
Author: brlcad
Date: 2011-01-13 01:54:35 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
search harder here too for aboutArcher.png and mike-tux.png
Modified Paths:
--------------
brlcad/trunk/src/tclscripts/archer/Archer.tcl
Modified: brlcad/trunk/src/tclscripts/archer/Archer.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-01-13 01:43:13 UTC
(rev 42193)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2011-01-13 01:54:35 UTC
(rev 42194)
@@ -96,7 +96,7 @@
LoadArcherLibs
package require ArcherCore 1.0
-package require Tktable 2.10
+catch {package require Tktable 2.10} tktable
package provide Archer 1.0
::itcl::class Archer {
@@ -2860,7 +2860,11 @@
} {}
# About Info
- set aboutImg [image create photo -file [file join $brlcadDataPath
tclscripts archer images aboutArcher.png]]
+ set imgfile [file join $brlcadDataPath tclscripts archer images
aboutArcher.png]
+ if { ![file exists $imgfile] } {
+ set imgfile [file join [bu_brlcad_data "src"] tclscripts archer images
aboutArcher.png]
+ }
+ set aboutImg [image create photo -file $imgfile]
itk_component add aboutInfo {
::ttk::label $itk_component(aboutDialogTabs).aboutInfo \
-image $aboutImg
@@ -2908,7 +2912,17 @@
::frame $itk_component(aboutDialogTabs).mikeInfo
} {}
- set mikeImg [image create photo -file [file join $brlcadDataPath
tclscripts mged mike-tux.png]]
+ # try installed, uninstalled
+ set imgfile [file join $brlcadDataPath tclscripts mged mike-tux.png]
+ if { ![file exists $imgfile] } {
+ # try src tree
+ set imgfile [file join [bu_brlcad_data "src"] tclscripts mged
mike-tux.png]
+ if { ![file exists $imgfile] } {
+ # try local relative
+ set imgfile [file join tclscripts mged mike-tux.png]
+ }
+ }
+ set mikeImg [image create photo -file $imgfile]
itk_component add mikePic {
::label $itk_component(mikeF).pic \
-image $mikeImg
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
