From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7070 invoked by alias); 7 Jan 2002 18:08:15 -0000 Mailing-List: contact insight-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: insight-owner@sources.redhat.com Received: (qmail 6913 invoked from network); 7 Jan 2002 18:08:09 -0000 X-Authentication-Warning: makita.cygnus.com: keiths owned process doing -bs Date: Mon, 07 Jan 2002 10:08:00 -0000 From: Keith Seitz X-X-Sender: To: Ian Roxborough cc: Subject: Re: [Patch] Move line number and address display. In-Reply-To: <20020107010025.5a8de5ed.irox@redhat.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-SW-Source: 2002-q1/txt/msg00032.txt.bz2 On Mon, 7 Jan 2002, Ian Roxborough wrote: > I've just checked in this patch to move the line number and address > display to the botton right of the source window on the status bar. > The download progress meter is also moved from "hiding behind" the > search text entry box on the toolbar to "hiding behind" the line number > and address display on the status bar. Thanks! > Let me know if you have any problems related to this, You bet! :-) Keith > 2002-01-07 Ian Roxborough > > * library/srcbar.itcl (SrcBar::create_buttons): Line number > and address fields have been removed and added to the > status bar. > * library/srcwin.itb (SrcWin::_build_win): Add address and > line number fields to status bar. Moved download progress > bar to status bar. > (SrcWin::download_progress): Use canvas on status bar. > Remember to adjust width of 64-bit address. > (SrcWin::location): Set line number and address on status bar. > * library/srcwin.ith (SrcWin): Added new private variable. > > Index: library/srcbar.itcl > =================================================================== > RCS file: /cvs/src/src/gdb/gdbtk/library/srcbar.itcl,v > retrieving revision 1.13 > diff -u -p -r1.13 srcbar.itcl > --- srcbar.itcl 2001/10/29 21:45:30 1.13 > +++ srcbar.itcl 2002/01/07 08:56:38 > @@ -534,12 +534,6 @@ class SrcBar { > $Tool add separator > } > > - $Tool add label addr $address "Address" -relief sunken \ > - -bd 1 -anchor e -font src-font > - > - $Tool add label line $line "Line Number" -width 6 -relief sunken \ > - -bd 1 -anchor e -font src-font > - > $Tool toolbar_button_right_justify > > create_stack_buttons > @@ -1165,23 +1159,6 @@ Do you want to continue?" \ > public variable updatevalue 0 { > global GDBSrcBar_state > ::set GDBSrcBar_state($this) $updatevalue > - } > - > - # This holds the text that is shown in the address label. > - public variable address {} { > - if {[string length $address] > 10} { > - # 64-bit address plus "0x" > - set width 18 > - } else { > - # 32-bit address plus "0x" > - set width 10 > - } > - $Tool itemconfigure addr -text $address -font src-font -width $width > - } > - > - # This holds the text that is shown in the line label. > - public variable line {} { > - $Tool itemconfigure line -text $line > } > > # This holds the source window's display mode. Valid values are > Index: library/srcwin.itb > =================================================================== > RCS file: /cvs/src/src/gdb/gdbtk/library/srcwin.itb,v > retrieving revision 1.18 > diff -u -p -r1.18 srcwin.itb > --- srcwin.itb 2001/11/05 19:14:00 1.18 > +++ srcwin.itb 2002/01/07 08:56:41 > @@ -111,18 +111,13 @@ body SrcWin::_build_win {} { > $_statbar.mode list insert end MIXED > $_statbar.mode list insert end SRC+ASM > > - > - # Search/download progress frame > + # Search > frame $_statbar.frame > entry $_statbar.frame.search -bd 3 -font src-font -width 10 > bind_plain_key $_statbar.frame.search \ > Return [code $this _search forwards] > bind_plain_key $_statbar.frame.search \ > Shift-Return [code $this _search backwards] > - canvas $_statbar.frame.progress -relief sunken -borderwidth 2 \ > - -highlightthickness 0 -takefocus 0 -width 100 -height 0 -confine 1 > - $_statbar.frame.progress create rectangle 0 0 0 \ > - [winfo height $_statbar.frame.progress] -outline blue -fill blue -tags rect > pack $_statbar.frame -side right -pady 4 -padx 10 -fill y -expand 1 -anchor e pack $_statbar.mode -side right -padx 10 -pady 4 > @@ -140,8 +135,32 @@ body SrcWin::_build_win {} { > > # add status line > set _status [conAdd status -resizable 0] > + set _statusframe [frame $_status] > + set _status $_statusframe.con > label $_status -relief sunken -bd 3 -font global/status -height 1 > - pack $_status -expand 1 -fill both > + > + # add download progress meter > + canvas $_statusframe.progress -relief sunken -borderwidth 2 \ > + -highlightthickness 0 -takefocus 0 -width 100 -height 0 -confine 1 > + $_statusframe.progress create rectangle 0 0 0 \ > + [winfo height $_statusframe.progress] -outline blue -fill blue -tags rect+ > + # add address and line number indicators > + label $_statusframe.addr -text "" -width 10 -relief sunken \ > + -bd 1 -anchor e -font src-font > + label $_statusframe.line -text "" -width 6 -relief sunken \ > + -bd 1 -anchor e -font src-font > + > + balloon register $_statusframe.addr "Address" > + balloon register $_statusframe.line "Line number" > + > + pack $_statusframe -expand 1 -fill both > + grid $_status -row 0 -column 1 -sticky news -pady 2 -padx 2 > + grid $_statusframe.addr -row 0 -column 3 -sticky nes -pady 4 > + grid $_statusframe.line -row 0 -column 4 -sticky nws -pady 4 > + grid columnconfigure $_statusframe 1 -weight 10 > + grid columnconfigure $_statusframe 2 -minsize 5 > + grid columnconfigure $_statusframe 5 -minsize 5 > } > > set_execution_status > @@ -206,8 +225,8 @@ body SrcWin::download_progress { section > > #debug "$section $num $tot $msg" > if {$last_section_start == 0} { > - pack forget $_statbar.frame.search > - pack $_statbar.frame.progress -fill both -expand yes > + grid forget $_statusframe.addr $_statusframe.line > + grid $_statusframe.progress -row 0 -column 4 -padx 4 -sticky news > ::update idletasks > } > > @@ -232,7 +251,7 @@ body SrcWin::download_progress { section > set_status "Downloading section $section - $num bytes" > } > > - set canvas $_statbar.frame.progress > + set canvas $_statusframe.progress > set height [winfo height $canvas] > if {$last_done} { > set width [winfo width $canvas] > @@ -259,8 +278,9 @@ body SrcWin::download_progress { section > set last_done 0 > set last_section_start 0 > > - pack forget $_statbar.frame.progress > - pack $_statbar.frame.search -fill x -expand yes > + grid forget $_statusframe.progress > + grid $_statusframe.addr -row 0 -column 3 -sticky new -pady 4 > + grid $_statusframe.line -row 0 -column 4 -sticky nws -pady 4 > ::update idletasks > } > } > @@ -457,7 +477,15 @@ body SrcWin::location {tag linespec} { > } > > # set address and line widgets > - $_toolbar configure -address $addr -line $line > + if {[string length $address] > 10} { > + # 64-bit address plus "0x" > + set width 18 > + } else { > + # 32-bit address plus "0x" > + set width 10 > + } > + $_statusframe.addr configure -text $addr -font src-font -width $width > + $_statusframe.line configure -text $line > > # set function combobox > $_statbar.func entryset $funcname > Index: library/srcwin.ith > =================================================================== > RCS file: /cvs/src/src/gdb/gdbtk/library/srcwin.ith,v > retrieving revision 1.7 > diff -u -p -r1.7 srcwin.ith > --- srcwin.ith 2001/06/04 15:49:53 1.7 > +++ srcwin.ith 2002/01/07 08:56:41 > @@ -79,6 +79,7 @@ class SrcWin { > variable _statbar > variable _status > variable _toolbar > + variable _statusframe > variable top > variable twin > variable current >