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.5 by root, Sat Dec 9 23:06:39 2006 UTC vs.
Revision 1.7 by root, Fri Jul 20 16:32:04 2007 UTC

269 my ($widget) = @_; 269 my ($widget) = @_;
270 270
271 $recording = $::CONN && !$recording; 271 $recording = $::CONN && !$recording;
272 if ($recording) { 272 if ($recording) {
273 $widget->set_text ("Stop Recording"); 273 $widget->set_text ("Stop Recording");
274 my $action = $macro->{action} ||= [];
275 $::CONN->record (sub { 274 $::CONN->record (sub {
276 push @$action, $_[0]; 275 push @{ $macro->{action} }, $_[0];
277 $textedit->set_text (macro_to_text $macro); 276 $textedit->set_text (macro_to_text $macro);
278 }) if $::CONN; 277 }) if $::CONN;
279 } else { 278 } else {
280 $widget->set_text ("Start Recording"); 279 $widget->set_text ("Start Recording");
281 $::CONN->record if $::CONN; 280 $::CONN->record if $::CONN;
297 $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]);
298 297
299 $REFRESH_MACRO_LIST = $refresh = sub { 298 $REFRESH_MACRO_LIST = $refresh = sub {
300 $macrolist->clear; 299 $macrolist->clear;
301 300
302 $macrolist->add (0, 1, new CFPlus::UI::Label 301 $macrolist->add_at (0, 1, new CFPlus::UI::Label
303 text => "Trigger", 302 text => "Trigger",
304 align => 0, 303 align => 0,
305 tooltip => $tooltip_trigger . $tooltip_common, 304 tooltip => $tooltip_trigger . $tooltip_common,
306 ); 305 );
307 $macrolist->add (1, 1, new CFPlus::UI::Label 306 $macrolist->add_at (1, 1, new CFPlus::UI::Label
308 text => "Commands", 307 text => "Commands",
309 tooltip => $tooltip_commands . $tooltip_common, 308 tooltip => $tooltip_commands . $tooltip_common,
310 ); 309 );
311 310
312 for my $idx (0 .. $#{$::PROFILE->{macro} || []}) { 311 for my $idx (0 .. $#{$::PROFILE->{macro} || []}) {
337 } 336 }
338 337
339 1 338 1
340 }; 339 };
341 340
342 $macrolist->add (0, $y, new CFPlus::UI::Label 341 $macrolist->add_at (0, $y, new CFPlus::UI::Label
343 text => trigger_to_string $macro, 342 text => trigger_to_string $macro,
344 tooltip => $tooltip_trigger . $tooltip_common, 343 tooltip => $tooltip_trigger . $tooltip_common,
345 align => 0, 344 align => 0,
346 can_hover => 1, 345 can_hover => 1,
347 can_events => 1, 346 can_events => 1,
348 on_button_down => $macro_cb, 347 on_button_down => $macro_cb,
349 ); 348 );
350 349
351 $macrolist->add (1, $y, new CFPlus::UI::Label 350 $macrolist->add_at (1, $y, new CFPlus::UI::Label
352 text => (join "; ", @{ $macro->{action} || [] }), 351 text => (join "; ", @{ $macro->{action} || [] }),
353 tooltip => $tooltip_commands . $tooltip_common, 352 tooltip => $tooltip_commands . $tooltip_common,
354 expand => 1, 353 expand => 1,
355 ellipsise => 3, 354 ellipsise => 3,
356 can_hover => 1, 355 can_hover => 1,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines