Changeset 12037

Timestamp:

07/26/10 21:04:33 (19 months ago)

Author:

adamk

Message:

OK, that was stupid. Move the queue into the wx app root object instead

Location:

trunk/Padre/lib

Files:

• Padre.pm (modified) (2 diffs)
• Padre/Queue.pm (modified) (6 diffs)
• Padre/Wx/App.pm (modified) (3 diffs)

trunk/Padre/lib/Padre.pm

@@ -158 +158 @@
     );
 
-    # Create the action queue
-    $self->{actionqueue} = Padre::Queue->new;
-
     # Startup completed, let go of the database
     Padre::DB->commit;
@@ -236 +233 @@
 
             # Add the action to the queue
-            $self->{actionqueue}->add($action);
+            $self->wx->queue->add($action);
         }
     }

trunk/Padre/lib/Padre/Queue.pm

@@ -15 +15 @@
 use strict;
 use warnings;
-use Padre::Wx      ();
-use Padre::Current ();
+use Padre::Wx ();
 
 our $VERSION = '0.66';
@@ -22 +21 @@
 sub new {
     my $class = shift;
-    my $main  = Padre::Current->main;
+    my $wx    = shift;
+    my $main  = $wx->main;
 
     # Create the empty queue
     my $self = bless {
-        actions => Padre::Current->ide->actions,
-        Queue   => [],
+        wx      => $wx,
+        actions => $wx->ide->actions,
+        queue   => [],
     }, $class;
 
@@ -49 +50 @@
 sub add {
     my $self = shift;
-    push @{ $self->{Queue} }, @_;
+    push @{ $self->{queue} }, @_;
     return 1;
 }
@@ -61 +62 @@
 
     my $new_interval;
-    if ( $#{ $self->{Queue} } == -1 ) {
+    if ( $#{ $self->{queue} } == -1 ) {
 
         # No pending queue actions
@@ -86 +87 @@
     my $force = shift;
 
-    if ( $#{ $self->{Queue} } > -1 ) {
+    if ( $#{ $self->{queue} } > -1 ) {
 
         # Advoid another timer event during processing of this event
         $self->{timer}->Stop;
 
-        my $queue  = $self->{Queue};
+        my $queue  = $self->{queue};
         my $action = shift @$queue;
         if ( $self->{debug} ) {
@@ -99 +100 @@
 
         # Run the event handler
-        my $main = Padre::Current->main;
+        my $main = $self->{wx}->main;
         &{ $self->{actions}->{$action}->{queue_event} }( $main, $event, $force );
 

trunk/Padre/lib/Padre/Wx/App.pm

@@ -51 +51 @@
 
     # TRACE($_[0]) if DEBUG;
-    $SINGLETON
-        or $SINGLETON = shift->SUPER::new;
+    $SINGLETON or
+    $SINGLETON = shift->SUPER::new;
 }
 
@@ -73 +73 @@
     require Padre::Wx::Main;
     $self->{main} = Padre::Wx::Main->new( $self->{ide} );
+
+    # Create the action queue
+    require Padre::Queue;
+    $self->{queue} = Padre::Queue->new( $self );
 
     return $self;
@@ -113 +117 @@
 
     # TRACE($_[0]) if DEBUG;
-    $_[0]->ide->config;
+    $_[0]->{ide}->config;
+}
+
+=pod
+
+=head2 C<queue>
+
+The C<queue> accessor returns the L<Padre::Queue> for the application.
+
+=cut
+
+sub queue {
+    $_[0]->{queue};
 }