Changeset 5381

Timestamp:

06/19/09 22:45:11 (3 years ago)

Author:

azawawi

Message:

[Perl 6] auto coloring is now in preferences and it is enabled by default.

Location:

trunk/Padre-Plugin-Perl6/lib/Padre/Plugin

Files:

• Perl6.pm (modified) (3 diffs)
• Perl6/Preferences.pm (modified) (5 diffs)

trunk/Padre-Plugin-Perl6/lib/Padre/Plugin/Perl6.pm

@@ -74 +74 @@
     }
     if(not defined $config->{p6_highlight}) {
-        $config->{p6_highlight} = 0;
+        $config->{p6_highlight} = 1;
     }
 
@@ -135 +135 @@
         sub { $self->_create_from_template('p6_inline_in_p5', 'p5') },
     );
-
-    # Toggle Auto Perl6 syntax highlighting
-    $self->{p6_highlight} =
-        $self->{menu}->AppendCheckItem( -1, Wx::gettext("Enable Auto Coloring"),);
-    Wx::Event::EVT_MENU(
-        $main,
-        $self->{p6_highlight},
-        sub { $self->toggle_highlight; }
-    );
-    $self->{p6_highlight}->Check($config->{p6_highlight} ? 1 : 0);
 
     # Export into HTML
@@ -434 +424 @@
 }
 
-sub toggle_highlight {
-    my $self = shift;
-    if(! defined $self->{p6_highlight}) {
-        return;
-    }
-    $config->{p6_highlight} = $self->{p6_highlight}->IsChecked ? 1 : 0;
-    $self->config_write($config);
-    if($config->{p6_highlight}) {
-        $self->highlight;
-    }
-}
-
 sub highlight {
     my $self = shift;

trunk/Padre-Plugin-Perl6/lib/Padre/Plugin/Perl6/Preferences.pm

@@ -5 +5 @@
 
 use Class::XSAccessor accessors => {
-    _plugin         => '_plugin',           # plugin to be configured
-    _sizer          => '_sizer',            # window sizer
-    _colorizer_list => '_colorizer_list'    # colorizer list box
+    _plugin           => '_plugin',           # plugin to be configured
+    _sizer            => '_sizer',            # window sizer
+    _colorizer_cb     => '_colorizer_cb',      # colorizer on/off checkbox
+    _colorizer_list   => '_colorizer_list',    # colorizer list box
 };
 
@@ -58 +59 @@
 
     # update configuration
-    my $selection = $self->_colorizer_list->GetSelection();
-    $prefs->{colorizer} = ($selection == 0) ? 'STD' : 'PGE';
+    my $old_p6_highlight = $prefs->{p6_highlight};
+    $prefs->{p6_highlight} = $self->_colorizer_cb->GetValue();
+    $prefs->{colorizer} = ($self->_colorizer_list->GetSelection() == 0) ? 
+        'STD' : 'PGE';
 
     # store plugin preferences
     $plugin->config_write($prefs);
+
+    if($old_p6_highlight != $prefs->{p6_highlight}) {
+        $plugin->highlight;
+    }
     
     $self->Destroy;
@@ -107 +114 @@
     my $self = shift;
 
+    $self->_colorizer_cb(
+        Wx::CheckBox->new( $self, -1, Wx::gettext('Enable coloring'))
+    );
+    
     my @choices = [
         'S:H:P6/STD',
@@ -112 +123 @@
     ];
     # syntax highligher selection
-    my $selector_label = Wx::StaticText->new( $self, -1, Wx::gettext('Syntax Highlighter:') );
+    my $colorizer_list_label = Wx::StaticText->new( $self, -1, Wx::gettext('Colorizer:') );
     $self->_colorizer_list( 
         Wx::ListBox->new(
@@ -123 +134 @@
     );
     
-    # Select based on configuration variable
-    $self->_colorizer_list->Select( ($self->_plugin->config->{colorizer} eq 'STD') ? 0 : 1);
+    # Select based on configuration parameters
+    my $config = $self->_plugin->config;
+    $self->_colorizer_cb->SetValue( $config->{p6_highlight} );
+    $self->_colorizer_list->Select( $config->{colorizer} eq 'STD' ? 0 : 1);
     
     # pack the controls in a box
     my $box;
     $box = Wx::BoxSizer->new(Wx::wxHORIZONTAL);
-    $box->Add( $selector_label, 0, Wx::wxALL|Wx::wxEXPAND|Wx::wxALIGN_CENTER, 5 );
+    $box->Add( $self->_colorizer_cb, 1, Wx::wxALL|Wx::wxEXPAND|Wx::wxALIGN_CENTER, 5 );
+    $self->_sizer->Add( $box, 0, Wx::wxALL|Wx::wxEXPAND|Wx::wxALIGN_CENTER, 5 );
+
+    $box = Wx::BoxSizer->new(Wx::wxHORIZONTAL);
+    $box->Add( $colorizer_list_label, 0, Wx::wxALL|Wx::wxEXPAND|Wx::wxALIGN_CENTER, 5 );
     $box->Add( $self->_colorizer_list, 1, Wx::wxALL|Wx::wxEXPAND|Wx::wxALIGN_CENTER, 5 );
     $self->_sizer->Add( $box, 0, Wx::wxALL|Wx::wxEXPAND|Wx::wxALIGN_CENTER, 5 );