Changeset 833

Timestamp:

11/09/08 01:18:46 (3 years ago)

Author:

szabgab

Message:

leading space to TAB conversion in our code (was using our menu option)

File:

• trunk/lib/Padre/Wx/MainWindow.pm (modified) (5 diffs)

trunk/lib/Padre/Wx/MainWindow.pm

@@ -1539 +1539 @@
 
     my $title = $type eq 'Space_to_Tab' ? 'Space to Tab' : 'Tab to Space';
-    
-    require Padre::Wx::History::TextDialog;
-    my $dialog = Padre::Wx::History::TextDialog->new(
-        $self, 'How many spaces for each tab:', $title, $type,
-    );
-    if ( $dialog->ShowModal == Wx::wxID_CANCEL ) {
-        return;
-    }
-    my $space_num = $dialog->GetValue;
-    $dialog->Destroy;
-    unless ( defined $space_num and $space_num =~ /^\d+$/ ) {
-        return;
-    }
-    
-    my $code;
-    my $src = $self->selected_text;
-    my $doc = $self->selected_document;
-    if ( $src ) {
-        $code = $src;
-    } else {
-        $code = $doc->text_get;
-    }
-    
-    return unless ( defined $doc and length($doc) );
-    
-    my $to_space = ' ' x $space_num;
-    if ( $type eq 'Space_to_Tab' ) {
-        $code =~ s/$to_space/\t/isg;
-    } else {
-        $code =~ s/\t/$to_space/isg;
-    }
-    
-    if ( $src ) {
-        my $editor = $self->selected_editor;
-        $editor->ReplaceSelection( $code );
-    } else {
-        $doc->text_set( $code );
-    }
+    
+    require Padre::Wx::History::TextDialog;
+    my $dialog = Padre::Wx::History::TextDialog->new(
+        $self, 'How many spaces for each tab:', $title, $type,
+    );
+    if ( $dialog->ShowModal == Wx::wxID_CANCEL ) {
+        return;
+    }
+    my $space_num = $dialog->GetValue;
+    $dialog->Destroy;
+    unless ( defined $space_num and $space_num =~ /^\d+$/ ) {
+        return;
+    }
+    
+    my $code;
+    my $src = $self->selected_text;
+    my $doc = $self->selected_document;
+    if ( $src ) {
+        $code = $src;
+    } else {
+        $code = $doc->text_get;
+    }
+    
+    return unless ( defined $doc and length($doc) );
+    
+    my $to_space = ' ' x $space_num;
+    if ( $type eq 'Space_to_Tab' ) {
+        $code =~ s/$to_space/\t/isg;
+    } else {
+        $code =~ s/\t/$to_space/isg;
+    }
+    
+    if ( $src ) {
+        my $editor = $self->selected_editor;
+        $editor->ReplaceSelection( $code );
+    } else {
+        $doc->text_set( $code );
+    }
 }
 
@@ -1583 +1583 @@
     
     my $code;
-    my $src = $self->selected_text;
-    my $doc = $self->selected_document;
-    if ( $src ) {
-        $code = $src;
-    } else {
-        $code = $doc->text_get;
-    }
-    
-    # remove ending space
-    $code =~ s/([^\n\S]+)$//mg;
-    
-    if ( $src ) {
-        my $editor = $self->selected_editor;
-        $editor->ReplaceSelection( $code );
-    } else {
-        $doc->text_set( $code );
-    }
+    my $src = $self->selected_text;
+    my $doc = $self->selected_document;
+    if ( $src ) {
+        $code = $src;
+    } else {
+        $code = $doc->text_get;
+    }
+    
+    # remove ending space
+    $code =~ s/([^\n\S]+)$//mg;
+    
+    if ( $src ) {
+        my $editor = $self->selected_editor;
+        $editor->ReplaceSelection( $code );
+    } else {
+        $doc->text_set( $code );
+    }
 }
 
@@ -1606 +1606 @@
     
     my $src = $self->selected_text;
-    unless ( $src ) {
-        $self->message('No selection');
-        return;
-    }
-    
-    require Padre::Wx::History::TextDialog;
-    my $dialog = Padre::Wx::History::TextDialog->new(
-        $self, 'How many leading spaces to delete(1 tab == 4 spaces):',
-        'Delete Leading Space', 'fay_delete_leading_space',
-    );
-    if ( $dialog->ShowModal == Wx::wxID_CANCEL ) {
-        return;
-    }
-    my $space_num = $dialog->GetValue;
-    $dialog->Destroy;
-    unless ( defined $space_num and $space_num =~ /^\d+$/ ) {
-        return;
-    }
-
-    my $code = $src;
-    my $spaces = ' ' x $space_num;
-    my $tab_num = int($space_num/4);
-    my $space_num_left = $space_num - 4 * $tab_num;
-    my $tabs   = "\t" x $tab_num;
-    $tabs .= '' x $space_num_left if ( $space_num_left );
-    $code =~ s/^($spaces|$tabs)//mg;
-    
-    my $editor = $self->selected_editor;
-    $editor->ReplaceSelection( $code );
+    unless ( $src ) {
+        $self->message('No selection');
+        return;
+    }
+    
+    require Padre::Wx::History::TextDialog;
+    my $dialog = Padre::Wx::History::TextDialog->new(
+        $self, 'How many leading spaces to delete(1 tab == 4 spaces):',
+        'Delete Leading Space', 'fay_delete_leading_space',
+    );
+    if ( $dialog->ShowModal == Wx::wxID_CANCEL ) {
+        return;
+    }
+    my $space_num = $dialog->GetValue;
+    $dialog->Destroy;
+    unless ( defined $space_num and $space_num =~ /^\d+$/ ) {
+        return;
+    }
+
+    my $code = $src;
+    my $spaces = ' ' x $space_num;
+    my $tab_num = int($space_num/4);
+    my $space_num_left = $space_num - 4 * $tab_num;
+    my $tabs   = "\t" x $tab_num;
+    $tabs .= '' x $space_num_left if ( $space_num_left );
+    $code =~ s/^($spaces|$tabs)//mg;
+    
+    my $editor = $self->selected_editor;
+    $editor->ReplaceSelection( $code );
 }
 
@@ -1641 +1641 @@
     
     my $code;
-    my $src = $self->selected_text;
-    my $doc = $self->selected_document;
-    if ( $src ) {
-        $code = $src;
-    } else {
-        $code = $doc->text_get;
-    }
-    
-    return unless ( defined $code and length($code) );
-    
-    if ( $type eq 'Upper_All' ) {
+    my $src = $self->selected_text;
+    my $doc = $self->selected_document;
+    if ( $src ) {
+        $code = $src;
+    } else {
+        $code = $doc->text_get;
+    }
+    
+    return unless ( defined $code and length($code) );
+    
+    if ( $type eq 'Upper_All' ) {
         $code = uc($code);
     } elsif ( $type eq 'Lower_All' ) {
@@ -1660 +1660 @@
         $code =~ s/\b(\S+)\b/lcfirst($1)/ge;
     }
-    
-    if ( $src ) {
+    
+    if ( $src ) {
         my $editor = $self->selected_editor;
-        $editor->ReplaceSelection( $code );
+        $editor->ReplaceSelection( $code );
     } else {
         $doc->text_set( $code );