Changeset 12427

Timestamp:

09/02/10 06:00:44 (18 months ago)

Author:

zenogantner

Message:

partial fix for #452: 'focus order in Replace dialog'

Location:

trunk/Padre

Files:

• Changes (modified) (1 diff)
• lib/Padre/Wx/Dialog/Replace.pm (modified) (22 diffs)

trunk/Padre/Changes

@@ -25 +25 @@
     - Fix MIME type setting via menu (ZENOG)
     - mark nl_be as not supported (ZENOG)
+    - partial fix for #452: 'focus order in Replace dialog' (ZENOG)
 
 0.69 2010.08.17

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

@@ -2 +2 @@
 
 =pod
-
 =head1 NAME
-
 Padre::Wx::Dialog::Replace - Find and Replace Widget
-
 =head1 DESCRIPTION
-
 C<Padre::Wx:Main> implements Padre's Find and Replace dialog box.
-
 =head1 METHODS
-
 =cut
 
@@ -24 +18 @@
 use Padre::Wx::Role::Main        ();
 use Padre::Wx::History::ComboBox ();
-
 our $VERSION = '0.69';
 our @ISA     = qw{
@@ -32 +25 @@
 
 =pod
-
 =head2 new
-
   my $find = Padre::Wx::Dialog::Replace->new($main);
-
 Create and return a C<Padre::Wx::Dialog::Replace> search and replace widget.
-
-=cut
+=cut
+
 
 sub new {
@@ -149 +139 @@
         $self,
         Wx::wxID_FIND,
-        Wx::gettext("&Find"),
+        Wx::gettext('&Find'),
     );
     Wx::Event::EVT_BUTTON(
@@ -158 +148 @@
         }
     );
-    Wx::Event::EVT_CHAR(
+    Wx::Event::EVT_KEY_DOWN(
         $self->{find_button},
         sub {
-            $self->hotkey( $_[1]->GetKeyCode );
+            $self->hotkey( $_[1], $self->{find_button} );
         }
     );
 
     # The "Replace" button
-    $self->{replace} = Wx::Button->new(
+    $self->{replace_button} = Wx::Button->new(
         $self,
         Wx::wxID_REPLACE,
-        Wx::gettext("&Replace"),
+        Wx::gettext('&Replace'),
     );
     Wx::Event::EVT_BUTTON(
         $self,
-        $self->{replace},
+        $self->{replace_button},
         sub {
             $_[0]->replace_button;
         }
     );
-    Wx::Event::EVT_CHAR(
-        $self->{replace},
-        sub {
-            $self->hotkey( $_[1]->GetKeyCode );
-        }
-    );
-    $self->{replace}->SetDefault;
+    Wx::Event::EVT_KEY_DOWN(
+        $self->{replace_button},
+        sub {
+            $self->hotkey( $_[1], $self->{replace_button} );
+        }
+    );
+    $self->{replace_button}->SetDefault;
 
     # The "Close" button
-    $self->{cancel_button} = Wx::Button->new(
+    $self->{close_button} = Wx::Button->new(
         $self,
         Wx::wxID_CANCEL,
-        Wx::gettext("&Close"),
+        Wx::gettext('&Close'),
     );
     Wx::Event::EVT_BUTTON(
         $self,
-        $self->{cancel_button},
-        sub {
-            $_[0]->cancel_button;
-        }
-    );
+        $self->{close_button},
+        sub {
+            $_[0]->close_button;
+        }
+    );
+
+    # Tab order
+    $self->{find_regex}->MoveAfterInTabOrder( $self->{find_text} );
+    $self->{replace_text}->MoveAfterInTabOrder( $self->{find_regex} );
+    $self->{find_case}->MoveAfterInTabOrder( $self->{replace_regex} );
+    $self->{find_reverse}->MoveAfterInTabOrder( $self->{find_case} );
+    $self->{find_first}->MoveAfterInTabOrder( $self->{find_reverse} );
+    $self->{replace_all}->MoveAfterInTabOrder( $self->{find_first} );
+    $self->{find_button}->MoveAfterInTabOrder( $self->{replace_all} );
+    $self->{replace_button}->MoveAfterInTabOrder( $self->{find_button} );
+    $self->{close_button}->MoveAfterInTabOrder( $self->{replace_button} );
 
     # Form Layout
-
     # Find sizer begins here
     my $find = Wx::StaticBoxSizer->new(
@@ -215 +215 @@
             $self,
             Wx::wxID_STATIC,
-            Wx::gettext("Find Text:"),
+            Wx::gettext('Find Text:'),
         ),
         0,
@@ -247 +247 @@
             $self,
             Wx::wxID_STATIC,
-            Wx::gettext("Replace Text:"),
+            Wx::gettext('Replace Text:'),
         ),
         0,
@@ -313 +313 @@
     );
     $bottom->Add(
-        $self->{replace},
+        $self->{replace_button},
         0,
         Wx::wxGROW | Wx::wxLEFT | Wx::wxRIGHT,
@@ -319 +319 @@
     );
     $bottom->Add(
-        $self->{cancel_button},
+        $self->{close_button},
         0,
         Wx::wxGROW | Wx::wxLEFT,
@@ -363 +363 @@
     $self->{find_first}->SetValue( $config->find_first );
     $self->{find_reverse}->SetValue( $config->find_reverse );
-
     return $self;
 }
 
 =pod
-
 =head2 find
-
   $self->find
-
 Grab currently selected text, if any, and place it in find combo box.
 Bring up the dialog or perform search for string's next occurrence
 if dialog is already displayed.
-
 TO DO: if selection is more than one line then consider it as the limit
 of the search and not as the string to be used.
-
-=cut
+=cut
+
 
 sub find {
@@ -396 +391 @@
     $self->{find_text}->refresh;
     $self->{replace_text}->refresh;
-
     if ( $self->IsShown ) {
         $self->find_button;
@@ -410 +404 @@
         $self->Show(1);
     }
-
     return;
 }
-
-
-
-
-
 ######################################################################
 # Button Events
 
 =pod
-
 =head2 find_button
-
   $self->find_button
-
 Executed when Find button is clicked.
-
 Performs search on the term specified in the dialog.
-
 =cut
 
@@ -441 +424 @@
     my $search = $self->as_search;
     unless ($search) {
-        $main->error("Not a valid search");
+        $main->error('Not a valid search');
 
         # Move the focus back to the search text
@@ -456 +439 @@
         $self->Hide;
     }
-
     return;
 }
 
 =pod
-
-=head2 cancel_button
-
-  $self->cancel_button
-
+=head2 close_button
+  $self->close_button
 Hide dialog when pressed cancel button.
-
-=cut
-
-sub cancel_button {
+=cut
+
+
+sub close_button {
     my $self = shift;
     $self->Hide;
@@ -483 +462 @@
         $editor->SetFocus;
     }
-
     return;
 }
 
 =pod
-
 =head2 replace_button
-
   $self->replace_button;
-
 Executed when the Replace button is clicked.
-
 Replaces one appearance of the Find Text with the Replace Text.
-
 If search window is still open, run C<search> on the whole text,
 again.
-
-=cut
+=cut
+
 
 # TO DO: The change to this function that turned it into a dual-purpose function
@@ -516 +489 @@
     my $search = $self->as_search;
     unless ($search) {
-        $main->error("Not a valid search");
+        $main->error('Not a valid search');
 
         # Move the focus back to the search text
@@ -541 +514 @@
     # so they can change it if they want.
     $self->{find_text}->SetFocus;
-
     return;
 }
 
 =pod
-
 =head2 replace_all
-
   $self->replace_all;
-
 Executed when Replace All button is clicked.
-
 Replace all appearances of given string in the current document.
-
-=cut
+=cut
+
 
 sub replace_all {
@@ -565 +533 @@
     my $search = $self->as_search;
     unless ($search) {
-        $main->error("Not a valid search");
+        $main->error('Not a valid search');
         return;
     }
@@ -590 +558 @@
     # so they can change it if they want.
     $self->{find_text}->SetFocus;
-
     return;
 }
-
-
-
-
-
 #####################################################################
 # Support Methods
 
 =pod
-
 =head2 as_search
-
 Integration with L<Padre::Search>. Generates a search instance for the
 currently configured information in the Find dialog.
-
 Returns a L<Padre::Search> object, or C<undef> if current state of the
 dialog does not result in a valid search.
-
 =cut
 
@@ -626 +584 @@
 # Adds Ultraedit-like hotkeys for quick find/replace triggering
 sub hotkey {
-    my $self = shift;
-    my $code = shift;
-
-    # Handle the 'f' hotkey
-    if ( $code == 102 ) {
+    my ( $self, $key_event, $sender ) = @_;
+
+    if ( $key_event->GetKeyCode == ord 'F' ) {
         $self->find_button;
     }
-
-    # Handle the 'r' hotkey
-    if ( $code == 114 ) {
+    if ( $key_event->GetKeyCode == ord 'R' ) {
         $self->replace_button;
     }
-
+    if ( $key_event->GetKeyCode == Wx::WXK_TAB ) {
+
+        #$sender->Navigate( $key_event->ShiftDown ? 0 : 1 );
+    }
     return;
 }
@@ -648 +605 @@
     my $config  = $self->current->config;
     my $changed = 0;
-
     foreach my $name (qw{ find_case find_regex find_first find_reverse }) {
         my $value = $self->{$name}->GetValue;
@@ -655 +611 @@
         $changed = 1;
     }
-
     $config->write if $changed;
-
     return $config;
 }
-
 1;
 
 =pod
-
 =head1 COPYRIGHT & LICENSE
-
 Copyright 2008-2010 The Padre development team as listed in Padre.pm.
-
 This program is free software; you can redistribute
 it and/or modify it under the same terms as Perl itself.
-
 The full text of the license can be found in the
 LICENSE file included with this module.
-
-=cut
+=cut
+
 
 # Copyright 2008-2010 The Padre development team as listed in Padre.pm.