Changeset 3387 for extensions/pLoader/trunk/src/Uploader/ImageList.pm

Timestamp:

Jun 2, 2009, 3:55:51 PM (15 years ago)

Author:

ronosman

Message:

Feature 989 added : Global settings option to remove uploaded photos from selection.

File:

• extensions/pLoader/trunk/src/Uploader/ImageList.pm (modified) (5 diffs)

extensions/pLoader/trunk/src/Uploader/ImageList.pm

@@ -90 +90 @@
                 version
                 imagelist_version
+                uploaded_images
      /
 );
@@ -97 +98 @@
     my ( $self ) = @_;
     
+    $self->uploaded_images([]);
     
 }
@@ -495 +497 @@
     return if (! defined $self->image_selection );
     
+    $self->_remove_image_list($self->image_selection);
+    # clear image selection
+    $self->image_selection([]);
+}
+
+sub _remove_image_list {
+    my ( $self, $list ) = @_;
+
     # higher first, to keep same indexes during remove
-    my @images = reverse @{$self->image_selection};     
+    my @images = reverse @$list;     
     map {
-        #my $image = $self->GetImage($_)->file;
         $self->DeleteImage($_);
         splice @{$self->sums}, $_, 1 ;
@@ -505 +514 @@
     }
     @images;
-    
-    # clear image selection
-    $self->image_selection([]);
+}
+
+sub RemoveImage {
+    my ( $self, $index ) = @_;
+
+    return if (! defined $self->image_selection );
+    return if (! defined $index );
+        
+    $self->DeleteImage($index);
+    splice @{$self->sums}, $index, 1 ;
+    $self->wx_thumb_imglist->Remove($index);
+        
 }
 
@@ -1027 +1045 @@
         croak "Upload cancelled. ", $@ if $@ ;
         
+        print "image_selection ", Dumper $_;
+        push @{$self->uploaded_images}, $_;
     }
     @{$self->image_selection} if defined 
         $self->image_selection;
 
+    if($self->remove_uploaded_from_selection){
+        $self->_remove_image_list($self->uploaded_images);
+        $viewer_callback->();
+    }
     my $time_end = time;
     my $duration = $time_end - $time_begin;