Changeset 12395

Timestamp:

08/29/10 12:23:01 (18 months ago)

Author:

zenogantner

Message:

code clean-up, nicer UI behaviour

Location:

trunk/Padre/lib/Padre/Wx

Files:

• Action.pm (modified) (2 diffs)
• Dialog/KeyBindings.pm (modified) (12 diffs)

trunk/Padre/lib/Padre/Wx/Action.pm

@@ -97 +97 @@
     # Create shortcut setting for the action
     my $config  = Padre->ide->config;
-    my $setting = "keyboard_shortcut_$name";
-    $setting =~ s/\W/_/g; # setting names must be valid subroutine names
+    my $setting = $self->shortcut_setting;
     if ( not $config->can($setting) ) {
         $config->setting(
@@ -179 +178 @@
 }
 
+sub shortcut_setting {
+    my $self = shift;
+
+    my $setting = 'keyboard_shortcut_' . $self->name;
+    $setting =~ s/\W/_/g; # setting names must be valid subroutine names
+
+    return $setting;
+}
+
 # Add an event to an action:
 sub add_event {

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

@@ -113 +113 @@
     );
     $self->{button_delete}->Enable(1);
+
+    # Reset button
+    $self->{button_reset} = Wx::Button->new(
+        $self, -1, Wx::gettext('&Reset'),
+    );
+    $self->{button_reset}->SetToolTip( Wx::gettext('Reset to default shortcut') );
+    $self->{button_reset}->Enable(1);
 
     # Close button
@@ -150 +157 @@
     $value_sizer->Add( $self->{button_set},    0, Wx::wxALIGN_CENTER_VERTICAL, 5 );
     $value_sizer->Add( $self->{button_delete}, 0, Wx::wxALIGN_CENTER_VERTICAL, 5 );
+    $value_sizer->Add( $self->{button_reset},  0, Wx::wxALIGN_CENTER_VERTICAL, 5 );
 
     # Button sizer
@@ -226 +234 @@
     );
 
+    # Reset button
+    Wx::Event::EVT_BUTTON(
+        $self,
+        $self->{button_reset},
+        sub {
+            shift->_on_reset_button;
+        }
+    );
+
     # Close button
     Wx::Event::EVT_BUTTON(
@@ -262 +279 @@
     my $index       = $list->GetFirstSelected;
     my $action_name = $list->GetItemText($index);
+    my $action      = Padre->ide->actions->{$action_name};
 
     my $shortcut = Padre->ide->actions->{$action_name}->shortcut;
     $shortcut = '' if not defined $shortcut;
+
+    $self->{button_reset}->Enable( $shortcut ne $self->config->default( $action->shortcut_setting ) );
+
+    $self->{button_delete}->Enable( $shortcut ne '' );
 
     # Get the regular (i.e. non-modifier) key in the shortcut
@@ -282 +304 @@
     # and update the UI
     $self->{key}->SetSelection($regular_index);
-    $self->{ctrl}->SetValue( $shortcut =~ /Ctrl/ ? 1 : 0 );
-    $self->{alt}->SetValue( $shortcut  =~ /Alt/  ? 1 : 0 );
-    $self->{shift}->SetValue( ( $shortcut =~ /Shift/ ) ? 1 : 0 );
+    $self->{ctrl}->SetValue( $shortcut  =~ /Ctrl/  ? 1 : 0 );
+    $self->{alt}->SetValue( $shortcut   =~ /Alt/   ? 1 : 0 );
+    $self->{shift}->SetValue( $shortcut =~ /Shift/ ? 1 : 0 );
 
     # Make sure the value and info sizer are not hidden
@@ -290 +312 @@
     $self->{vsizer}->Show( 3, 1 );
     $self->{vsizer}->Layout;
-
-    return;
-}
-
-# Private method to update the UI from the provided key binding
-sub _update_ui {
-    my ( $self, $pref ) = @_;
-
-    my $list  = $self->{list};
-    my $index = $list->GetFirstSelected;
 
     return;
@@ -318 +330 @@
     push @key_list, $regular_key if not $regular_key eq 'None';
     my $shortcut = join '-', @key_list;
+
+    $self->try_to_set_binding( $action_name, $shortcut );
+
+    return;
+}
+
+sub try_to_set_binding {
+    my ( $self, $action_name, $shortcut ) = @_;
 
     my $other_action = Padre->ide->shortcuts->{$shortcut};
@@ -329 +349 @@
             Wx::gettext('Override Shortcut')
         );
-        if ($answer) {
+        if ( !$answer ) {
             $self->set_binding( $other_action->name, '' );
         } else {
@@ -350 +370 @@
     # modify shortcut registry
     my $old_shortcut = $action->shortcut;
-    delete $shortcuts->{$old_shortcut};
+    delete $shortcuts->{$old_shortcut} if defined $old_shortcut;
     $shortcuts->{$shortcut} = $action;
 
@@ -357 +377 @@
 
     # modify the configuration database
-    my $setting = "keyboard_shortcut_$action_name";
-    $setting =~ s/\W/_/g; # setting names must be valid subroutine names
-    $self->config->set( $setting, $shortcut );
+    $self->config->set( $action->shortcut_setting, $shortcut );
     $self->config->write;
 
@@ -375 +393 @@
     $self->set_binding( $action_name, '' );
     $self->_update_list;
+
+    return;
+}
+
+# Private method to handle the pressing of the reset button
+sub _on_reset_button {
+    my $self = shift;
+
+    my $index       = $self->{list}->GetFirstSelected;
+    my $action_name = $self->{list}->GetItemText($index);
+    my $action      = Padre->ide->actions($action_name);
+
+    $self->try_to_set_binding( $action_name, $self->config->default( $action->shortcut_setting ) );
 
     return;
@@ -413 +444 @@
         next
             if $action->label_text !~ /$filter/i
-                and $action_name !~ /$filter/i;
+                and $action_name !~ /$filter/i
+                and $shortcut !~ /$filter/i;
 
         # Add the key binding to the list control