X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=client.tcl;h=7b528c9dc1a8dbac85f9f344119c9e1837da05b6;hb=3ceba8f2e4dff3eb9ae6238c9a7cb59c3ff98c37;hp=4a7841cc277154b1cce0a9d9d6813c23c8fa7199;hpb=522ba942f671244430c51362a06d2de6871de94a;p=ir-tcl-moved-to-github.git diff --git a/client.tcl b/client.tcl index 4a7841c..7b528c9 100644 --- a/client.tcl +++ b/client.tcl @@ -4,7 +4,18 @@ # Sebastian Hammer, Adam Dickmeiss # # $Log: client.tcl,v $ -# Revision 1.67 1995-09-20 14:35:19 adam +# Revision 1.70 1995-10-12 14:46:52 adam +# Better record popup windows. Next/prev buttons in popup record windows. +# The record position in the raw format is much more visible. +# +# Revision 1.69 1995/09/21 13:42:54 adam +# Bug fixes. +# +# Revision 1.68 1995/09/21 13:11:49 adam +# Support of dynamic loading. +# Test script uses load command if necessary. +# +# Revision 1.67 1995/09/20 14:35:19 adam # Minor changes. # # Revision 1.66 1995/08/29 15:30:13 adam @@ -298,7 +309,6 @@ set setNo 0 set setNoLast 0 set cancelFlag 0 set scanEnable 0 -set fullMarcSeq 0 set displayFormat 1 set popupMarcdf 0 set textWrap word @@ -683,6 +693,7 @@ proc about-origin-logo {n} { proc about-origin {} { set w .about-origin-w global libdir + global tk_version if {[winfo exists $w]} { destroy $w @@ -710,8 +721,10 @@ proc about-origin {} { 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" - pack $w.top.p.in $w.top.p.ii $w.top.p.iv -side top -anchor nw + pack $w.top.p.in $w.top.p.ii $w.top.p.iv $w.top.p.tk -side top -anchor nw about-origin-logo 1 bottom-buttons $w [list {Close} [list destroy $w] \ @@ -719,25 +732,21 @@ proc about-origin {} { } proc popup-marc {sno no b df} { - global fullMarcSeq global displayFormats global popupMarcdf if {[z39.$sno type $no] != "DB"} { return } - if {$b} { - set w .full-marc-$fullMarcSeq - incr fullMarcSeq - set df $popupMarcdf - } else { - set w .full-marc - set df $popupMarcdf + if {$b == -1} { + set b 0 + while {[winfo exists .full-marc$b]} { + incr b + } } - if {[winfo exists $w]} { - set new 0 - } else { - + set df $popupMarcdf + set w .full-marc$b + if {![winfo exists $w]} { toplevelG $w wm minsize $w 0 0 @@ -761,47 +770,52 @@ proc popup-marc {sno no b df} { $w.top.record tag configure marc-id -foreground black } $w.top.record tag configure marc-data -foreground black - set new 1 - } - $w.top.record delete 0.0 end - set recordType [z39.$sno recordType $no] - wm title $w "$recordType record #$no" + $w.top.record tag configure marc-head \ + -font -Adobe-Times-Medium-R-Normal-*-180-* \ + -background black -foreground white - if {$new} { - bind $w.top.record {destroy .full-marc} - pack $w.top.s -side right -fill y pack $w.top.record -expand yes -fill both - if {$b} { - bottom-buttons $w [list \ - {Close} [list destroy $w]] 0 - } else { - bottom-buttons $w [list \ - {Close} [list destroy $w] \ - {Duplicate} [list popup-marc $sno $no 1 0]] 0 - menubutton $w.bot.formats -text "Format" -menu $w.bot.formats.m - menu $w.bot.formats.m - set i 0 - foreach f $displayFormats { - $w.bot.formats.m add radiobutton -label $f \ - -variable popupMarcdf -value $i \ - -command [list display-$f $sno $no $w.top.record 0] - incr i - } - pack $w.bot.formats -expand yes -ipadx 2 -ipady 2 \ - -padx 3 -pady 3 -side left - } + bottom-buttons $w [list \ + {Close} [list destroy $w] \ + {Prev} {} \ + {Next} {} \ + {Duplicate} {}] 0 + menubutton $w.bot.formats -text "Format" -menu $w.bot.formats.m \ + -relief raised + menu $w.bot.formats.m + pack $w.bot.formats -expand yes -ipadx 2 -ipady 2 \ + -padx 3 -pady 3 -side left } else { - set i 0 $w.bot.formats.m delete 0 last - foreach f $displayFormats { - $w.bot.formats.m add radiobutton -label $f \ - -variable popupMarcdf -value $i \ - -command [list display-$f $sno $no $w.top.record 0] - incr i - } } + set i 0 + foreach f $displayFormats { + $w.bot.formats.m add radiobutton -label $f \ + -variable popupMarcdf -value $i \ + -command [list popup-marc $sno $no $b 0] + incr i + } + $w.top.record delete 0.0 end + set recordType [z39.$sno recordType $no] + wm title $w "$recordType record #$no" + + $w.bot.2 configure -command \ + [list popup-marc $sno [expr $no-1] $b $df] + $w.bot.4 configure -command \ + [list popup-marc $sno [expr $no+1] $b $df] + if {$no == 1} { + $w.bot.2 configure -state disabled + } else { + $w.bot.2 configure -state normal + } + if {[z39.$sno type [expr $no+1]] != "DB"} { + $w.bot.4 configure -state disabled + } else { + $w.bot.4 configure -state normal + } + $w.bot.6 configure -command [list popup-marc $sno $no -1 0] set ffunc [lindex $displayFormats $df] set ffunc "display-$ffunc" @@ -1483,10 +1497,6 @@ proc init-title-lines {} { .data.record delete 0.0 end } -proc title-press {y setno} { - show-full-marc $setno [expr 1 + [.data.list nearest $y]] 0 -} - proc add-title-lines {setno no offset} { global displayFormats global displayFormat @@ -3091,6 +3101,9 @@ if {! $monoFlag} { .data.record tag configure marc-id -foreground black } .data.record tag configure marc-data -foreground black +.data.record tag configure marc-head \ + -font -Adobe-Times-Medium-R-Normal-*-180-* \ + -foreground white -background black button .bot.logo -bitmap @${libdir}/bitmaps/book1 -command cancel-operation if {[tk4]} { @@ -3113,7 +3126,13 @@ pack .bot.a.target -side top -anchor nw -padx 2 -pady 2 pack .bot.a.status .bot.a.set .bot.a.message \ -side left -padx 2 -pady 2 -ipadx 1 -ipady 1 -catch {ir z39} +if {[catch {ir z39}]} { + set e [info sharedlibextension] + puts -nonewline "Loading irtcl$e ..." + load irtcl$e irtcl + ir z39 + puts "ok" +} #z39 logLevel all show-logo 1