From 8cc6bcc01a66295ba2d303a91f5d3bc05812df07 Mon Sep 17 00:00:00 2001
From: milkbone57 <milkbone57>
Date: Mon, 18 Aug 2003 03:42:00 +0000
Subject: [PATCH] ""

---
 plugins/Tk-GUI/Tk/BrowseEdit.pm  | 25 ++++++++++++---
 plugins/Tk-GUI/Tk/ColorChoice.pm | 55 ++++----------------------------
 2 files changed, 28 insertions(+), 52 deletions(-)

diff --git a/plugins/Tk-GUI/Tk/BrowseEdit.pm b/plugins/Tk-GUI/Tk/BrowseEdit.pm
index 497ab60..39a16db 100644
--- a/plugins/Tk-GUI/Tk/BrowseEdit.pm
+++ b/plugins/Tk-GUI/Tk/BrowseEdit.pm
@@ -2,6 +2,7 @@ package Tk::BrowseEdit;
 
 use Tk;
 use Tk::Font;
+use Tk::ColorChoice;
 use base 'Tk::Frame';
 
 use strict;
@@ -49,13 +50,12 @@ $self]);
                 )->pack(-pady => 0, -side => 'left', -fill => 'both');
         $self->bind('<Control-U>', [sub { shift->{'<b>'}->invoke; }, $self]);
 
-        $self->{'<back>'} = $self->{panel}->Button(-text => 'U', -relief => 'flat', -background => 'green',
+        $self->{'<back>'} = $self->{panel}->Button(-text => 'A', -relief => 'flat', -background => 'blue',
                 -font => $self->Font(-family => 'times', -size => '8'),
                 -command => [sub {
                         my ($self) = @_;
-			my $color = $self->chooseColor(
-			    -initialcolor => 'black', -parent => $self,
-			    -title => 'Choose Background Color');		      
+			my $color = $self->pick_color;
+		      
                         $self->toggleTag("<font back=\"$color\">", '<back>');
                 }, $self]
                 )->pack(-pady => 0, -side => 'left', -fill => 'both');
@@ -169,6 +169,10 @@ sub create_tag
         {
                 $fontparams{-slant} = 'italic';
         }
+        if($tag =~ /<font back='(.*?)'>/)
+        {
+                $fontparams{-slant} = 'italic';
+        }
 
 	my $font = $self->Font(%fontparams);
         $self->tagConfigure($tag, %tagparams, -font => $font);
@@ -218,4 +222,17 @@ sub end_tag
         return $tag;
 }
 
+sub pick_color
+{
+    my ($self) = @_;
+    my $dlg = $self->Parent->DialogBox(-title => 'Choose Color', -buttons => 
+			       ['OK', 'Cancel'], -default_button => 'OK');
+
+    $dlg->ColorChoice->pack;
+    my $res = $dlg->Show();
+
+    return unless $res eq "OK";
+    
+}
+
 1;
diff --git a/plugins/Tk-GUI/Tk/ColorChoice.pm b/plugins/Tk-GUI/Tk/ColorChoice.pm
index 8b964d6..d0c6150 100644
--- a/plugins/Tk-GUI/Tk/ColorChoice.pm
+++ b/plugins/Tk-GUI/Tk/ColorChoice.pm
@@ -2,7 +2,7 @@ package Tk::ColorChoice;
 
 use Tk;
 use Tk::Font;
-use base 'Tk::Toplevel';
+use base 'Tk::Frame';
 
 use strict;
 use warnings;
@@ -20,33 +20,7 @@ sub Populate
     my ($self, $args) = @_;
     $self->SUPER::Populate($args);
 
-        $self->after(10, [$self, "init"]);
-
-}
-package Tk::ColorChoice;
-
-use Tk;
-use Tk::Font;
-use base 'Tk::Toplevel';
-
-use strict;
-use warnings;
-
-Construct Tk::Widget 'ColorChoice';
-
-sub ClassInit
-{
-        my ($class, $mw) = @_;
-        $class->SUPER::ClassInit($mw);
-}
-
-sub Populate
-{
-    my ($self, $args) = @_;
-    $self->SUPER::Populate($args);
-
-        $self->after(10, [$self, "init"]);
-
+    $self->after(10, [$self, "init"]);
 }
 
 sub init
@@ -63,33 +37,18 @@ black white);
                 {
                         my $color = shift @colors;
                         push @currow, $self->Button(-background => $color, -activebackground =>
-$color, -text => '     ');
+$color, -text => '     ', -command => [$self, "on_click"]);
                 }
                 last unless @currow;
                 (shift @currow)->grid(@currow);
         }
 }
 
-1;
-sub init
+sub on_click
 {
-        my ($self) = @_;
-
-        my (@colors) = qw(red pink purple blue green yellow orange red brown
-black white);
-
-        while(@colors)
-        {
-                my @currow;
-                while(@colors and @currow < 4)
-                {
-                        my $color = shift @colors;
-                        push @currow, $self->Button(-background => $color, -activebackground =>
-$color, -text => '     ');
-                }
-                last unless @currow;
-                (shift @currow)->grid(@currow);
-        }
+    my ($self) = @_;
+    
 }
 
+
 1;