Changeset 3387 for extensions

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.

Location:

extensions/pLoader/trunk

Files:

• locale/fr_FR/pLoader.mo (modified) (previous)
• locale/fr_FR/pLoader.po (modified) (2 diffs)
• src/Uploader/GUI/wxFrameAUI.pm (modified) (9 diffs)
• src/Uploader/ImageList.pm (modified) (5 diffs)

extensions/pLoader/trunk/locale/fr_FR/pLoader.po

@@ -144 +144 @@
 
 msgid "Photo selection"
-msgstr "Photo sélectionnées"
+msgstr "Photos sélectionnées"
 
 msgid "Language choice"
@@ -334 +334 @@
 msgid "Cancel image processing"
 msgstr "Annuler le traitement d'image"
+
+msgid "Add new album"
+msgstr "Ajouter un nouvel album"
+
+msgid "Refresh"
+msgstr "Actualiser"
+
+msgid "Expand all"
+msgstr "Afficher tout"
+
+msgid "Collapse all"
+msgstr "Réduire tout"
+
+msgid "Getting started"
+msgstr "Démarrer"
+
+msgid "Properties"
+msgstr "Propriétés"
+
+msgid "Remove uploaded photo from selection :"
+msgstr "Vider la sélection photo après transfert :"

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

@@ -618 +618 @@
                 value   => sub { $self->imagelist->upload_high(@_) },
             },
-#            {
-#                label     => gettext("Remove uploaded photo from selection :"),
-#                type      => 'Bool',
-#                value  => sub { $self->imagelist->remove_uploaded_from_selection(@_) },
-#            },
+            {
+                label     => gettext("Remove uploaded photo from selection :"),
+                type      => 'Bool',
+                value   => sub { $self->imagelist->remove_uploaded_from_selection(@_) },
+            },
         ]    
     );
@@ -1218 +1218 @@
     my ( $self, $tree, $tree_items ) = @_;
     my $root = shift @{$tree_items};
+
     $self->tree_root(
         $tree->AddRoot( 
@@ -1228 +1229 @@
 
   $self->populate_tree_helper( $tree, $self->tree_root, $tree_items );
-
+  
+  $tree->SelectItem( $self->tree_root );
   $tree->Expand( $self->tree_root );
 }
@@ -1464 +1466 @@
             $self->toolbar->EnableTool(104, 1);                 
         }
+
         if($self->manager->GetPane("getting_started")->IsShown){
             $self->toolbar->EnableTool(100, 0);                 
@@ -1556 +1559 @@
     my $parent_item = $self->tree->GetSelection;
     $self->tree->ExpandAllChildren($parent_item);
+    $self->tree->EnsureVisible($parent_item);
 }
 
@@ -1563 +1567 @@
     my $parent_item = $self->tree->GetSelection;
     $self->tree->CollapseAllChildren($parent_item);
+    $self->tree->Expand($parent_item) if -1 == $self->tree->GetPlData($parent_item);
 }
 
@@ -1587 +1592 @@
 
         if($success){
-            $self->_append_category($parent_item, $name, $content->{id});
+            $self->_append_category($parent_item, $name, $content->{result}{id});
         }
     }
@@ -1620 +1625 @@
             1, 
             -1, 
-            itemData($id)
+            Wx::TreeItemData->new( { id => $id } )
         )
     );
@@ -1728 +1733 @@
     my ( $self ) = @_;  
 
-    my $imagelist= $self->imagelist ;
-
+    $self->imageviewer->Refresh;
     Wx::Yield();
 }

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;