ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Macro.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Macro.pm (file contents):
Revision 1.6 by elmex, Sat Dec 16 16:14:34 2006 UTC vs.
Revision 1.7 by root, Fri Jul 20 16:32:04 2007 UTC

296 $macros->add (my $macrolist = new CFPlus::UI::Table col_expand => [0, 1]); 296 $macros->add (my $macrolist = new CFPlus::UI::Table col_expand => [0, 1]);
297 297
298 $REFRESH_MACRO_LIST = $refresh = sub { 298 $REFRESH_MACRO_LIST = $refresh = sub {
299 $macrolist->clear; 299 $macrolist->clear;
300 300
301 $macrolist->add (0, 1, new CFPlus::UI::Label 301 $macrolist->add_at (0, 1, new CFPlus::UI::Label
302 text => "Trigger", 302 text => "Trigger",
303 align => 0, 303 align => 0,
304 tooltip => $tooltip_trigger . $tooltip_common, 304 tooltip => $tooltip_trigger . $tooltip_common,
305 ); 305 );
306 $macrolist->add (1, 1, new CFPlus::UI::Label 306 $macrolist->add_at (1, 1, new CFPlus::UI::Label
307 text => "Commands", 307 text => "Commands",
308 tooltip => $tooltip_commands . $tooltip_common, 308 tooltip => $tooltip_commands . $tooltip_common,
309 ); 309 );
310 310
311 for my $idx (0 .. $#{$::PROFILE->{macro} || []}) { 311 for my $idx (0 .. $#{$::PROFILE->{macro} || []}) {
336 } 336 }
337 337
338 1 338 1
339 }; 339 };
340 340
341 $macrolist->add (0, $y, new CFPlus::UI::Label 341 $macrolist->add_at (0, $y, new CFPlus::UI::Label
342 text => trigger_to_string $macro, 342 text => trigger_to_string $macro,
343 tooltip => $tooltip_trigger . $tooltip_common, 343 tooltip => $tooltip_trigger . $tooltip_common,
344 align => 0, 344 align => 0,
345 can_hover => 1, 345 can_hover => 1,
346 can_events => 1, 346 can_events => 1,
347 on_button_down => $macro_cb, 347 on_button_down => $macro_cb,
348 ); 348 );
349 349
350 $macrolist->add (1, $y, new CFPlus::UI::Label 350 $macrolist->add_at (1, $y, new CFPlus::UI::Label
351 text => (join "; ", @{ $macro->{action} || [] }), 351 text => (join "; ", @{ $macro->{action} || [] }),
352 tooltip => $tooltip_commands . $tooltip_common, 352 tooltip => $tooltip_commands . $tooltip_common,
353 expand => 1, 353 expand => 1,
354 ellipsise => 3, 354 ellipsise => 3,
355 can_hover => 1, 355 can_hover => 1,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines