Changeset 10473

Timestamp:

02/02/10 23:33:50 (6 months ago)

Author:

azawawi

Message:

More refactoring to the Regex Editor dialog UI & code. You can now see four non-functioning regex snippet buttons alongside the regex text control.

Files:

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

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

@@ -56 +56 @@
 
 
-sub _regex_syntax {
+#
+# A private method that returns a hash of regex groups along with their meaning
+# 
+sub _regex_groups {
         my $self = shift;
 
@@ -147 +150 @@
 
         $self->{menu} = Wx::Menu->new;
-#       my %regex_syntax = $self->_regex_syntax;
-#       foreach my $name (keys %regex_syntax) {
-#               my %subgroup = $regex_syntax{$name};
+        my %regex_groups = $self->_regex_groups;
+
+        foreach my $code (keys %regex_groups) {
+                my %sub_group = %{$regex_groups{$code}};
+                $self->{$code} = Wx::Button->new(
+                        $self, -1, $sub_group{label},
+                );
 #               $self->{menu}->Append( -1, $subgroup{label} );
 #               $self->{menu}->AppendSeparator();
@@ -157 +164 @@
 #                       $self->{menu}->AppendSeparator();
 #               }
-#       }
+        }
 #       Wx::Event::EVT_MENU(
 #               $self,
@@ -165 +172 @@
 #       );
 
-
+        # Matching radio button
         $self->{matching} = Wx::RadioButton->new(
-                $self,
-                -1,
-                'Matching',
-        );
+                $self, -1, Wx::gettext('Matching'),
+        );
+        
+        # Substitution radio button
         $self->{substituting} = Wx::RadioButton->new(
-                $self,
-                -1,
-                'Substituting',
-        );
-
-        $self->{button_menu} = Wx::Button->new(
-                $self,
-                -1,
-                Wx::gettext('&Insert'),
-        );
-
-        # Close Button
-        $self->{button_close} = Wx::Button->new(
-                $self,
-                Wx::wxID_CANCEL,
-                Wx::gettext('&Close'),
-        );
-
+                $self, -1, Wx::gettext('Substituting'),
+        );
+
+        # Close button
+        $self->{close_button} = Wx::Button->new(
+                $self, Wx::wxID_CANCEL, Wx::gettext('&Close'),
+        );
 
         # Dialog Layout
@@ -204 +200 @@
         $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::wxALIGN_CENTER_HORIZONTAL | Wx::wxEXPAND, 
+                1
+        );
+
+        my $regex_groups = Wx::BoxSizer->new(Wx::wxVERTICAL);
+        foreach my $code (keys %regex_groups) {
+                $regex_groups->Add( $self->{$code}, 0, Wx::wxEXPAND | Wx::wxALIGN_CENTER_HORIZONTAL, 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->AddSpacer(3);
-        $left->Add( $modifiers,   0, Wx::wxALL | Wx::wxEXPAND, 1 );
-        $left->Add( $operation,   0, Wx::wxALL | Wx::wxEXPAND, 1 );
-        $left->Add( $self->{button_menu}, 0, Wx::wxALIGN_CENTER_HORIZONTAL, 1 );
-        $left->Add( $regex_label, 0, Wx::wxALL | Wx::wxEXPAND, 1 );
-        $left->Add(
-                $self->{regex},
-                1,
-                Wx::wxALL | Wx::wxALIGN_TOP | Wx::wxALIGN_CENTER_HORIZONTAL | Wx::wxEXPAND,
-                1
-        );
+        $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::wxALIGN_TOP | Wx::wxALIGN_CENTER_HORIZONTAL | Wx::wxEXPAND,
+                Wx::wxALL | Wx::wxALIGN_CENTER_HORIZONTAL | Wx::wxEXPAND,
                 1
         );
@@ -231 +240 @@
                 $self->{original_text},
                 1,
-                Wx::wxALL | Wx::wxALIGN_TOP | Wx::wxALIGN_CENTER_HORIZONTAL | Wx::wxEXPAND,
+                Wx::wxALL | Wx::wxALIGN_CENTER_HORIZONTAL | Wx::wxEXPAND,
                 1
         );
@@ -238 +247 @@
                 $self->{matched_text},
                 1,
-                Wx::wxALL | Wx::wxALIGN_TOP | Wx::wxALIGN_CENTER_HORIZONTAL | Wx::wxEXPAND,
+                Wx::wxALL | Wx::wxALIGN_CENTER_HORIZONTAL | Wx::wxEXPAND,
                 1
         );
         $left->AddSpacer(5);
-        $left->Add( $self->{button_close}, 0, Wx::wxALIGN_CENTER_HORIZONTAL, 1 );
+        $left->Add( $self->{close_button}, 0, Wx::wxALIGN_CENTER_HORIZONTAL, 1 );
 
         # Main sizer
@@ -251 +260 @@
         my $self = shift;
 
-        Wx::Event::EVT_BUTTON(
-                $self,
-                $self->{button_menu},
-                sub {
-                        my ($self, $event) = @_;
-                        $self->PopupMenu( $self->{menu}, 0, 0 );
-                }
-        );
         Wx::Event::EVT_TEXT(
                 $self,
@@ -300 +301 @@
 
 
+#
+# A private method that returns a hash of regex modifiers
+#
 sub _modifiers {
         my $self = shift;