From a4c8434ff667d88ddc223fa02b483d46c9a2c65f Mon Sep 17 00:00:00 2001 From: milkbone57 Date: Mon, 15 Sep 2003 22:34:18 +0000 Subject: [PATCH] "" --- docs/VERSION.txt | 7 +- plugins/Tk-File/Milkbone/File.pm | 170 ++++++++++++------------- plugins/Tk-File/Tk-File.pl | 2 +- plugins/Tk-GUI/Tk/BrowseEdit.pm | 12 +- plugins/Tk-GUI/Tk/Browser.pm | 14 ++ plugins/Tk-Profile/Milkbone/Profile.pm | 2 +- 6 files changed, 113 insertions(+), 94 deletions(-) diff --git a/docs/VERSION.txt b/docs/VERSION.txt index 392c15c..81a614e 100644 --- a/docs/VERSION.txt +++ b/docs/VERSION.txt @@ -1,9 +1,12 @@ 0.7 -- -* Somewhat fixed text-selection bug in profiles +* Finally got around to changing milkbone.batkins.com to milkbone.org in the default profile +* Text selection works a lot better in profiles and convos * Resized profile windows -* Antialiasing in X +* Antialiasing in X (only works with Tk804,which is currently in alpha testing) +* Jabber server running at milkbone.org +* milkbone.org running on new server 0.361 9-6-2003 -- diff --git a/plugins/Tk-File/Milkbone/File.pm b/plugins/Tk-File/Milkbone/File.pm index 041ef90..8dbd894 100644 --- a/plugins/Tk-File/Milkbone/File.pm +++ b/plugins/Tk-File/Milkbone/File.pm @@ -1,85 +1,85 @@ -# milkbone - profile dialog - -package Milkbone::File; - -use Milkbone; - -our $VERSION = '1.0'; - -use Tk::widgets qw(Frame); -use base qw(Tk::Toplevel); -use strict; -use warnings; - -Construct Tk::Widget 'MBFile'; - -sub ClassInit -{ - my ($class, $mw) = @_; - $class->SUPER::ClassInit($mw); -} - -sub init -{ - my ($self, $mw, $data, $file, $type) = @_; - - $self->{text} = $self->Frame->pack(-expand => 1, -fill => 'both')->Scrolled( - "Text", -scrollbars => 'oe', -background => 'white', -wrap => 'word')-> - pack(-expand => 1, -fill => 'both'); - - $self->Button(-text => "Close", -command => [$self, "destroy"])->pack(-side => 'right'); - $self->Button(-text => "Save", -command => [$self, "on_save"])->pack(-side => 'right'); - - $self->{text}->bind('', - [ sub { $_[0]->yview('scroll', -($_[1] / 120), 'units') }, Tk::Ev('D')]); - - $self->{text}->insert('0.0', $data); - - $self->{type} = $type; - $self->{file} = $file; - - if($type eq "profile") - { - $self->configure(-title => "Edit Profile"); - } - else - { - $self->configure(-title => "Edit Away Message"); - } - - $self->{text}->focus; - hook("tk_seticon", -wnd => $self); -} - -sub on_save -{ - my ($self) = @_; - my $text = $self->{text}->get('0.0', 'end'); - - $text = pre_save($text); - - open(OUT, ">" . $self->{file}) or die "couldn't open: $! " . $self->{file}; - print OUT $text; - close(OUT); - - if($self->{type} eq "profile") - { - hook("protocol_set_prof", -data => $text); - } - elsif($self->{type} eq "away") - { - hook("protocol_set_away", -data => $text); - } - - $self->destroy; -} - -sub pre_save -{ - my ($text) = @_; - - $text =~ s/\n*$//g; - $text =~ s/\n/
/gi; - - return $text; -} +# milkbone - profile dialog + +package Milkbone::File; + +use Milkbone; + +our $VERSION = '1.0'; + +use Tk::widgets qw(Frame); +use base qw(Tk::Toplevel); +use strict; +use warnings; + +Construct Tk::Widget 'MBFile'; + +sub ClassInit +{ + my ($class, $mw) = @_; + $class->SUPER::ClassInit($mw); +} + +sub init +{ + my ($self, $mw, $data, $file, $type) = @_; + + $self->{text} = $self->Frame->pack(-expand => 1, -fill => 'both')->Scrolled( + "Text", -scrollbars => 'oe', -background => 'white', -wrap => 'word')-> + pack(-expand => 1, -fill => 'both'); + + $self->Button(-text => "Close", -command => [$self, "destroy"])->pack(-side => 'right'); + $self->Button(-text => "Save", -command => [$self, "on_save"])->pack(-side => 'right'); + + $self->{text}->bind('', + [ sub { $_[0]->yview('scroll', -($_[1] / 120), 'units') }, Tk::Ev('D')]); + + $self->{text}->insert('0.0', $data); + + $self->{type} = $type; + $self->{file} = $file; + + if($type eq "profile") + { + $self->configure(-title => "Edit Profile"); + } + else + { + $self->configure(-title => "Edit Away Message"); + } + + $self->{text}->focus; + hook("tk_seticon", -wnd => $self); +} + +sub on_save +{ + my ($self) = @_; + my $text = $self->{text}->get('0.0', 'end'); + + $text = pre_save($text); + + open(OUT, ">" . $self->{file}) or die "couldn't open: $! " . $self->{file}; + print OUT $text; + close(OUT); + + if($self->{type} eq "profile") + { + hook("protocol_set_prof", -data => $text); + } + elsif($self->{type} eq "away") + { + hook("protocol_set_away", -data => $text); + } + + $self->destroy; +} + +sub pre_save +{ + my ($text) = @_; + + $text =~ s/\n*$//g; + $text =~ s/\n/
/gi; + + return $text; +} diff --git a/plugins/Tk-File/Tk-File.pl b/plugins/Tk-File/Tk-File.pl index f1da74d..c9fa82f 100644 --- a/plugins/Tk-File/Tk-File.pl +++ b/plugins/Tk-File/Tk-File.pl @@ -50,7 +50,7 @@ sub get_all{ if($prof eq "FAILED") { - $prof = "Milkbone %v(milkbone.batkins.com)

A recent survey has concluded that 100% of all milkbone users would rather use milkbone than nothing at all.

I'm listening to %a - %s"; + $prof = "Milkbone %v(milkbone.org)

A recent survey has concluded that 100% of all milkbone users would rather use milkbone than nothing at all.

I'm listening to %a - %s"; } if($away eq "FAILED") { diff --git a/plugins/Tk-GUI/Tk/BrowseEdit.pm b/plugins/Tk-GUI/Tk/BrowseEdit.pm index 096188e..6bcf475 100644 --- a/plugins/Tk-GUI/Tk/BrowseEdit.pm +++ b/plugins/Tk-GUI/Tk/BrowseEdit.pm @@ -101,11 +101,11 @@ sub toggleTag if(!defined($self->{text}->tagRanges('sel'))) { # no selection - modify current position - my $cur_tag = ($self->{text}->tagNames('insert'))[0] || ""; + my @tags = $self->{text}->tagNames('insert'); + my $cur_tag = (scalar(@tags) > 0 ? $tags[0] : ""); if ($cur_tag =~ /$tag/i) { # tag is defined for this region - remove it - return if $cur_tag eq ""; $self->{text}->tagRemove($cur_tag, 'insert'); $cur_tag =~ s/$tag//i; @@ -188,13 +188,15 @@ sub create_tag if($tag =~ //) { $tagparams{-background} = $2; - print "set background"; } - my $font = $self->Font(%fontparams); + my $font = $self->Font(-family => 'times',%fontparams); + print %fontparams; + # XXX: SEGMENTATION FAULT HERE!! $self->tagConfigure($tag, %tagparams, -font => $font); - $self->{created_tags}->{$tag} = 1; + $self->{created_tags}->{$tag} = 1; } + sub to_html { my ($self, $start, $end) = @_; diff --git a/plugins/Tk-GUI/Tk/Browser.pm b/plugins/Tk-GUI/Tk/Browser.pm index c51362f..c6bcb8a 100644 --- a/plugins/Tk-GUI/Tk/Browser.pm +++ b/plugins/Tk-GUI/Tk/Browser.pm @@ -15,11 +15,20 @@ Construct Tk::Widget 'Browser'; my %fonts; $fonts{$_} = 1 for hook("tk_getmain")->fontFamilies; +sub Populate +{ + my ($self, $args) = @_; + $self->SUPER::Populate($args); +} + sub insertHTML { my ($self, $pos, $html) = @_; my @insert; + $self->tagConfigure('BSEL', -background => '#c0c0c0'); + $self->tagRaise('sel', 'BSEL'); + $html =~ s/
/\n/gi; $html =~ s/{-weight} = 'bold'; $data->{tags}->{''} = 1; $self->tagConfigure('', -font => $self->Font(%{$font})->Pattern); + $self->tagRaise(sel => ''); } sub b_end @@ -88,6 +98,7 @@ sub i_begin $font->{-slant} = 'italic'; $data->{tags}->{''} = 1; $self->tagConfigure('', -font => $self->Font(%{$font})->Pattern); + $self->tagRaise(sel => ''); } sub i_end @@ -104,6 +115,7 @@ sub u_begin $data->{tags}->{''} = 1; $self->tagConfigure('', -underline => 1, -font => $self->Font(%{$font})->Pattern); + $self->tagRaise(sel => ''); } sub u_end @@ -123,6 +135,7 @@ sub a_begin $data->{tags}->{$tag} = 1; $self->tagConfigure($tag, -foreground => "blue", -underline => 1, -font => $self->Font(%{$font})->Pattern); + $self->tagRaise(sel => $tag); $self->tagBind($tag, '', [sub { my $cmd; @@ -202,6 +215,7 @@ sub font_begin $data->{tags}->{$tag} = 1; $self->tagConfigure($tag, %opts, -font => $self->Font(%{$font})->Pattern); + $self->tagRaise(sel => $tag); push @{$data->{fonttags}}, $tag; } diff --git a/plugins/Tk-Profile/Milkbone/Profile.pm b/plugins/Tk-Profile/Milkbone/Profile.pm index f81fbc1..409f304 100644 --- a/plugins/Tk-Profile/Milkbone/Profile.pm +++ b/plugins/Tk-Profile/Milkbone/Profile.pm @@ -118,7 +118,7 @@ sub init hook("tk_bindwheel", -window => $self->{text}); - $self->geometry("450x400"); + $self->geometry("600x400"); $self->deiconify; $self->OnDestroy([\&on_destroy, $self]);