Changeset 10477

Timestamp:

02/03/10 00:22:25 (2 years ago)

Author:

azawawi

Message:

Regex editor helper menu buttons are now full operational, Captain :)

File:

• trunk/Padre/lib/Padre/Wx/Dialog/RegexEditor.pm (modified) (2 diffs)

trunk/Padre/lib/Padre/Wx/Dialog/RegexEditor.pm

@@ -158 +158 @@
 
         my $menu_name = $code . '_menu';
-        $self->{$menu_name} = Wx::Menu->new;
-        my %sub_group_value = %{$sub_group{value}};
-        foreach my $element (sort keys %sub_group_value) {
-            my $label = $element;
-            $label =~ s/^\d{2}//;
-            $self->{$menu_name}->Append( 
-                -1, $label . "\t" . $sub_group_value{$element} );
-        }
-    }
-
-    # Matching radio button
-    $self->{matching} = Wx::RadioButton->new(
-        $self, -1, Wx::gettext('Matching'),
-    );
-
-    # Substitution radio button
-    $self->{substituting} = Wx::RadioButton->new(
-        $self, -1, Wx::gettext('Substituting'),
-    );
-
-    # Close button
-    $self->{close_button} = Wx::Button->new(
-        $self, Wx::wxID_CANCEL, Wx::gettext('&Close'),
-    );
-
-    # Dialog Layout
-
-    my $modifiers = Wx::BoxSizer->new(Wx::wxHORIZONTAL);
-    $modifiers->AddStretchSpacer;
-    $modifiers->Add( $self->{ignore_case}, 0, Wx::wxALL, 1 );
-    $modifiers->Add( $self->{single_line}, 0, Wx::wxALL, 1 );
-    $modifiers->Add( $self->{multi_line},  0, Wx::wxALL, 1 );
-    $modifiers->Add( $self->{extended},    0, Wx::wxALL, 1 );
-
-    my $operation = Wx::BoxSizer->new(Wx::wxHORIZONTAL);
-    $operation->AddStretchSpacer;
-    $operation->Add( $self->{matching},     0, Wx::wxALL, 1 );
-    $operation->Add( $self->{substituting}, 0, Wx::wxALL, 1 );
-    $operation->AddStretchSpacer;
-
-    my $regex = Wx::BoxSizer->new(Wx::wxVERTICAL);
-    $regex->Add( $self->{regex}, 1, Wx::wxALL | Wx::wxEXPAND, 1 );
-
-    my $regex_groups = Wx::BoxSizer->new(Wx::wxVERTICAL);
-    foreach my $code ( sort keys %regex_groups ) {
-        my $button_name = $code . '_button';
-        $regex_groups->Add( $self->{$button_name}, 0, Wx::wxEXPAND, 1 );
-    }
-
-    my $combined = Wx::BoxSizer->new(Wx::wxHORIZONTAL);
-    $combined->Add( $regex,        2, Wx::wxALL | Wx::wxEXPAND, 0 );
-    $combined->Add( $regex_groups, 0, Wx::wxALL | Wx::wxEXPAND, 0 );
-
-    # Vertical layout of the left hand side
-    my $left = Wx::BoxSizer->new(Wx::wxVERTICAL);
-    $left->Add( $operation, 0, Wx::wxALL | Wx::wxEXPAND, 2 );
-    $left->Add( $modifiers, 0, Wx::wxALL | Wx::wxEXPAND, 2 );
-    $left->AddSpacer(5);
-    $left->Add( $regex_label, 0, Wx::wxALL | Wx::wxEXPAND, 1 );
-    $left->Add( $combined,    0, Wx::wxALL | Wx::wxEXPAND, 2 );
-
-    $left->Add( $substitute_label, 0, Wx::wxALL | Wx::wxEXPAND, 1 );
-    $left->Add( $self->{substitute},  1, Wx::wxALL | Wx::wxEXPAND, 1 );
-
-    $left->Add( $original_label, 0, Wx::wxALL | Wx::wxEXPAND, 1 );
-    $left->Add( $self->{original_text}, 1, Wx::wxALL | Wx::wxEXPAND, 1 );
-    $left->Add( $matched_label, 0, Wx::wxALL | Wx::wxEXPAND, 1 );
-    $left->Add( $self->{matched_text}, 1, Wx::wxALL | Wx::wxEXPAND, 1 );
-    $left->AddSpacer(5);
-    $left->Add( $self->{close_button}, 0, Wx::wxALIGN_CENTER_HORIZONTAL, 1 );
-
-    # Main sizer
-    $sizer->Add( $left, 1, Wx::wxALL | Wx::wxEXPAND, 5 );
-}
-
-sub _bind_events {
-    my $self = shift;
-
-    my %regex_groups = $self->_regex_groups;
-    foreach my $code ( keys %regex_groups ) {
-        my %sub_group = %{ $regex_groups{$code} };
-        my $button_name = $code . '_button';
-        my $menu_name = $code . '_menu';
+
         Wx::Event::EVT_BUTTON(
             $self,
@@ -250 +168 @@
             },
         );
-    }
-
-    #   Wx::Event::EVT_MENU(
-    #       $self,
-    #       $self->{menu},
-    #       sub {
-    #       },
-    #   );
+
+        $self->{$menu_name} = Wx::Menu->new;
+        my %sub_group_value = %{$sub_group{value}};
+        foreach my $element (sort keys %sub_group_value) {
+            my $label = $element;
+            $label =~ s/^\d{2}//;
+            my $menu_item = $self->{$menu_name}->Append( 
+                -1, $label . "\t" . $sub_group_value{$element} );
+
+            Wx::Event::EVT_MENU(
+                $self,
+                $menu_item,
+                sub {
+                    $_[0]->{regex}->WriteText($label);
+                },
+            );
+        }
+    }
+
+    # Matching radio button
+    $self->{matching} = Wx::RadioButton->new(
+        $self, -1, Wx::gettext('Matching'),
+    );
+
+    # Substitution radio button
+    $self->{substituting} = Wx::RadioButton->new(
+        $self, -1, Wx::gettext('Substituting'),
+    );
+
+    # Close button
+    $self->{close_button} = Wx::Button->new(
+        $self, Wx::wxID_CANCEL, Wx::gettext('&Close'),
+    );
+
+    # Dialog Layout
+
+    my $modifiers = Wx::BoxSizer->new(Wx::wxHORIZONTAL);
+    $modifiers->AddStretchSpacer;
+    $modifiers->Add( $self->{ignore_case}, 0, Wx::wxALL, 1 );
+    $modifiers->Add( $self->{single_line}, 0, Wx::wxALL, 1 );
+    $modifiers->Add( $self->{multi_line},  0, Wx::wxALL, 1 );
+    $modifiers->Add( $self->{extended},    0, Wx::wxALL, 1 );
+
+    my $operation = Wx::BoxSizer->new(Wx::wxHORIZONTAL);
+    $operation->AddStretchSpacer;
+    $operation->Add( $self->{matching},     0, Wx::wxALL, 1 );
+    $operation->Add( $self->{substituting}, 0, Wx::wxALL, 1 );
+    $operation->AddStretchSpacer;
+
+    my $regex = Wx::BoxSizer->new(Wx::wxVERTICAL);
+    $regex->Add( $self->{regex}, 1, Wx::wxALL | Wx::wxEXPAND, 1 );
+
+    my $regex_groups = Wx::BoxSizer->new(Wx::wxVERTICAL);
+    foreach my $code ( sort keys %regex_groups ) {
+        my $button_name = $code . '_button';
+        $regex_groups->Add( $self->{$button_name}, 0, Wx::wxEXPAND, 1 );
+    }
+
+    my $combined = Wx::BoxSizer->new(Wx::wxHORIZONTAL);
+    $combined->Add( $regex,        2, Wx::wxALL | Wx::wxEXPAND, 0 );
+    $combined->Add( $regex_groups, 0, Wx::wxALL | Wx::wxEXPAND, 0 );
+
+    # Vertical layout of the left hand side
+    my $left = Wx::BoxSizer->new(Wx::wxVERTICAL);
+    $left->Add( $operation, 0, Wx::wxALL | Wx::wxEXPAND, 2 );
+    $left->Add( $modifiers, 0, Wx::wxALL | Wx::wxEXPAND, 2 );
+    $left->AddSpacer(5);
+    $left->Add( $regex_label, 0, Wx::wxALL | Wx::wxEXPAND, 1 );
+    $left->Add( $combined,    0, Wx::wxALL | Wx::wxEXPAND, 2 );
+
+    $left->Add( $substitute_label, 0, Wx::wxALL | Wx::wxEXPAND, 1 );
+    $left->Add( $self->{substitute},  1, Wx::wxALL | Wx::wxEXPAND, 1 );
+
+    $left->Add( $original_label, 0, Wx::wxALL | Wx::wxEXPAND, 1 );
+    $left->Add( $self->{original_text}, 1, Wx::wxALL | Wx::wxEXPAND, 1 );
+    $left->Add( $matched_label, 0, Wx::wxALL | Wx::wxEXPAND, 1 );
+    $left->Add( $self->{matched_text}, 1, Wx::wxALL | Wx::wxEXPAND, 1 );
+    $left->AddSpacer(5);
+    $left->Add( $self->{close_button}, 0, Wx::wxALIGN_CENTER_HORIZONTAL, 1 );
+
+    # Main sizer
+    $sizer->Add( $left, 1, Wx::wxALL | Wx::wxEXPAND, 5 );
+}
+
+sub _bind_events {
+    my $self = shift;
 
     Wx::Event::EVT_TEXT(