Changeset 5536 for extensions

Timestamp:

Apr 1, 2010, 4:18:53 PM (14 years ago)

Author:

ronosman

Message:

Feature 1561 added : upload all photos by default.

File:

• extensions/pLoader/trunk/src/Uploader/GUI/Frame.pm (modified) (3 diffs)

extensions/pLoader/trunk/src/Uploader/GUI/Frame.pm

@@ -1511 +1511 @@
     my( $self, $event ) = @_;
 
+    my $select_all = 1;
     eval {
-        $self->ProcessImageSelection();    
+        $self->ProcessImageSelection( $select_all );    
     };
 }
@@ -1659 +1660 @@
 # prepare and upload image_selection
 sub ProcessImageSelection {
-    my ( $self ) = @_;
+    my ( $self, $select_all ) = @_;
 
     return if !scalar @{$self->imagelist->sums};
@@ -1666 +1667 @@
         return unless $self->destination_category_dlg->ShowModal != wxID_CANCEL;
     }
-#    else {
-        # all selected is implicit
-        if(!scalar @{$self->imageviewer->GetSelectedItems}){
+
+    $self->imagelist->image_selection(
+        $self->imageviewer->GetAllItems
+    ) if $select_all;
+       
+    return if( !defined $self->imagelist->image_selection );
+    return if( !scalar @{$self->imagelist->image_selection} );
         
-            $self->imagelist->image_selection(
-                $self->imageviewer->GetAllItems
-            );
-        }
-       
-        return if( !defined $self->imagelist->image_selection );
-        return if( !scalar @{$self->imagelist->image_selection} );
-        
-        $self->upload_progressdlg->Destroy if defined $self->upload_progressdlg;
-        $self->upload_progressdlg(
-            Uploader::GUI::wxImageProcessingProgressDlg->new(
-                { 
-                    title    => gettext("Image upload progress information"),
-                    bt_label => gettext("Cancel upload"),
-                    bt_close_label => gettext("Close"), 
-                    stop_processing => sub { $self->imagelist->stop_processing(1); Wx::Yield(); }, 
-                 }
-            )        
+    $self->upload_progressdlg->Destroy if defined $self->upload_progressdlg;
+    $self->upload_progressdlg(
+        Uploader::GUI::wxImageProcessingProgressDlg->new(
+            { 
+                title    => gettext("Image upload progress information"),
+                bt_label => gettext("Cancel upload"),
+                bt_close_label => gettext("Close"), 
+                stop_processing => sub { $self->imagelist->stop_processing(1); Wx::Yield(); }, 
+            }
+        )
+    );
+
+    # modeless dialog
+    $self->upload_progressdlg->Show(1);
+    Wx::Yield();
+    eval {
+        $self->imagelist->UploadSelection;
+    };
+    if($@){
+        Wx::MessageBox( 
+            sprintf(
+                gettext("Upload cancelled"),
+            ),
+            gettext("Piwigo upload information"),
+            wxOK | wxICON_INFORMATION, 
         );
-        # modeless dialog
-        $self->upload_progressdlg->Show(1);
-        Wx::Yield();
-        eval {
-            $self->imagelist->UploadSelection;
-        };
-        if($@){
-            Wx::MessageBox( 
-                sprintf(
-                    gettext("Upload cancelled"),
-                ),
-                gettext("Piwigo upload information"),
-                wxOK | wxICON_INFORMATION, 
-            );
-        }
-    #}
+    }
 }