Changeset 505

Timestamp:

10/26/08 08:50:02 (3 years ago)

Author:

szabgab

Message:

move the abstract dialog creation code to Padre::Wx::Dialog

Location:

trunk

Files:

• MANIFEST (modified) (1 diff)
• lib/Padre/Wx/Dialog.pm (added)
• lib/Padre/Wx/FindDialog.pm (modified) (3 diffs)
• lib/Padre/Wx/ModuleStartDialog.pm (modified) (5 diffs)

trunk/MANIFEST

@@ -24 +24 @@
 lib/Padre/Wx/App.pm
 lib/Padre/Wx/Bookmarks.pm
+lib/Padre/Wx/Dialog.pm
 lib/Padre/Wx/Editor.pm
 lib/Padre/Wx/FindDialog.pm

trunk/lib/Padre/Wx/FindDialog.pm

@@ -8 +8 @@
 
 use Padre::Wx;
+use Padre::Wx::Dialog;
 
 our $VERSION = '0.12';
@@ -33 +34 @@
 
     my $layout = get_layout($search_term, $config);
-    Padre::Wx::ModuleStartDialog::build_layout($dialog, $layout, [150, 200]);
+    Padre::Wx::Dialog::build_layout($dialog, $layout, [150, 200]);
 
     foreach my $cb (@cbs) {
@@ -173 +174 @@
     my ( $dialog ) = @_;
 
-    my $data = Padre::Wx::ModuleStartDialog::get_data_from($dialog, get_layout());
+    my $data = Padre::Wx::Dialog::get_data_from($dialog, get_layout());
 
     #print Data::Dumper::Dumper $data;

trunk/lib/Padre/Wx/ModuleStartDialog.pm

@@ -9 +9 @@
 # Module::Start widget of Padre
 
-use Padre::Wx  ();
+use Padre::Wx         ();
+use Padre::Wx::Dialog ();
 
 our $VERSION = '0.12';
@@ -25 +26 @@
 
     my $layout = get_layout($config);
-    build_layout($dialog, $layout, [100, 200]);
+    Padre::Wx::Dialog::build_layout($dialog, $layout, [100, 200]);
 
     $dialog->{_ok_}->SetDefault;
@@ -81 +82 @@
 
 
-sub build_layout {
-    my ($dialog, $layout, $width) = @_;
-
-    my $box  = Wx::BoxSizer->new( Wx::wxVERTICAL );
-
-    foreach my $i (0..@$layout-1) {
-        my $row = Wx::BoxSizer->new( Wx::wxHORIZONTAL );
-        $box->Add($row);
-        foreach my $j (0..@{$layout->[$i]}-1) {
-            if (not @{ $layout->[$i][$j] } ) {  # [] means Expand
-                $row->Add($width->[$j], 0, 0, Wx::wxEXPAND, 0);
-                next;
-            }
-            my ($class, $name, $arg, @params) = @{ $layout->[$i][$j] };
-
-            my $widget;
-            if ($class eq 'Wx::Button') {
-                my ($first, $second) = $arg =~ /[a-zA-Z]/ ? (-1, $arg) : ($arg, '');
-                $widget = $class->new( $dialog, $first, $second);
-            } elsif ($class eq 'Wx::DirPickerCtrl') {
-                my $title = shift(@params) || '';
-                $widget = $class->new( $dialog, -1, $arg, $title, Wx::wxDefaultPosition, [$width->[$j], -1], @params );
-                # it seems we cannot set the default directory and 
-                # we still have to set this directory in order to get anything back in
-                # GetPath
-                $widget->SetPath(Cwd::cwd());
-            } elsif ($class eq 'Wx::TextCtrl') {
-                my $default = shift @params;
-                $widget = $class->new( $dialog, -1, $arg, Wx::wxDefaultPosition, [$width->[$j], -1], @params );
-                if (defined $default) {
-                    $widget->SetValue($default);
-                }
-            } elsif ($class eq 'Wx::CheckBox') {
-                my $default = shift @params;
-                $widget = $class->new( $dialog, -1, $arg, Wx::wxDefaultPosition, [$width->[$j], -1], @params );
-                $widget->SetValue($default);
-            } else {
-                $widget = $class->new( $dialog, -1, $arg, Wx::wxDefaultPosition, [$width->[$j], -1], @params );
-            }
-
-            $row->Add($widget);
-
-            if ($name) {
-                $dialog->{$name} = $widget;
-            }
-        }
-    }
-
-    $dialog->SetSizer($box);
-
-    return;
-}
-
 sub cancel_clicked {
     my ($dialog, $event) = @_;
@@ -145 +93 @@
     my ($dialog, $event) = @_;
 
-    my $data = get_data_from( $dialog, get_layout() );
+    my $data = Padre::Wx::Dialog::get_data_from( $dialog, get_layout() );
     $dialog->Destroy;
     print Dumper $data;
@@ -181 +129 @@
 }
 
-sub get_data_from {
-    my ( $dialog, $layout ) = @_;
-
-    my %data;
-    foreach my $i (0..@$layout-1) {
-        foreach my $j (0..@{$layout->[$i]}-1) {
-            next if not @{ $layout->[$i][$j] }; # [] means Expand
-            my ($class, $name, $arg, @params) = @{ $layout->[$i][$j] };
-            if ($name) {
-                next if $class eq 'Wx::Button';
-
-                if ($class eq 'Wx::DirPickerCtrl') {
-                    $data{$name} = $dialog->{$name}->GetPath;
-                } else {
-                    $data{$name} = $dialog->{$name}->GetValue;
-                }
-            }
-        }
-    }
-
-    return \%data;
-}
-
 
 1;