Changeset 73

Timestamp:

08/19/08 09:06:09 (3 years ago)

Author:

szabgab

Message:

some code refactorin in the Padre::Demo code

Location:

trunk

Files:

• MANIFEST (modified) (1 diff)
• eg/wx_demo/01_prompt.pl (modified) (1 diff)
• eg/wx_demo/03_filename.pl (added)
• lib/Padre/Demo.pm (modified) (2 diffs)
• lib/Padre/Demo/Frame.pm (modified) (3 diffs)

trunk/MANIFEST

@@ -41 +41 @@
 
 eg/wx_demo/01_prompt.pl
+eg/wx_demo/03_filename.pl
 
 share/docview/print.xpm

trunk/eg/wx_demo/01_prompt.pl

@@ -10 +10 @@
 
 sub main {
+   open_frame();
    my $name = prompt("What is your name?\n");
    print_out("How are you $name today?\n");
-
-   my $filename = promp_input_file("Select source file");
-   print_out("The file you selected is $filename\n");
 
    return;

trunk/lib/Padre/Demo.pm

@@ -8 +8 @@
 use Padre::Demo::App;
 
-our @EXPORT = qw(prompt print_out promp_input_file close_app);
+our @EXPORT = qw(prompt print_out promp_input_file close_app open_frame);
 
+use Wx                 qw(:everything);
+use Wx::STC            ();
+use Wx::Event          qw(:everything);
+
+=head1 NAME
+
+Padre::Demo - temporary name of a Zenity clone in wxPerl
+
+=head1 SYNOPIS
+
+ use Padre::Demo;
+
+ Padre::Demo->run(\&main);
+
+ sub main {
+    my $name = prompt("What is your name?\n");
+    print_out("How are you $name today?\n");
+
+    return;
+ }
+
+Command line:
+
+ Not yet available.
+
+=head1 General Options
+
+There are some common option for every dialog
+
+title
+
+window-icon  Not implemented
+
+width
+
+height
+
+=cut
+
+=head1 METHODS
+
+Dialogs
+
+=head2 prompt
+
+Display a text entry dialog
+
+=cut
 sub prompt {
-   my $frame = $Padre::Demo::App::frame;
-   $frame->prompt(@_);
+    my ($text) = @_;
+    my $frame = $Padre::Demo::App::frame;
+
+    my $dialog = Wx::TextEntryDialog->new( $frame, $text, "", '' );
+    if ($dialog->ShowModal == wxID_CANCEL) {
+        return;
+    }   
+    my $resp = $dialog->GetValue;
+    $dialog->Destroy;
+    return $resp;
 }
 
+
+
+=head2 print_out
+
+=cut
 sub print_out {
    my $frame = $Padre::Demo::App::frame;
@@ -20 +81 @@
 }
 
+=head2 promp_input_file
+
+=cut
 sub promp_input_file {
-   my $frame = $Padre::Demo::App::frame;
-   $frame->promp_input_file(@_);
+    my ($text) = @_;
+    my $frame = $Padre::Demo::App::frame;
+
+    my $dialog = Wx::FileDialog->new( $frame, $text, '', "", "*.*", wxFD_OPEN);
+    if ($^O !~ /win32/i) {
+       $dialog->SetWildcard("*");
+    }
+    if ($dialog->ShowModal == wxID_CANCEL) {
+        return;
+    }
+    my $filename = $dialog->GetFilename;
+    my $default_dir = $dialog->GetDirectory;
+
+    return File::Spec->catfile($default_dir, $filename);
 }
 
+
+
+=head2 open_frame
+
+=cut
+sub open_frame {
+   
+}
+
+
+=head2 close_app
+
+=cut
 sub close_app {
    my $frame = $Padre::Demo::App::frame;
    $frame->Close;
 }
+
+
+
+
 
 sub get_frame {

trunk/lib/Padre/Demo/Frame.pm

@@ -14 +14 @@
 my $output;
 
-sub prompt {
-    my ($self, $text) = @_;
-
-    my $dialog = Wx::TextEntryDialog->new( $self, $text, "", '' );
-    if ($dialog->ShowModal == wxID_CANCEL) {
-        return;
-    }   
-    my $resp = $dialog->GetValue;
-    $dialog->Destroy;
-    return $resp;
-}
-
 sub print_out {
     my ($self, $text) = @_;
     $output->AddText($text);
     return;
-}
-
-sub promp_input_file {
-    my ($self, $text) = @_;
-
-    my $dialog = Wx::FileDialog->new( $self, $text, '', "", "*.*", wxFD_OPEN);
-    if ($^O !~ /win32/i) {
-       $dialog->SetWildcard("*");
-    }
-    if ($dialog->ShowModal == wxID_CANCEL) {
-        return;
-    }
-    my $filename = $dialog->GetFilename;
-    my $default_dir = $dialog->GetDirectory;
-
-    return File::Spec->catfile($default_dir, $filename);
 }
 
@@ -60 +32 @@
     );
 
-    my $editor = Wx::StyledTextCtrl->new($self, -1, [-1, -1], [750, 700]);
-    $editor->SetMarginWidth(1, 0);
+    $output = Wx::StyledTextCtrl->new($self, -1, [-1, -1], [750, 700]);
+    $output->SetMarginWidth(1, 0);
 
-    EVT_ACTIVATE($self, sub {on_activate($editor, @_) });
-
-#    my $button = Wx::Button->new( $self, -1, "Run" );
-#    Wx::Event::EVT_BUTTON( $self, $button, sub {
-#         my ( $self, $event ) = @_;
-#         print "preparing to popup window...\n";
-#         Wx::MessageBox( "This is the smell of an Onion", "Title", wxOK|wxCENTRE, $self );
-#    });
-#    $self->SetSize($button->GetSizeWH);
+    EVT_ACTIVATE($self, \&on_activate);
 
     Wx::Event::EVT_CLOSE( $self,  sub {
@@ -82 +46 @@
 
 sub on_activate {
-   my ($editor, $frame, $event) = @_;
+   my ($frame, $event) = @_;
 
-   $output = $editor;
    $frame->EVT_ACTIVATE(sub {});
    #$Padre::Demo::app->Yield;