Changeset 873

Timestamp:

11/10/08 13:25:10 (3 years ago)

Author:

szabgab

Message:

fix the saving of the new autoindentation preference
implement the three levels of autoindentation

Location:

trunk

Files:

• Changes (modified) (1 diff)
• lib/Padre/Wx/Dialog/Preferences.pm (modified) (1 diff)
• lib/Padre/Wx/Editor.pm (modified) (2 diffs)

trunk/Changes

@@ -1 +1 @@
 Changes for Padre.
+
+    Fix the failing plugin manager test. (SZABGAB)
+    Add configuration option to the autoindentation (no, same_level, deep). (SZABGAB)
+    Temporarily stop using File::ShareDir::PAR. (SZABGAB)
 
 0.16 2008.11.09

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

@@ -94 +94 @@
         $config->{$f} = $data->{$f} ? 1 :0;
     }
-    $config->{main_startup}    = $main_startup[ $data->{main_startup} ];
+
+    $config->{main_startup}        = $main_startup[ $data->{main_startup} ];
+    $config->{editor_autoindent}   = $editor_autoindent[ $data->{editor_autoindent} ];
 
     return;

trunk/lib/Padre/Wx/Editor.pm

@@ -304 +304 @@
     my ($self) = @_;
 
+    my $config = Padre->ide->config;
+    return if not $config->{editor_autoindent} or $config->{editor_autoindent} eq 'no';
+    
     my $pos       = $self->GetCurrentPos;
     my $prev_line = $self->LineFromPosition($pos) -1;
@@ -313 +316 @@
     my $content   = $self->GetTextRange($start, $end);
     #print "'$content'\n";
+    my $indent = '';
     if ($content =~ /^(\s+)/) {
-        my $indent = $1;
+        $indent = $1;
+    }
+    if ($config->{editor_autoindent} eq 'deep' and $content =~ /\{\s*$/) {
+        $indent .= "\t";
+    }
+    if ($indent ne '') {
         $self->InsertText($pos, $indent);
         $self->GotoPos($pos + length($indent));
     }
-
+    
     return;
 }