Changeset 12391

Timestamp:

08/29/10 09:53:21 (18 months ago)

Author:

zenogantner

Message:

more clean-up

Location:

trunk/Padre

Files:

• lib/Padre.pm (modified) (2 diffs)
• lib/Padre/Wx/Action.pm (modified) (1 diff)
• lib/Padre/Wx/Dialog/KeyBindings.pm (modified) (1 diff)
• t/06-utils.t (modified) (1 diff)

trunk/Padre/lib/Padre.pm

@@ -45 +45 @@
     accessors => {
         actions     => 'actions',
+        shortcuts   => 'shortcuts',
         instance_id => 'instance_id',
     },
@@ -134 +135 @@
     $self->{config} = Padre::Config->read;
 
-    # Actions registry
-    my %actions = ();
-    $self->actions( \%actions );
+    # Actions and keyboard shortcuts registries
+    $self->actions(   {} );
+    $self->shortcuts( {} );
 
     # Load a few more bits and pieces now we know

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

@@ -125 +125 @@
         }
 
-        $ide->{shortcuts} = {} if not exists $ide->{shortcuts};
-        my $shortcuts = $ide->{shortcuts};
+        my $shortcuts = $ide->shortcuts;
         if ( exists $shortcuts->{$shortcut} ) {
             warn "Found a duplicate shortcut '$shortcut' with " . $shortcuts->{$shortcut}->name . " for '$name'\n";

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

@@ -321 +321 @@
     return if $shortcut eq '';
 
-    my $shortcuts = Padre->ide->{shortcuts};
+    my $shortcuts = Padre->ide->shortcuts;
     if ( exists $shortcuts->{$shortcut} ) {
-        warn "Found a duplicate shortcut '$shortcut' with " . $shortcuts->{$shortcut}->name . " for '$name'\n";
+        warn "Found a duplicate shortcut: '$shortcut' for " . $shortcuts->{$shortcut}->name . "\n";
 
         # TODO instead of a warning, offer to overwrite the old shortcut.

trunk/Padre/t/06-utils.t

@@ -55 +55 @@
 use Padre::Wx::Action;
 use Padre::Wx::ActionLibrary;
-sub Padre::ide { return bless { shortcuts => {} }, 'Padre::IDE'; }
+sub Padre::ide { return bless {}, 'Padre::IDE'; }
 sub Padre::IDE::actions { return {} }
 sub Padre::IDE::config { return bless {}, 'Padre::Config' }