From: Pat Thoyts Date: Thu, 19 Jun 2008 22:29:40 +0000 (+0100) Subject: Removed unecessary frame from debug tab (ttk::frames just need a raise call when... X-Git-Url: https://privyetmir.co.uk/gitweb.cgi?a=commitdiff_plain;h=c484461d92355be6ed2f53c068faad0bc5a13150;p=Bullfrog Removed unecessary frame from debug tab (ttk::frames just need a raise call when managed) --- diff --git a/bin/bf_xmpp.tcl b/bin/bf_xmpp.tcl index 1122e4b..4eea4f7 100644 --- a/bin/bf_xmpp.tcl +++ b/bin/bf_xmpp.tcl @@ -677,6 +677,7 @@ proc ::xmppplugin::OnMessage2 {ctx jlib xmldata} { # record the current conversation thread or create one if {$thread eq {}} { set thread [uuid::uuid generate] } + # maintain per chat state in dicts. Note: we should receive an active # from the remote client in response to our initial message which enables # chatstate support. diff --git a/bin/bullfrog.tcl b/bin/bullfrog.tcl index 765b3e6..b469598 100644 --- a/bin/bullfrog.tcl +++ b/bin/bullfrog.tcl @@ -85,8 +85,7 @@ proc Main {args} { ttk::notebook $app.nb -style ButtonNotebook # Always create the debug tab - but hide it unless -debug given - set debugf [frame $app.nb.debugf -borderwidth 0 -highlightthickness 0] - set debug [ttk::frame $app.nb.debugf.debug -style ChatwidgetFrame] + set debug [ttk::frame $app.nb.debug -style ChatwidgetFrame] text $debug.text -relief flat -borderwidth 0 -wrap word \ -state disabled -font DebugFont \ -yscrollcommand [list $debug.vs set] @@ -96,11 +95,8 @@ proc Main {args} { grid $debug.text $debug.vs -sticky news -padx 1 -pady 1 grid rowconfigure $debug 0 -weight 1 grid columnconfigure $debug 0 -weight 1 - grid $debug -sticky news - grid rowconfigure $debugf 0 -weight 1 - grid columnconfigure $debugf 0 -weight 1 - $app.nb add $debugf -state hidden -text [mc "Debug"] - if {$opts(-debug)} { $app.nb tab $debugf -state normal } + $app.nb add $debug -state hidden -text [mc "Debug"] + if {$opts(-debug)} { $app.nb tab $debug -state normal } set status [ttk::frame $app.status] ttk::label $status.pane0 -anchor w @@ -181,7 +177,7 @@ proc State {Chat message} { proc Debug {Chat message {type debug}} { upvar #0 $Chat chat - set w $chat(app).nb.debugf.debug.text + set w $chat(app).nb.debug.text if {[winfo exists $w]} { set t [clock format [clock seconds] -format "%H:%M:%S"] $w configure -state normal @@ -271,6 +267,7 @@ proc DetachWindow {app} { wm title $tab $title wm protocol $tab WM_DELETE_WINDOW \ [namespace code [list AttachWindow $app $tab $index]] + raise $tab } } proc AttachWindow {app w {index end}} {