This is the mail archive of the
insight@sources.redhat.com
mailing list for the Insight project.
[RFA] Address, line number and download progress.
- To: insight at sources dot redhat dot com
- Subject: [RFA] Address, line number and download progress.
- From: Ian Roxborough <irox at redhat dot com>
- Date: Mon, 15 Oct 2001 12:17:56 -0700
Hi,
this patch is part of the GUI enhancements we discussed the other
week. It moves the address and line number fields to the lower
right of the window (on the status bar) and moves the download
progress meter from hiding behind the search box to hide behind
the address and line number on the status bar.
I will break the rest into two patches, one to move the search
box up on to the tool bar and a one to add all the labels to the
comboboxes.
Thanks,
Ian.
2001-10-15 Ian Roxborough <irox@redhat.com>
* 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.
(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.12
diff -u -r1.12 srcbar.itcl
--- srcbar.itcl 2001/08/03 18:46:41 1.12
+++ srcbar.itcl 2001/10/15 18:49:18
@@ -534,12 +534,6 @@
$Tool add separator
}
- $Tool add label addr $address "Address" -width 10 -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,16 +1159,6 @@
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 {} {
- $Tool itemconfigure addr -text $address -font src-font
- }
-
- # 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.17
diff -u -r1.17 srcwin.itb
--- srcwin.itb 2001/10/04 15:01:36 1.17
+++ srcwin.itb 2001/10/15 18:49:21
@@ -112,17 +112,13 @@
$_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 +136,32 @@
# 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 +226,8 @@
#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 +252,7 @@
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 +279,9 @@
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
}
}
@@ -458,7 +479,8 @@
}
# set address and line widgets
- $_toolbar configure -address $addr -line $line
+ $_statusframe.addr configure -text $addr
+ $_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 -r1.7 srcwin.ith
--- srcwin.ith 2001/06/04 15:49:53 1.7
+++ srcwin.ith 2001/10/15 18:49:21
@@ -79,6 +79,7 @@
variable _statbar
variable _status
variable _toolbar
+ variable _statusframe
variable top
variable twin
variable current