Changeset 5378

Timestamp:

06/19/09 13:55:04 (3 years ago)

Author:

azawawi

Message:

[Perl 6] an initial fix to ticket:393

Location:

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

Files:

• Perl6.pm (modified) (2 diffs)
• Perl6/Preferences.pm (modified) (6 diffs)

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

@@ -17 +17 @@
 my $SNIPPET_HTML = 'snippet_html';
 
+use Class::XSAccessor accessors => {
+    config         => 'config',           # plugin configuration object
+};
+
 # static field to contain reference to current plugin configuration
 my $config;
@@ -76 +80 @@
     $self->config_write($config);
 
+    # update configuration attribute
+    $self->config( $config );
+    
     # let us parse some S29-functions.pod documentation (safely)
     eval {

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
+    _plugin         => '_plugin',           # plugin to be configured
+    _sizer          => '_sizer',            # window sizer
+    _colorizer_list => '_colorizer_list'    # colorizer list box
 };
 
@@ -49 +50 @@
 # 
 sub _on_ok_button_clicked {
-    my ($self) = @_;
+    my $self = shift;
+    
     my $plugin = $self->_plugin;
 
     # read plugin preferences
-    #my $prefs = $plugin->config;
+    my $prefs = $plugin->config;
 
-    # overwrite dictionary preference
-    #my $dic = $self->_dict_combo->GetValue;
-    #$prefs->{dictionary} = $dic;
+    # update configuration
+    my $selection = $self->_colorizer_list->GetSelection();
+    $prefs->{colorizer} = ($selection == 0) ? 'STD' : 'PGE';
 
     # store plugin preferences
-    #$plugin->config_write($prefs);
+    $plugin->config_write($prefs);
     
     $self->Destroy;
@@ -69 +71 @@
 
 #
-# $self->_create;
-#
 # create the dialog itself.
 #
-# no params, no return values.
-#
 sub _create {
-    my ($self) = @_;
+    my $self = shift;
 
     # create sizer that will host all controls
@@ -92 +90 @@
 
 #
-# $dialog->_create_buttons;
-#
 # create the buttons pane.
 #
-# no params. no return values.
-#
 sub _create_buttons {
-    my ($self) = @_;
+    my $self = shift;
     my $sizer  = $self->_sizer;
 
@@ -108 +102 @@
 
 #
-# $dialog->_create_controls;
-#
 # create the pane to choose the various configuration parameters.
 #
-# no params. no return values.
-#
 sub _create_controls {
-    my ($self) = @_;
+    my $self = shift;
 
-    my @choices = ['S:H:P6/STD','Rakudo/PGE'];
+    my @choices = [
+        'S:H:P6/STD',
+        'Rakudo/PGE'
+    ];
     # syntax highligher selection
     my $selector_label = Wx::StaticText->new( $self, -1, Wx::gettext('Syntax Highlighter:') );
-    my $selector_list = Wx::ListBox->new(
-        $self,
-        -1,
-        Wx::wxDefaultPosition,
-        Wx::wxDefaultSize,
-        @choices,
+    $self->_colorizer_list( 
+        Wx::ListBox->new(
+            $self,
+            -1,
+            Wx::wxDefaultPosition,
+            Wx::wxDefaultSize,
+            @choices,
+        )
     );
     
-    # XXX - Select based on configuration variable
-    $selector_list->Select(0);
+    # Select based on configuration variable
+    $self->_colorizer_list->Select( ($self->_plugin->config->{colorizer} eq 'STD') ? 0 : 1);
     
     # pack the controls in a box
@@ -135 +130 @@
     $box = Wx::BoxSizer->new(Wx::wxHORIZONTAL);
     $box->Add( $selector_label, 0, Wx::wxALL|Wx::wxEXPAND|Wx::wxALIGN_CENTER, 5 );
-    $box->Add( $selector_list, 1, 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 );