Changeset 9764

Timestamp:

12/17/09 22:32:25 (9 months ago)

Author:

azawawi

Message:

Updates Changes and performed a Perl tidy

Location:

trunk/Padre

Files:

• Changes (modified) (1 diff)
• lib/Padre/Lock.pm (modified) (1 diff)
• lib/Padre/Wx/Dialog/Form.pm (modified) (4 diffs)
• lib/Padre/Wx/Dialog/OpenResource.pm (modified) (4 diffs)
• lib/Padre/Wx/FunctionList.pm (modified) (1 diff)
• lib/Padre/Wx/Main.pm (modified) (2 diffs)
• lib/Padre/Wx/Menu/Edit.pm (modified) (3 diffs)

trunk/Padre/Changes

@@ -17 +17 @@
       default always to Scintilla (AZAWAWI)
     - Landed first phase of new multi-resource locking subsystem (ADAMK)
+    - In Open resource, path is now cleaned from slashes on win32 (AZAWAWI)
 
 0.52 2009.12.14

trunk/Padre/lib/Padre/Lock.pm

@@ -9 +9 @@
 sub new {
         my $class = shift;
-        my $self  = bless { @_ }, $class;
+        my $self = bless {@_}, $class;
 
         # Enable the locks

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

@@ -33 +33 @@
                 Wx::wxDefaultPosition,
                 Wx::wxDefaultSize,
-                Wx::wxCAPTION
-                | Wx::wxCLOSE_BOX
-                | Wx::wxSYSTEM_MENU
+                Wx::wxCAPTION | Wx::wxCLOSE_BOX | Wx::wxSYSTEM_MENU
         );
 
@@ -98 +96 @@
                 "",
         );
-        $self->SetTitle(Wx::gettext("Padre"));
+        $self->SetTitle( Wx::gettext("Padre") );
         $combo_box_1->SetSelection(-1);
         $choice_1->SetSelection(0);
@@ -105 +103 @@
         my $sizer_8 = Wx::BoxSizer->new(Wx::wxVERTICAL);
         $self->{button_sizer} = Wx::BoxSizer->new(Wx::wxHORIZONTAL);
-        $self->{form_sizer} = Wx::GridSizer->new(
+        $self->{form_sizer}   = Wx::GridSizer->new(
                 3,
                 2,
@@ -111 +109 @@
                 5,
         );
-        $self->{form_sizer}->Add($label_1, 0, Wx::wxALIGN_CENTER_VERTICAL, 0);
-        $self->{form_sizer}->Add($text_ctrl_1, 0, 0, 0);
-        $self->{form_sizer}->Add($label_2, 0, Wx::wxALIGN_CENTER_VERTICAL, 0);
-        $self->{form_sizer}->Add($combo_box_1, 0, 0, 0);
-        $self->{form_sizer}->Add($label_3, 0, Wx::wxALIGN_CENTER_VERTICAL, 0);
-        $self->{form_sizer}->Add($choice_1, 0, 0, 0);
-        $sizer_8->Add($self->{form_sizer}, 1, Wx::wxEXPAND, 0);
-        $sizer_8->Add($static_line_1, 0, Wx::wxTOP | Wx::wxBOTTOM | Wx::wxEXPAND, 5);
-        $self->{button_sizer}->Add($self->{ok}, 1, 0, 0);
-        $self->{button_sizer}->Add($self->{cancel}, 1, Wx::wxLEFT, 5);
-        $sizer_8->Add($self->{button_sizer}, 0, Wx::wxALIGN_RIGHT, 5);
-        $sizer_7->Add($sizer_8, 1, Wx::wxALL | Wx::wxEXPAND, 5);
+        $self->{form_sizer}->Add( $label_1,     0, Wx::wxALIGN_CENTER_VERTICAL, 0 );
+        $self->{form_sizer}->Add( $text_ctrl_1, 0, 0,                           0 );
+        $self->{form_sizer}->Add( $label_2,     0, Wx::wxALIGN_CENTER_VERTICAL, 0 );
+        $self->{form_sizer}->Add( $combo_box_1, 0, 0,                           0 );
+        $self->{form_sizer}->Add( $label_3,     0, Wx::wxALIGN_CENTER_VERTICAL, 0 );
+        $self->{form_sizer}->Add( $choice_1,    0, 0,                           0 );
+        $sizer_8->Add( $self->{form_sizer}, 1, Wx::wxEXPAND, 0 );
+        $sizer_8->Add( $static_line_1, 0, Wx::wxTOP | Wx::wxBOTTOM | Wx::wxEXPAND, 5 );
+        $self->{button_sizer}->Add( $self->{ok},     1, 0,          0 );
+        $self->{button_sizer}->Add( $self->{cancel}, 1, Wx::wxLEFT, 5 );
+        $sizer_8->Add( $self->{button_sizer}, 0, Wx::wxALIGN_RIGHT,        5 );
+        $sizer_7->Add( $sizer_8,              1, Wx::wxALL | Wx::wxEXPAND, 5 );
         $self->SetSizer($sizer_7);
         $sizer_7->Fit($self);

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

@@ -320 +320 @@
                         my $num_selected = scalar @matches;
                         if ( $num_selected == 1 ) {
-                                $self->_status_text->ChangeValue( $self->_path($self->_matches_list->GetClientData( $matches[0])) );
+                                $self->_status_text->ChangeValue( $self->_path( $self->_matches_list->GetClientData( $matches[0] ) ) );
                                 $self->_copy_button->Enable(1);
                         } elsif ( $num_selected > 1 ) {
@@ -456 +456 @@
         my @recent_files = ();
         foreach my $e (@$recently_used) {
-                push @recent_files,  $self->_path($e->value);
+                push @recent_files, $self->_path( $e->value );
         }
         @recent_files = sort { File::Basename::fileparse($a) cmp File::Basename::fileparse($b) } @recent_files;
@@ -516 +516 @@
         if ( $pos > 0 ) {
                 $self->_matches_list->Select(0);
-                $self->_status_text->ChangeValue( $self->_path($self->_matches_list->GetClientData(0)) );
+                $self->_status_text->ChangeValue( $self->_path( $self->_matches_list->GetClientData(0) ) );
                 $self->_status_text->Enable(1);
                 $self->_copy_button->Enable(1);
@@ -534 +534 @@
 #
 sub _path {
-        my ($self, $path) = @_;
-        if(Padre::Constant::WIN32) {
+        my ( $self, $path ) = @_;
+        if (Padre::Constant::WIN32) {
                 $path =~ s/\//\\/g;
         }

trunk/Padre/lib/Padre/Wx/FunctionList.pm

@@ -188 +188 @@
         my $document  = $current->document;
         my $functions = $self->{functions};
-        unless ( $document ) {
+        unless ($document) {
                 $functions->Clear;
                 $self->{search}->Hide;

trunk/Padre/lib/Padre/Wx/Main.pm

@@ -147 +147 @@
         # NOTE: If changing the directory fails, ignore errors for now,
         #       since that means we have WAY bigger problems.
-        if ( Padre::Constant::WIN32 ) {
+        if (Padre::Constant::WIN32) {
                 chdir( File::HomeDir->my_home );
         }
@@ -684 +684 @@
 
 sub lock {
-        shift->locker->lock( @_ );
+        shift->locker->lock(@_);
 }
 

trunk/Padre/lib/Padre/Wx/Menu/Edit.pm

@@ -39 +39 @@
                 id          => Wx::wxID_UNDO,
                 need_editor => 1,
-#               need        => sub {
-#                       my %objects = @_;
-#                       return 0 if !defined( $objects{editor} );
-#                       return $objects{editor}->CanUndo;
-#               },
+
+                #               need        => sub {
+                #                       my %objects = @_;
+                #                       return 0 if !defined( $objects{editor} );
+                #                       return $objects{editor}->CanUndo;
+                #               },
                 label      => Wx::gettext('&Undo'),
                 shortcut   => 'Ctrl-Z',
@@ -57 +58 @@
                 id          => Wx::wxID_REDO,
                 need_editor => 1,
-#               need        => sub {
-#                       my %objects = @_;
-#                       return 0 if !defined( $objects{editor} );
-#                       return $objects{editor}->CanRedo;
-#               },
+
+                #               need        => sub {
+                #                       my %objects = @_;
+                #                       return 0 if !defined( $objects{editor} );
+                #                       return $objects{editor}->CanRedo;
+                #               },
                 label      => Wx::gettext('&Redo'),
                 shortcut   => 'Ctrl-Y',
@@ -753 +755 @@
         # Handle the complex cases
         my $selection = !!( defined $text and $text ne '' );
-        $self->{undo}->Enable( $editor );
-        $self->{redo}->Enable( $editor );
+        $self->{undo}->Enable($editor);
+        $self->{redo}->Enable($editor);
         $self->{paste}->Enable($editor);