Changeset 11996

Timestamp:

07/25/10 05:29:39 (19 months ago)

Author:

adamk

Message:

Added Padre::Wx::Nth to group first/nth-time startup magic

Location:

trunk/Padre

Files:

• Changes (modified) (1 diff)
• lib/Padre/Wx.pm (modified) (2 diffs)
• lib/Padre/Wx/Main.pm (modified) (5 diffs)
• lib/Padre/Wx/Nth.pm (added)
• lib/Padre/Wx/Role/Dialog.pm (modified) (1 diff)

trunk/Padre/Changes

@@ -68 +68 @@
       (AZAWAWI)
     - Padre has wxWidgets method documentation in F2 help search (AZAWAWI)
+    - Added Padre::Wx::Nth to group first/nth-time startup magic (ADAMK)
 
 0.66 2010.07.01

trunk/Padre/lib/Padre/Wx.pm

@@ -49 +49 @@
 
 
+
+
 #####################################################################
 # Defines for object IDs
@@ -59 +61 @@
     ID_TIMER_ACTIONQUEUE => 30005,
     ID_TIMER_LASTRESORT  => 30006,
+    ID_TIMER_NTH         => 30007,
 };
+
+
 
 

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

@@ -278 +278 @@
     # TO DO: there might be better ways to fix that issue...
     #$statusbar->Show;
-    my $timer = Wx::Timer->new( $self, Padre::Wx::ID_TIMER_POSTINIT, );
+    my $timer = Wx::Timer->new( $self, Padre::Wx::ID_TIMER_POSTINIT );
     Wx::Event::EVT_TIMER(
         $self,
@@ -337 +337 @@
                 refresh_recent
                 refresh_windowlist
-                }
+            }
         );
 
@@ -368 +368 @@
 
     # Start the change detection timer
-    my $timer = Wx::Timer->new( $self, Padre::Wx::ID_TIMER_FILECHECK );
+    my $timer1 = Wx::Timer->new( $self, Padre::Wx::ID_TIMER_FILECHECK );
     Wx::Event::EVT_TIMER(
         $self,
@@ -376 +376 @@
         },
     );
-    $timer->Start( $config->update_file_from_disk_interval * SECONDS, 0 );
+    $timer1->Start( $config->update_file_from_disk_interval * SECONDS, 0 );
 
     # Start the second-generation task manager
     $self->ide->task_manager->start;
 
-    return;
+    # Give a chance for post-start code to run, then do the nth-start logic
+    my $timer2 = Wx::Timer->new( $self, Padre::Wx::ID_TIMER_NTH );
+    Wx::Event::EVT_TIMER(
+        $self,
+        Padre::Wx::ID_TIMER_NTH,
+        sub {
+            $_[0]->timer_nth;
+        },
+    );
+    $timer2->Start( 1, 1 );
+
+    return;
+}
+
+sub timer_nth {
+    my $self = shift;
+
+    # Hand off to the nth start system
+    require Padre::Wx::Nth;
+    Padre::Wx::Nth->nth( $self, $self->config->startup_count );
+
+    return 1;
 }
 
@@ -5773 +5794 @@
     require Template::Tiny;
     my $output = '';
-    Template::Tiny->new->process(
-        $template,
-        $data,
-        \$output,
-    );
+    Template::Tiny->new->process( $template, $data, \$output );
 
     # Create the file from the content

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

@@ -147 +147 @@
     );
     $dialog->CenterOnParent;
-    my $result = ($dialog->ShowModal == Wx::wxYES) ? 1 : 0;
+    my $result = ($dialog->ShowModal == Wx::wxID_YES) ? 1 : 0;
     $dialog->Destroy;
     return $result;