Changeset 12001

Timestamp:

07/25/10 18:19:15 (19 months ago)

Author:

adamk

Message:

Moved the installation survey into the ::Nth subsystem.
Nth logic now triggers one second after startup.

Location:

trunk/Padre

Files:

• Changes (modified) (1 diff)
• lib/Padre/Wx/Main.pm (modified) (3 diffs)
• lib/Padre/Wx/Nth.pm (modified) (2 diffs)

trunk/Padre/Changes

@@ -65 +65 @@
     - Documentation of Padre::Current (SEWI)
     - Include only changed files in changed-file-list (SEWI)
-    - Added wxwidgets.pod which contains the method documentation of all Wx classes
-      (AZAWAWI)
+    - Added wxwidgets.pod which contains the method documentation of all Wx
+      classes (AZAWAWI)
     - Padre has wxWidgets method documentation in F2 help search (AZAWAWI)
     - Added Padre::Wx::Nth to group first/nth-time startup magic (ADAMK)
-    - Fixed #781 : Unicode should not be used for accessing file system on Win32 (CHORNY)
+    - Fixed #781 : Unicode should not be used for accessing file system on
+      Win32 (CHORNY)
+    - The New Installation Survey now only appears on the third time that
+      Padre starts, so it doesn't confuse people with locale issues (ADAMK)
 
 0.66 2010.07.01

trunk/Padre/lib/Padre/Wx/Main.pm

@@ -362 +362 @@
     $manager->alert_new;
 
-    unless ( $Padre::Test::VERSION or $config->feedback_done ) {
-        require Padre::Wx::Dialog::WhereFrom;
-        Padre::Wx::Dialog::WhereFrom->new($self);
-    }
-
     # Start the change detection timer
     my $timer1 = Wx::Timer->new( $self, Padre::Wx::ID_TIMER_FILECHECK );
@@ -390 +385 @@
         },
     );
-    $timer2->Start( 1, 1 );
+    $timer2->Start( 1 * SECONDS, 1 );
 
     return;
@@ -399 +394 @@
 
     # Hand off to the nth start system
-    require Padre::Wx::Nth;
-    Padre::Wx::Nth->nth( $self, $self->config->startup_count );
+    unless ( $Padre::Test::VERSION ) {
+        require Padre::Wx::Nth;
+        Padre::Wx::Nth->nth( $self, $self->config->startup_count );
+    }
 
     return 1;

trunk/Padre/lib/Padre/Wx/Nth.pm

@@ -11 +11 @@
 # Even if more than one rule matches, only ever bother the user once.
 sub nth {
-    my $class = shift;
-    my $main  = shift;
-    my $nth   = shift;
+    my $class  = shift;
+    my $main   = shift;
+    my $nth    = shift;
+    my $config = $main->config;
 
     # Is it Padre's birthday
@@ -27 +28 @@
     }
 
+    if ( $nth > 2 and not $config->feedback_done ) {
+        require Padre::Wx::Dialog::WhereFrom;
+        Padre::Wx::Dialog::WhereFrom->new($main);
+        return 1;
+    }
+
     # Nothing to say
     return 1;