Changeset 2696 for extras/pLoader/trunk/src/Uploader/GUI/wxFrameAUI.pm

Timestamp:

Oct 9, 2008, 10:58:41 PM (16 years ago)

Author:

ronosman

Message:

Features added:

• Cancel during upload or file processing
• Auto rotate
• Upload high resolution

File:

• extras/pLoader/trunk/src/Uploader/GUI/wxFrameAUI.pm (modified) (12 diffs)

extras/pLoader/trunk/src/Uploader/GUI/wxFrameAUI.pm

@@ -20 +20 @@
 package Uploader::GUI::wxFrameAUI;
 use strict;
+use Carp;
 use Wx;
 use Wx::DND;
@@ -58 +59 @@
              wxMAXIMIZE
              wxOK
-             wxICON_EXCLAMATION 
+             wxICON_EXCLAMATION
+             wxICON_INFORMATION 
          /;
 use base qw/Wx::Frame Class::Accessor::Fast/;
@@ -137 +139 @@
     );
 
+    $self->imagelist->SetNewFilesDisplayEndInfoCallback(
+        sub { $self->SetNewFilesDisplayEndInfo(@_) }
+    );
+
+
     # callback for GUI refresh : remove thumbnail images from imageviewer control
     $self->imagelist->UploadImagesViewerCallback(
@@ -142 +149 @@
     );
 
+
+
     # callback for GUI refresh : progress dialog display current uploaded image 
     $self->imagelist->UploadImagesProgressCallback(
         sub { $self->UploadImagesProgress(@_) }
+    );
+    
+    $self->imagelist->UploadDisplayEndInfoCallback(
+        sub { $self->UploadDisplayEndInfo(@_) }
     );
 
@@ -212 +225 @@
                 parentwnd => $self,
                 accessors => {
+                                  $main::ID_PHOTO =>
+                                      sub {
+                                            Wx::Bitmap->new( 
+                                                $self->imagelist->current_image->wx_thumb_file, 
+                                                $self->GetWxBitmapType($self->imagelist->type), 
+                                            );
+                                      }, 
                                   $main::ID_PHOTO_NAME =>
                                       sub { $self->imagelist->current_image->site_name(@_) }, 
@@ -419 +439 @@
                                       sub { $self->imagelist->resize_w(@_) }, 
                                   $main::ID_GLOBAL_RESIZED_H =>
-                                      sub { $self->imagelist->resize_h(@_) }, 
+                                      sub { $self->imagelist->resize_h(@_) },
+                                  $main::ID_GLOBAL_HIGH =>
+                                      sub { $self->imagelist->upload_high(@_)}, 
                              },
                 frame_callbacks => { 
@@ -621 +643 @@
         Uploader::GUI::wxImageProcessingProgressDlg->new(
             { 
-                title => "Image processing progress information", 
+                title => "Image processing progress information",
+                bt_label => "Cancel image processing", 
              }
         )        
@@ -715 +738 @@
     my( $self, $event ) = @_;
   
-    my $id = $event->GetItem;
-
     my $image = $self->imagelist->images->[$event->GetIndex];
     $image->site_name(
@@ -745 +766 @@
     my( $self, $event ) = @_;
 
-    
-    $self->ProcessImageSelection();    
+#    eval {
+        $self->ProcessImageSelection();    
+#    };
 }
 
@@ -761 +783 @@
 sub UploadImagesProgress {
     my ( $self ) = @_;  
-
+    
     my $imagelist = $self->imagelist ;
 
@@ -786 +808 @@
         $self->upload_progressdlg->LogProgress();
     };
+    if($@){
+        croak "Upload cancelled.\n";
+    }
+    
     Wx::Yield();
 
+}
+
+
+sub SetNewFilesDisplayEndInfo {
+    my ( $self ) = @_;  
+        
+    $self->progressdlg->DisplayEndInfo;
+}
+
+sub UploadDisplayEndInfo {
+    my ( $self ) = @_;  
+    
+    my $imagelist = $self->imagelist ;
+    
+    $self->upload_progressdlg->DisplayEndInfo;
 }
 
@@ -849 +890 @@
             Uploader::GUI::wxImageProcessingProgressDlg->new(
                 { 
-                    title => "Image upload progress information", 
+                    title => "Image upload progress information",
+                    bt_label => "Cancel upload", 
                  }
             )        
         );
+        # modeless dialog
         $self->upload_progressdlg->Show(1);
         Wx::Yield();
-        $self->imagelist->UploadSelection;
+        eval {
+            $self->imagelist->UploadSelection;
+        };
+        if($@){
+            Wx::MessageBox( 
+                sprintf(
+                    "Upload cancelled.",
+                ),
+                "Piwigo upload information",
+                wxOK | wxICON_INFORMATION, 
+            );
+        }
     }
     else {