--- deliantra/Deliantra-Client/DC/Item.pm 2007/04/23 19:17:41 1.4
+++ deliantra/Deliantra-Client/DC/Item.pm 2007/12/25 07:39:18 1.8
@@ -2,6 +2,7 @@
use strict;
use utf8;
+use Encode;
use Crossfire::Protocol::Constants;
@@ -116,7 +117,7 @@
&::open_string_query ("Text to inscribe", sub {
my ($entry, $txt) = @_;
$::CONN->send ("mark ". pack "N", $self->{tag});
- $::CONN->send ("command use_skill inscription $txt");
+ $::CONN->send_utf8 ("command use_skill inscription $txt");
});
}
],
@@ -125,7 +126,7 @@
&::open_string_query ("Rename item to:", sub {
my ($entry, $txt) = @_;
$::CONN->send ("mark ". pack "N", $self->{tag});
- $::CONN->send ("command rename to <$txt>");
+ $::CONN->send_utf8 ("command rename to <$txt>");
}, $self->{name},
"If you input no name or erase the current custom name, the custom name will be unset");
}
@@ -168,6 +169,8 @@
: $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5]
: undef;
+ my $desc = CFPlus::Item::desc_string $self;
+
$self->{face_widget} ||= new CFPlus::UI::Face
can_events => 1,
can_hover => 1,
@@ -179,12 +182,13 @@
$self->{face_widget}{face} = $self->{face};
$self->{face_widget}{anim} = $self->{anim};
$self->{face_widget}{animspeed} = $self->{animspeed};
- $self->{face_widget}->set_tooltip (
- "Face/Animation.\n"
- . "Item uses face #$self->{face}. "
- . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
- . "\n\n$tooltip_std"
- );
+# $self->{face_widget}->set_tooltip (
+# "Face/Animation.\n"
+# . "Item uses face #$self->{face}. "
+# . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
+# . "\n\n$tooltip_std"
+# );
+ $self->{face_widget}->set_tooltip ("$desc\n\n$tooltip_std");
$self->{desc_widget} ||= new CFPlus::UI::Label
can_events => 1,
@@ -196,7 +200,7 @@
on_tooltip_show => sub {
my ($widget) = @_;
- $::CONN->ex ($self->{tag}, sub {
+ $::CONN && $::CONN->ex ($self->{tag}, sub {
my ($long_desc) = @_;
$long_desc =~ s/\s+$//;
@@ -207,12 +211,11 @@
},
;
- my $desc = CFPlus::Item::desc_string $self;
$self->{desc_widget}{bg} = $bg;
$self->{desc_widget}->set_text ($desc);
- my $long_desc = $self->{long_desc} || "$desc.";
- $self->{desc_widget}->set_tooltip ("$long_desc\n$tooltip_std");
+ my $long_desc = $self->{long_desc} || $desc;
+ $self->{desc_widget}->set_tooltip ("$long_desc\n\n$tooltip_std");
$self->{weight_widget} ||= new CFPlus::UI::Label
can_events => 1,
@@ -230,3 +233,4 @@
. "\n\n$tooltip_std"
);
}
+