Changeset 5576

Timestamp:

06/25/09 07:05:11 (3 years ago)

Author:

submersible_toaster

Message:

slow progress. add Open menu and shortcut to DocBrowser?. adjust ->help and ->display behaviour - hopefully for the better.

Location:

trunk/Padre/lib/Padre

Files:

• DocBrowser/document.pm (modified) (1 diff)
• Wx/DocBrowser.pm (modified) (9 diffs)

trunk/Padre/lib/Padre/DocBrowser/document.pm

@@ -107 +107 @@
     );
 
-    exists $EXT_MIME{$suffix}
+    my $type = 
+        exists $EXT_MIME{$suffix}
         ? $EXT_MIME{$suffix}
         : '';
+    return $type;
 }
 

trunk/Padre/lib/Padre/Wx/DocBrowser.pm

@@ -18 +18 @@
 use Padre::DocBrowser       ();
 use Padre::Util qw( _T );
+use Wx::Perl::Dialog::Simple ();
 
 our $VERSION = '0.37';
@@ -144 +145 @@
     #my @menu_id;
     $exitMenu->Append(Wx::wxID_CLOSE, Wx::gettext("&Close\tCtrl+W") );
+    $exitMenu->Append(Wx::wxID_OPEN , Wx::gettext("&Open\tCtrl+O") );
     my $exitID = Wx::NewId;
     
@@ -158 +160 @@
     Wx::Event::EVT_MENU( $self, $exitID, sub { $_[0]->_close(); } );
     Wx::Event::EVT_MENU( $self, Wx::wxID_CLOSE, sub { $_[0]->_close_tab(); } );
-    
+    Wx::Event::EVT_MENU( $self, Wx::wxID_OPEN , sub { $_[0]->_open_doc(); } );
     
     $self->SetAutoLayout(1);
@@ -195 +197 @@
         _HASH($hint) ? %$hint : (),
     );
-    if ( _INVOCANT($query) and $query->can('mimetype') ) {
-        my $task = Padre::Task::DocBrowser->new(
-            document         => $query,
-            type             => 'docs',
-            args             => \%hints,
-            main_thread_only => sub {
-                $self->display( $_[0], $query );
-            },
-        );
-        $task->schedule;
-        return 1;
+    
+    if ( _INVOCANT($query) and $query->isa('Padre::DocBrowser::document') ) {
+
+
+        return $self->display( $query ) if 
+            $self->viewer_for( $query->guess_mimetype );
+
+        my $render = $self->provider->viewer_for( $query->mimetype );
+        my $generate=$self->provider->provider_for( $query->mimetype );
+        
+        if ( $generate ) {
+            my $task = Padre::Task::DocBrowser->new(
+                document         => $query,
+                type             => 'docs',
+                args             => \%hints,
+                main_thread_only => sub {
+                    $self->display( $_[0], $query );
+                },
+            );
+            $task->schedule;
+            return 1;
+        }
+        if ( $render ) {
+            my $talk = Padre::Task::DocBrowser->new(
+                document          => $query,
+                type              => 'browse',
+                args              => \%hints,
+                main_thread_only  => sub {
+                    $self->display( $_[0] , $query );
+                }
+            );
+            
+        }
+        $self->not_found( $query , \%hints );
+        return;
     } elsif ( defined $query ) {
-        my $task = Padre::Task::DocBrowser->new(
+        my $task = Padre::Task::DocBrowser->new(
             document         => $query,
             type             => 'resolve',
             args             => \%hints,
             main_thread_only => sub {
-                $self->help( $_[0], referrer => $query );
+                $self->help( $_[0], {referrer => $query} );
             }
         );
@@ -251 +277 @@
     my ( $self, $docs, $query ) = @_;
     if ( _INSTANCE( $docs, 'Padre::DocBrowser::document' ) ) {
+        
+        # if doc is html just display it 
+        # TODO, a means to register other wx display windows such as ?!
+        return $self->ShowPage( $docs , $query )
+            if ( $self->viewer_for( $docs->mimetype ) );
+        
         my $task = Padre::Task::DocBrowser->new(
             document         => $docs,
             type             => 'browse',
             main_thread_only => sub {
-                $self->ShowPage( $_[0], $query );
+                $self->display( $_[0], $query );
             }
         );
         $task->schedule;
-    }
-
+        return 1;
+    }
+    else {
+        $self->not_found( $docs, $query );
+        
+    }
 }
 
 sub ShowPage {
     my ( $self, $docs, $query ) = @_;
-
     unless ( _INSTANCE( $docs, 'Padre::DocBrowser::document' ) ) {
         return $self->not_found($query);
@@ -341 +376 @@
     # Erk - shouldn't this be ->get_text or something.
     $doc->body( Encode::encode( 'utf8', $padredoc->{original_content} ) );
+    
+    $doc->mimetype( $doc->guess_mimetype ) unless $doc->mimetype;
+    
     return $doc;
 }
@@ -346 +384 @@
 sub not_found {
     # trying a dialog rather than the open tab.
-    my ( $self, $query ) = @_;
-    
+    my ( $self, $query, $hints ) = @_;
+    $query ||= $hints->{referrer}; 
     use Wx qw(wxOK wxCENTRE wxICON_INFORMATION);
     my $notFound = Wx::MessageDialog->new( $self, 
@@ -356 +394 @@
     $notFound->ShowModal;
     $notFound->Destroy;
-
-        
-        
-#    my $html = qq|
-#<html><body>
-#<h1>Not Found</h1>
-#<p>Could not find documentation for
-#<pre>$query</pre>
-#</p>
-#</body>
-#</html>
-#|;
-#    my $frame = Padre::Wx::HtmlWindow->new($self);
-#    $self->notebook->AddPage( $frame, 'Not Found', 1 );
-#    $frame->SetPage($html);
 
 }
@@ -412 +435 @@
     
 }   
-    
+
+
+sub _open_doc {
+    my $self = shift;
+    my $filename = Wx::Perl::Dialog::Simple::file_selector();
+    if ( defined $filename ) {
+        my $doc = Padre::DocBrowser::document->load( $filename );
+        $self->help( $doc, $filename );
+    }
+}
+
+sub viewer_for {
+    my ($self,$mimetype) = @_;
+    return unless defined $mimetype;
+    if ( exists $VIEW{$mimetype} ) {
+        return $VIEW{$mimetype};
+    }
+}
 
 1;