[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/Macro.pm

Comparing deliantra/Deliantra-Client/DC/Macro.pm (file contents):
Revision 1.4 by root, Sat Dec 9 22:28:11 2006 UTC vs.
Revision 1.8 by root, Sat Jul 21 20:05:37 2007 UTC

          0
       },
    );
    $list->add (new CFPlus::UI::FancyFrame
-      label => "Bindings",
+      label => "Macros",
-      child => (my $macros = new CFPlus::UI::Table),
+      child => (my $macros = new CFPlus::UI::VBox),
    );
    my $refresh;
    my $tooltip_common = "\n\n<small>Left click - edit macro\nMiddle click - invoke macro\nRight click - further options</small>";
       $kbd_setup->add (new CFPlus::UI::FancyFrame
          label => "Edit Macro",
          child => (my $editor = new CFPlus::UI::Table col_expand => [0, 1]),
       );
-      $editor->add (0, 1, new CFPlus::UI::Label
+      $editor->add_at (0, 1, new CFPlus::UI::Label
          text    => "Trigger",
          tooltip => $tooltip_trigger,
          can_hover  => 1,
          can_events => 1,
       );
-      $editor->add (0, 2, new CFPlus::UI::Label
+      $editor->add_at (0, 2, new CFPlus::UI::Label
          text    => "Actions",
          tooltip => $tooltip_commands,
          can_hover  => 1,
          can_events => 1,
       );
-      $editor->add (1, 2, my $textedit = new CFPlus::UI::TextEdit
+      $editor->add_at (1, 2, my $textedit = new CFPlus::UI::TextEdit
          text    => macro_to_text $macro,
          tooltip => $tooltip_commands,
          on_changed => sub {
             $macro->{action} = macro_from_text $macro, $_[1];
          },
       );
-      $editor->add (1, 1, my $accel = new CFPlus::UI::Button
+      $editor->add_at (1, 1, my $accel = new CFPlus::UI::Button
          text    => trigger_to_string $macro,
          tooltip => "To change the trigger for a macro, activate this button.",
          on_activate => sub {
             my ($accel) = @_;
             trigger_edit $macro, sub {
             1
          },
       );
       my $recording;
-      $editor->add (1, 3, new CFPlus::UI::Button
+      $editor->add_at (1, 3, new CFPlus::UI::Button
          text    => "Start Recording",
          tooltip => "Start/Stop command recording: when recording, "
                   . "actions and commands you invoke are appended to this macro. "
                   . "You can only record when you are logged in.",
          on_destroy  => sub {
             my ($widget) = @_;
             $recording = $::CONN && !$recording;
             if ($recording) {
                $widget->set_text ("Stop Recording");
-               my $action = $macro->{action} ||= [];
                $::CONN->record (sub {
-                  push @$action, $_[0];
+                  push @{ $macro->{action} }, $_[0];
                   $textedit->set_text (macro_to_text $macro);
                }) if $::CONN;
             } else {
                $widget->set_text ("Start Recording");
                $::CONN->record if $::CONN;
             }
          },
       );
    };
+   $macros->add (new CFPlus::UI::Button
+      text    => "New Macro",
+      tooltip => "Creates a new, empty, macro you can edit.",
+      on_activate => sub {
+         my $macro = { };
+         push @{ $::PROFILE->{macro} }, $macro;
+         $edit_macro->($macro);
+      },
+   );
+   $macros->add (my $macrolist = new CFPlus::UI::Table col_expand => [0, 1]);
    $REFRESH_MACRO_LIST = $refresh = sub {
-      $macros->clear;
+      $macrolist->clear;
-      $macros->add (0, 0, new CFPlus::UI::Label
+      $macrolist->add_at (0, 1, new CFPlus::UI::Label
          text    => "Trigger",
          align   => 0,
          tooltip => $tooltip_trigger . $tooltip_common,
       );
-      $macros->add (1, 0, new CFPlus::UI::Label
+      $macrolist->add_at (1, 1, new CFPlus::UI::Label
          text    => "Commands",
          tooltip => $tooltip_commands . $tooltip_common,
       );
       for my $idx (0 .. $#{$::PROFILE->{macro} || []}) {
          my $macro = $::PROFILE->{macro}[$idx];
-         my $y = $idx + 1;
+         my $y = $idx + 2;
          my $macro_cb = sub {
             my ($widget, $ev) = @_;
             if ($ev->{button} == 1) {
             }
             1
          };
-         $macros->add (0, $y, new CFPlus::UI::Label
+         $macrolist->add_at (0, $y, new CFPlus::UI::Label
             text       => trigger_to_string $macro,
             tooltip    => $tooltip_trigger . $tooltip_common,
             align      => 0,
             can_hover  => 1,
             can_events => 1,
             on_button_down => $macro_cb,
          );
-         $macros->add (1, $y, new CFPlus::UI::Label
+         $macrolist->add_at (1, $y, new CFPlus::UI::Label
             text       => (join "; ", @{ $macro->{action} || [] }),
             tooltip    => $tooltip_commands . $tooltip_common,
             expand     => 1,
             ellipsise  => 3,
             can_hover  => 1,

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/DC/Macro.pm (file contents): Revision 1.4 by root, Sat Dec 9 22:28:11 2006 UTC vs. Revision 1.8 by root, Sat Jul 21 20:05:37 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Macro.pm (file contents):
Revision 1.4 by root, Sat Dec 9 22:28:11 2006 UTC vs.
Revision 1.8 by root, Sat Jul 21 20:05:37 2007 UTC