diff -ruNp gdbtk_orig/library/locals.tcl gdbtk/library/locals.tcl --- gdbtk_orig/library/locals.tcl 2006-12-01 04:34:39.000000000 +0100 +++ gdbtk/library/locals.tcl 2012-04-11 13:58:01.853490600 +0200 @@ -1,5 +1,5 @@ # Local Variable Window for Insight. -# Copyright (C) 2002, 2003, 2006 Red Hat +# Copyright (C) 2002-2012 Red Hat, Inc. # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License (GPL) as published by @@ -45,6 +45,14 @@ itcl::class LocalsWin { cursor watch } + # ------------------------------------------------------------------ + # PUBLIC METHOD: reconfig - used when preferences change + # ------------------------------------------------------------------ + method reconfig {} { + debug + $tree update + } + # Re-enable the UI method idle {event} { debug diff -ruNp gdbtk_orig/library/prefs.tcl gdbtk/library/prefs.tcl --- gdbtk_orig/library/prefs.tcl 2008-03-04 00:25:03.000000000 +0100 +++ gdbtk/library/prefs.tcl 2012-04-11 13:59:37.809259100 +0200 @@ -1,5 +1,5 @@ # Local preferences functions for Insight. -# Copyright (C) 1997, 1998, 1999, 2002, 2003, 2004, 2008 Red Hat +# Copyright (C) 1997-2012 Red Hat, Inc. # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License (GPL) as published by @@ -146,14 +146,18 @@ proc pref_read {} { if {[pref get gdb/use_color_schemes] != "1"} { pref_set_colors $home } else { - global Colors # These colors are the same for all schemes + global Colors set Colors(textfg) black set Colors(fg) black set Colors(sbg) \#4c59a5 set Colors(sfg) white set_bg_colors } + + # set color for changes + global Colors + set Colors(change) [pref get gdb/src/PC_TAG] } # ------------------------------------------------------------------ @@ -333,12 +337,12 @@ proc pref_set_defaults {} { pref define gdb/console/wrap 0 pref define gdb/console/prompt_fg DarkGreen pref define gdb/console/error_fg red - pref define gdb/console/log_fg green + pref define gdb/console/log_fg \#00b300 pref define gdb/console/target_fg blue pref define gdb/console/font global/fixed # Source window defaults - pref define gdb/src/PC_TAG green + pref define gdb/src/PC_TAG \#00b300 pref define gdb/src/STACK_TAG gold pref define gdb/src/BROWSE_TAG \#9595e2 pref define gdb/src/handlebg red @@ -490,6 +494,7 @@ proc pref_set_colors {home} { # then Insight won't be able to display sources and highlight things properly. # Therefore we will not change the textfg and textbg. + pref_load_default switch [pref get gdb/compat] { "Windows" { @@ -508,7 +513,6 @@ proc pref_set_colors {home} { "KDE" { debug "loading OS colors for KDE" - pref_load_default # try loading "~/.gtkrc-kde" if {[pref_load_gnome $home [list .gtkrc-kde]]} { debug "loaded gnome file" @@ -550,13 +554,11 @@ proc pref_set_colors {home} { } "GNOME" { - pref_load_default pref_load_gnome $home pref_set_option_db 0 } "default" { - pref_load_default pref_set_option_db 1 } } @@ -719,11 +721,6 @@ proc load_gnome_file {fd} { proc pref_set_option_db {makebg} { global Colors - # The color of text that indicates changed items - # We standardize on one color here so that changed - # items don't blend into any OS color scheme - set Colors(change) "green" - option add *background $Colors(bg) option add *buttonBackground $Colors(bg) option add *Text*background $Colors(textbg) diff -ruNp gdbtk_orig/library/regwin.itb gdbtk/library/regwin.itb --- gdbtk_orig/library/regwin.itb 2007-06-27 22:50:50.000000000 +0200 +++ gdbtk/library/regwin.itb 2012-04-11 13:59:49.758880100 +0200 @@ -1,5 +1,5 @@ # Register display window for Insight. -# Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2007 Red Hat, Inc. +# Copyright (C) 1998-2012 Red Hat, Inc. # # Written by Keith Seitz (keiths@redhat.com) # and Martin Hunt (hunt@redhat.com) @@ -420,6 +420,7 @@ itcl::body RegWin::_size_column {col dow itcl::body RegWin::reconfig {} { $itk_component(table) tag configure normal \ -state disabled -bg $::Colors(textbg) -fg $::Colors(textfg) + $itk_component(table) tag configure highlight -bg $::Colors(change) -fg black } diff -ruNp gdbtk_orig/library/srcpref.itb gdbtk/library/srcpref.itb --- gdbtk_orig/library/srcpref.itb 2008-08-03 00:08:32.000000000 +0200 +++ gdbtk/library/srcpref.itb 2012-04-11 14:00:33.563757100 +0200 @@ -1,5 +1,5 @@ # Source preferences dialog for Insight. -# Copyright (C) 1998, 1999, 2002, 2003, 2008 Red Hat +# Copyright (C) 1998-2012 Red Hat, Inc. # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License (GPL) as published by @@ -54,7 +54,7 @@ itcl::body SrcPref::_build_win {} { set w [$f.colors get_frame] set color [pref get gdb/src/PC_TAG] - label $w.pcl -text {PC} + label $w.pcl -text {PC/Var change} button $w.pcb -text { } -activebackground $color -bg $color \ -command [code $this _pick $color $w.pcb PC_TAG] @@ -212,6 +212,10 @@ itcl::body SrcPref::_apply {} { #debug "$var = $_new($var)" pref set $var $_new($var) } + + # update color for changed values + global Colors + set Colors(change) [pref get gdb/src/PC_TAG] } if {$_new_disassembly_flavor != ""} { gdb_cmd "set disassembly-flavor $_new_disassembly_flavor" diff -ruNp gdbtk_orig/library/vartree.itb gdbtk/library/vartree.itb --- gdbtk_orig/library/vartree.itb 2010-04-29 23:00:52.000000000 +0200 +++ gdbtk/library/vartree.itb 2012-04-11 14:01:25.371448100 +0200 @@ -135,7 +135,7 @@ itcl::body VarTree::update_var {var ena if {[catch {$var value} value]} { set color $colors(error) } elseif {[$c itemcget $val -text] != $value} { - set color $colors(change) + set color $::Colors(change) } else { set color $colors(value) } @@ -404,7 +404,6 @@ itcl::body VarTree::_init_data {} { set colors(type) "red" set colors(error) "red" set colors(value) "black" - set colors(change) $::Colors(change) set colors(disabled) "gray50" set colors(line) "gray50"