Changeset 11119

Timestamp:

03/15/10 04:49:39 (2 years ago)

Author:

azawawi

Message:

Fixed the Padre survey dialog to be a bit more elegant

File:

• trunk/Padre/lib/Padre/Wx/Dialog/WhereFrom.pm (modified) (9 diffs)

trunk/Padre/lib/Padre/Wx/Dialog/WhereFrom.pm

@@ -31 +31 @@
 
     # Minimum dialog size
-    $dialog->SetMinSize( [ 200, 300 ] );
+    $dialog->SetMinSize( [ 350, 100 ] );
 
     # Create sizer that will host all controls
@@ -47 +47 @@
     $dialog->CentreOnParent;
 
-    $dialog->{combo}->SetFocus;
+    $dialog->{wherefrom}->SetFocus;
     $dialog->Show(1);
 
@@ -54 +54 @@
 
 sub _create_controls {
-    my $dialog = shift;
+    my ($dialog, $sizer) = @_;
 
     # "Where did you hear..." label
-    my $label = Wx::StaticText->new( $dialog, -1, Wx::gettext('Where did you hear about Padre?') );
+    my $wherefrom_label = Wx::StaticText->new( 
+        $dialog, 
+        -1, 
+        Wx::gettext('Where did you hear about Padre?')
+    );
 
-    my $options = [   
+    my $choices = [
         'Google',
         Wx::gettext('Other searchengine'),
@@ -70 +74 @@
     ];
     
-    $dialog->{combo} = Wx::ComboBox->new( $dialog, -1, '' );
+    $dialog->{wherefrom} = Wx::ComboBox->new( 
+        $dialog, 
+        -1, 
+        '', 
+        Wx::wxDefaultPosition,
+        Wx::wxDefaultSize,
+        $choices
+    );
     
     # OK button
@@ -84 +95 @@
     );
     
+    # where from...? sizer
+    my $wherefrom_sizer = Wx::BoxSizer->new(Wx::wxHORIZONTAL);
+    $wherefrom_sizer->Add( $wherefrom_label,, 0, Wx::wxALIGN_CENTER_VERTICAL, 5 );
+    $wherefrom_sizer->AddSpacer(5);
+    $wherefrom_sizer->Add( $dialog->{wherefrom}, 1, Wx::wxALIGN_CENTER_VERTICAL, 5 );
+
+    # Button sizer
+    my $button_sizer = Wx::BoxSizer->new(Wx::wxHORIZONTAL);
+    $button_sizer->Add( $dialog->{button_ok},   0, 0,          0 );
+    $button_sizer->Add( $dialog->{button_cancel}, 0, Wx::wxLEFT, 5 );
+    $button_sizer->AddSpacer(5);
+
+    # Main vertical sizer
+    my $vsizer = Wx::BoxSizer->new(Wx::wxVERTICAL);
+    $vsizer->Add( $wherefrom_sizer, 0, Wx::wxALL | Wx::wxEXPAND, 3 );
+    $vsizer->AddSpacer(5);
+    $vsizer->Add( $button_sizer, 0, Wx::wxALIGN_RIGHT, 5 );
+    $vsizer->AddSpacer(5);
+
+    # Wrap with a horizontal sizer to get left/right padding
+    $sizer->Add( $vsizer, 1, Wx::wxALL | Wx::wxEXPAND, 5 );
     
+    return;
 }
 
@@ -90 +123 @@
 sub _bind_events {
     my $dialog = shift;
-    Wx::Event::EVT_BUTTON( $dialog, $dialog->{button_ok},     \&WhereFrom_ok_clicked );
-    Wx::Event::EVT_BUTTON( $dialog, $dialog->{button_cancel}, \&WhereFrom_cancel_clicked );
+    
+    # Ok button
+    Wx::Event::EVT_BUTTON( 
+        $dialog, 
+        $dialog->{button_ok},     
+        \&WhereFrom_ok_clicked 
+    );
+    
+    # Cancel or Skip feedback button
+    Wx::Event::EVT_BUTTON( 
+        $dialog, 
+        $dialog->{button_cancel}, 
+        \&WhereFrom_cancel_clicked
+    );
+
+    return;
 }
 
@@ -105 +152 @@
 
     $dialog->Destroy;
+
+    return;
 }
 
@@ -113 +162 @@
 
     my $window = $dialog->GetParent;
-    my $data   = $dialog->get_data;
     $dialog->Destroy;
 
@@ -119 +167 @@
 
         my $url  = 'http://padre.perlide.org/wherefrom.cgi';
-        my $args = { from => $data->{_referer_} };
+        my $args = { from => $dialog->{wherefrom}->GetValue };
         my $http = Padre::Task::HTTPClient->new(
             URL   => $url,