# Sebastian Hammer, Adam Dickmeiss
#
# $Log: client.tcl,v $
-# Revision 1.103 1998-01-30 13:30:50 adam
+# Revision 1.106 1998-06-10 13:22:47 adam
+# Minor changes.
+#
+# Revision 1.105 1998/06/10 13:00:45 adam
+# Added ir-version command.
+#
+# Revision 1.104 1998/02/12 13:32:41 adam
+# Updated configuration system.
+#
+# Revision 1.103 1998/01/30 13:30:50 adam
# Name of target database is irtdb.tcl instead of clientrc.tcl.
#
# Revision 1.102 1997/11/19 13:19:54 adam
#
#
+
# Procedure tk4 is defined - returns 0 if tk 3.6 - returns 1 otherwise
if {$tk_version == "3.6"} {
proc tk4 {} {
set profile($target,comstack) [lindex $profile($target) 6]
set profile($target,databases) [lindex $profile($target) 7]
set profile($target,timeDefine) $timedef
-
- incr profile(Default,windowNumber)
+ set profile($target,windowNumber) 1
}
unset profile($target)
}
}
+# Assign unique ID's to each target's window number
+set wno 1
+foreach n [array names profile *,windowNumber] {
+ set profile($n) $wno
+ incr wno
+}
+set profile(Default,windowNumber) $wno
+
# These globals describe the current query type. They are set to the
# first query type.
set queryButtonsFind [lindex $queryButtons 0]
}
+# Procedure place-force {window parent}
+# window new top level widget
+# parent parent widget used as base
+# Sets geometry of $window relative to $parent window.
+proc place-force {window parent} {
+ set g [wm geometry $parent]
+
+ set p1 [string first + $g]
+ set p2 [string last + $g]
+
+ set x [expr 40+[string range $g [expr $p1 +1] [expr $p2 -1]]]
+ set y [expr 60+[string range $g [expr $p2 +1] end]]
+ wm geometry $window +${x}+${y}
+}
+
# Procedure destroyGW {w}
# w top level widget
# Saves geometry of widget w in windowGeometry array. This
pack $w.bot -fill both
}
+# Init: The geometry information for the main window is set - either
+# to a default value or to the value in windowGeometry(.)
+if {[catch {set g $windowGeometry(.)}]} {
+ wm geometry . 420x340+20+20
+} else {
+ wm geometry . $g
+}
+
+# Init: The geometry information for the main window is set - either
+# to a default value or to the value in windowGeometry(.)
+toplevelG .init
+place-force .init .
+message .init.top -text "IrTcl" -relief raised -border 1 -font $font(bb,normal)
+text .init.msg -width 30 -height 4
+pack .init.top -side top -fill x -expand yes
+pack .init.msg -side bottom -fill both -expand yes
+wm iconify .
+update
+
# Procedure top-down-ok-cancel {w ok-action g}
# w top level widget with $w.bot-frame
# ok-action ok script
label $w.top.a.logo -bitmap @${libdir}/bitmaps/book1
pack $w.top.a.irtcl $w.top.a.logo -side left -expand yes
- set i unknown
- catch {set i [z39 implementationName]}
- label $w.top.p.in -text "Implementation name: $i"
- catch {set i [z39 implementationId]}
- label $w.top.p.ii -text "Implementation id: $i"
- catch {set i [z39 implementationVersion]}
- label $w.top.p.iv -text "Implementation version: $i"
- set i $tk_version
- label $w.top.p.tk -text "Tk version: $i"
+ label $w.top.p.irtcl -text "IrTcl version: [lindex [ir-version] 0]"
+ label $w.top.p.yaz -text "Yaz version: [lindex [ir-version] 1]"
- pack $w.top.p.in $w.top.p.ii $w.top.p.iv $w.top.p.tk -side top -anchor nw
+ label $w.top.p.tk -text "Tk version: $tk_version"
+
+ pack $w.top.p.irtcl $w.top.p.yaz $w.top.p.tk -side top -anchor nw
about-origin-logo 1
bottom-buttons $w [list {Close} [list destroy $w] \
configure-disable-e .top.target.m 1
configure-disable-e .top.target.m 2
if {[tk4]} {
- .top.rset.m delete 2 last
+ .top.rset.m delete 1 last
} else {
.top.rset.m delete 1 last
}
destroy $w
}
-# Procedure place-force {window parent}
-# window new top level widget
-# parent parent widget used as base
-# Sets geometry of $window relative to $parent window.
-proc place-force {window parent} {
- set g [wm geometry $parent]
-
- set p1 [string first + $g]
- set p2 [string last + $g]
-
- set x [expr 40+[string range $g [expr $p1 +1] [expr $p2 -1]]]
- set y [expr 60+[string range $g [expr $p2 +1] end]]
- wm geometry $window +${x}+${y}
-}
-
# Procedure add-database-action {target w}
# target target to be defined
# w top level widget for the target definition
$w.0 configure -background red
}
-# Init: The geometry information for the main window is set - either
-# to a default value or to the value in windowGeometry(.)
-if {[catch {set g $windowGeometry(.)}]} {
- wm geometry . 420x340
-} else {
- wm geometry . $g
-}
-
# Init: Presentation formats are read.
read-formats
irmenu .top.service.m.dblist
+# Init: Definition of Set menu.
menubutton .top.rset -text Set -menu .top.rset.m
irmenu .top.rset.m
.top.rset.m add command -label Load -command {load-set}
# Init: Determine if the IrTcl extension is already there. If
# not, then dynamically load the IrTcl extension.
-if {[catch {ir z39}]} {
+set logLevel all
+if {[catch {ir-version}]} {
set e [info sharedlibextension]
- puts -nonewline "Loading irtcl$e ..."
- load ${libdir}/irtcl$e irtcl
- ir z39
- puts "ok"
+ .init.msg insert end "Loading irtcl$e.\n"
+ catch {load ${libdir}/irtcl$e irtcl}
+ if {[catch {ir-version}]} {
+ catch {load irtcl$e irtcl}
+ }
}
+.init.msg insert end "IrTcl version [lindex [ir-version] 0]\n"
+.init.msg insert end "YAZ version [lindex [ir-version] 1]\n"
+ir-log-init all irtcl.log
+
+# Create Z Assocation
+ir z39
+
if {[file exists ${libdir}/explain.tcl]} {
source ${libdir}/explain.tcl
}
source ${libdir}/setup.tcl
}
-# Init: Uncomment this line if you wan't to enable logging.
-ir-log-init all
+after 900 activateMainWindow
-# Init: If hostid is a valid target, a new connection will be established
-# immediately.
-if {[string compare $hostid Default]} {
- catch {open-target $hostid $hostbase}
+proc activateMainWindow {} {
+ global hostid hostbase
+ destroy .init
+ wm deiconify .
+ if {[string compare $hostid Default]} {
+ catch {open-target $hostid $hostbase}
+ }
+ show-logo 1
}
-
-# Init: Enable the logo.
-show-logo 1
-