Changeset 510

Timestamp:

10/26/08 09:48:58 (3 years ago)

Author:

szabgab

Message:

replace the Preferences dialog with one that uses the common
dialog infrastructure

Location:

trunk/lib/Padre/Wx

Files:

• Dialog.pm (modified) (3 diffs)
• ModuleStartDialog.pm (modified) (1 diff)
• Preferences.pm (modified) (1 diff)

trunk/lib/Padre/Wx/Dialog.pm

@@ -26 +26 @@
     $top_left_offset = [0, 0] if not ref($top_left_offset);
 
+    # TODO make sure width has enough elements to the widest row
+    # or maybe we should also check that all the rows has the same number of elements
     my $box  = Wx::BoxSizer->new( Wx::wxVERTICAL );
     # Add Y-offset
@@ -63 +65 @@
                 $widget = $class->new( $dialog, -1, $arg, Wx::wxDefaultPosition, [$width->[$j], -1], @params );
                 $widget->SetValue($default);
+            } elsif ($class eq 'Wx::StaticText') {
+                $widget = $class->new( $dialog, -1, $arg, Wx::wxDefaultPosition, [$width->[$j], -1], @params );
+            } elsif ($class eq 'Wx::ComboBox') {
+                $widget = $class->new( $dialog, -1, $arg, Wx::wxDefaultPosition, [$width->[$j], -1], @params );
+            } elsif ($class eq 'Wx::Choice') {
+                $widget = $class->new( $dialog, -1, Wx::wxDefaultPosition, [$width->[$j], -1], $arg, @params );
             } else {
-                $widget = $class->new( $dialog, -1, $arg, Wx::wxDefaultPosition, [$width->[$j], -1], @params );
+                warn "Unsupported widget $class\n";
+                return;
             }
 
@@ -93 +102 @@
                 if ($class eq 'Wx::DirPickerCtrl') {
                     $data{$name} = $dialog->{$name}->GetPath;
+                } elsif ($class eq 'Wx::Choice') {
+                    $data{$name} = $dialog->{$name}->GetSelection;
                 } else {
                     $data{$name} = $dialog->{$name}->GetValue;

trunk/lib/Padre/Wx/ModuleStartDialog.pm

@@ -78 +78 @@
             [ 'Wx::Button',     '_ok_',           Wx::wxID_OK     ],
             [ 'Wx::Button',     '_cancel_',       Wx::wxID_CANCEL ],
-        ]
+        ],
     );
     return \@layout;

trunk/lib/Padre/Wx/Preferences.pm

@@ -5 +5 @@
 use warnings;
 
-use Padre::Wx  ();
+use Padre::Wx         ();
+use Padre::Wx::Dialog ();
 
 our $VERSION = '0.12';
+
+sub get_layout {
+    my ($config, $values) = @_;
+
+    return [
+        [
+            [ 'Wx::StaticText', undef,              'TAB display size (in spaces)'],
+            [ 'Wx::TextCtrl',   'editor_tabwidth',  $config->{editor_tabwidth}],
+        ],
+        [
+            [ 'Wx::StaticText', undef,              'Max number of modules'],
+            [ 'Wx::TextCtrl',   'pod_maxlist',      $config->{pod_maxlist}],
+        ],
+        [
+            [ 'Wx::StaticText', undef,              'Min number of modules'],
+            [ 'Wx::TextCtrl',   'pod_minlist',       $config->{pod_minlist}],
+        ],
+        [
+            [ 'Wx::StaticText', undef,              'Open files:'],
+            [ 'Wx::Choice',     'choice',    $values],
+        ],
+        [
+            [ 'Wx::Button',     '_ok_',           Wx::wxID_OK     ],
+            [ 'Wx::Button',     '_cancel_',       Wx::wxID_CANCEL ],
+        ],
+    ];
+}
 
 sub run {
     my ( $class, $win, $config ) = @_;
 
-    my $dialog = Wx::Dialog->new( $win, -1, "Preferences", [-1, -1], [550, 200], Wx::wxDEFAULT_FRAME_STYLE);
-
-    my $y = 10;
-    my $HEIGHT = 30;
-
-    Wx::StaticText->new( $dialog, -1, 'TAB display size (in spaces)', [10, $y], [-1, -1]);
-    my $tabwidth = Wx::TextCtrl->new(
-        $dialog,
-        -1,
-        $config->{editor_tabwidth},
-        [ 300, $y ],
-        [ -1, -1 ],
-    );
-    $tabwidth->SetFocus;
-
-    $y += $HEIGHT;
-    Wx::StaticText->new( $dialog, -1, 'Max number of modules', [10, $y], [-1, -1]);
-    my $max = Wx::TextCtrl->new( $dialog, -1, $config->{pod_maxlist}, [300, $y] , [-1, -1]);
-
-    $y += $HEIGHT;
-    Wx::StaticText->new( $dialog, -1, 'Min number of modules', [10, $y], [-1, -1]);
-    my $min = Wx::TextCtrl->new( $dialog, -1, $config->{pod_minlist}, [300, $y] , [-1, -1]);
-
-    $y += $HEIGHT;
-    Wx::StaticText->new( $dialog, -1, 'Open files:', [10, $y], [-1, -1]);
     my @values = (
         $config->{main_startup},
         grep { $_ ne $config->{main_startup} } qw( new nothing last )
     );
-    my $choice = Wx::Choice->new( $dialog, -1, [300, $y], [-1, -1], \@values );
 
-    $y += $HEIGHT;
-    my $ok     = Wx::Button->new( $dialog, Wx::wxID_OK,     '', [10,  $y] );
-    my $cancel = Wx::Button->new( $dialog, Wx::wxID_CANCEL, '', [120, $y], $ok->GetSize );
-    Wx::Event::EVT_BUTTON( $dialog, $ok,     sub { $dialog->EndModal(Wx::wxID_OK) } );
-    Wx::Event::EVT_BUTTON( $dialog, $cancel, sub { $dialog->EndModal(Wx::wxID_CANCEL) } );
-    $ok->SetDefault;
+    my $dialog = Wx::Dialog->new( $win, -1, "Preferences", [-1, -1], [550, 200], Wx::wxDEFAULT_FRAME_STYLE);
+
+    my $layout = get_layout($config, \@values);
+    Padre::Wx::Dialog::build_layout($dialog, $layout, [250, 200]);
+    $dialog->{editor_tabwidth}->SetFocus;
+    Wx::Event::EVT_BUTTON( $dialog, $dialog->{_ok_},     sub { $dialog->EndModal(Wx::wxID_OK) } );
+    Wx::Event::EVT_BUTTON( $dialog, $dialog->{_cancel_}, sub { $dialog->EndModal(Wx::wxID_CANCEL) } );
+
+    $dialog->{_ok_}->SetDefault;
     if ($dialog->ShowModal == Wx::wxID_CANCEL) {
         return;
     }
-    $config->{pod_maxlist}     = $max->GetValue;
-    $config->{pod_minlist}     = $min->GetValue;
-    $config->{editor_tabwidth} = $tabwidth->GetValue;
-    $config->{main_startup}    = $values[ $choice->GetSelection ];
+
+    my $data = Padre::Wx::Dialog::get_data_from( $dialog, get_layout() );
+
+    $config->{pod_maxlist}     = $data->{pod_maxlist};
+    $config->{pod_minlist}     = $data->{pod_minlist};
+    $config->{editor_tabwidth} = $data->{editor_tabwidth};
+    $config->{main_startup}    = $values[ $data->{choice} ];
 
     return;