Changeset 3387
- Timestamp:
- Jun 2, 2009, 3:55:51 PM (15 years ago)
- Location:
- extensions/pLoader/trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/pLoader/trunk/locale/fr_FR/pLoader.po
r3288 r3387 144 144 145 145 msgid "Photo selection" 146 msgstr "Photo sélectionnées"146 msgstr "Photos sélectionnées" 147 147 148 148 msgid "Language choice" … … 334 334 msgid "Cancel image processing" 335 335 msgstr "Annuler le traitement d'image" 336 337 msgid "Add new album" 338 msgstr "Ajouter un nouvel album" 339 340 msgid "Refresh" 341 msgstr "Actualiser" 342 343 msgid "Expand all" 344 msgstr "Afficher tout" 345 346 msgid "Collapse all" 347 msgstr "Réduire tout" 348 349 msgid "Getting started" 350 msgstr "Démarrer" 351 352 msgid "Properties" 353 msgstr "Propriétés" 354 355 msgid "Remove uploaded photo from selection :" 356 msgstr "Vider la sélection photo après transfert :" -
extensions/pLoader/trunk/src/Uploader/GUI/wxFrameAUI.pm
r3384 r3387 618 618 value => sub { $self->imagelist->upload_high(@_) }, 619 619 }, 620 #{621 #label => gettext("Remove uploaded photo from selection :"),622 #type => 'Bool',623 #value => sub { $self->imagelist->remove_uploaded_from_selection(@_) },624 #},620 { 621 label => gettext("Remove uploaded photo from selection :"), 622 type => 'Bool', 623 value => sub { $self->imagelist->remove_uploaded_from_selection(@_) }, 624 }, 625 625 ] 626 626 ); … … 1218 1218 my ( $self, $tree, $tree_items ) = @_; 1219 1219 my $root = shift @{$tree_items}; 1220 1220 1221 $self->tree_root( 1221 1222 $tree->AddRoot( … … 1228 1229 1229 1230 $self->populate_tree_helper( $tree, $self->tree_root, $tree_items ); 1230 1231 1232 $tree->SelectItem( $self->tree_root ); 1231 1233 $tree->Expand( $self->tree_root ); 1232 1234 } … … 1464 1466 $self->toolbar->EnableTool(104, 1); 1465 1467 } 1468 1466 1469 if($self->manager->GetPane("getting_started")->IsShown){ 1467 1470 $self->toolbar->EnableTool(100, 0); … … 1556 1559 my $parent_item = $self->tree->GetSelection; 1557 1560 $self->tree->ExpandAllChildren($parent_item); 1561 $self->tree->EnsureVisible($parent_item); 1558 1562 } 1559 1563 … … 1563 1567 my $parent_item = $self->tree->GetSelection; 1564 1568 $self->tree->CollapseAllChildren($parent_item); 1569 $self->tree->Expand($parent_item) if -1 == $self->tree->GetPlData($parent_item); 1565 1570 } 1566 1571 … … 1587 1592 1588 1593 if($success){ 1589 $self->_append_category($parent_item, $name, $content->{ id});1594 $self->_append_category($parent_item, $name, $content->{result}{id}); 1590 1595 } 1591 1596 } … … 1620 1625 1, 1621 1626 -1, 1622 itemData($id)1627 Wx::TreeItemData->new( { id => $id } ) 1623 1628 ) 1624 1629 ); … … 1728 1733 my ( $self ) = @_; 1729 1734 1730 my $imagelist= $self->imagelist ; 1731 1735 $self->imageviewer->Refresh; 1732 1736 Wx::Yield(); 1733 1737 } -
extensions/pLoader/trunk/src/Uploader/ImageList.pm
r3366 r3387 90 90 version 91 91 imagelist_version 92 uploaded_images 92 93 / 93 94 ); … … 97 98 my ( $self ) = @_; 98 99 100 $self->uploaded_images([]); 99 101 100 102 } … … 495 497 return if (! defined $self->image_selection ); 496 498 499 $self->_remove_image_list($self->image_selection); 500 # clear image selection 501 $self->image_selection([]); 502 } 503 504 sub _remove_image_list { 505 my ( $self, $list ) = @_; 506 497 507 # higher first, to keep same indexes during remove 498 my @images = reverse @ {$self->image_selection};508 my @images = reverse @$list; 499 509 map { 500 #my $image = $self->GetImage($_)->file;501 510 $self->DeleteImage($_); 502 511 splice @{$self->sums}, $_, 1 ; … … 505 514 } 506 515 @images; 507 508 # clear image selection 509 $self->image_selection([]); 516 } 517 518 sub RemoveImage { 519 my ( $self, $index ) = @_; 520 521 return if (! defined $self->image_selection ); 522 return if (! defined $index ); 523 524 $self->DeleteImage($index); 525 splice @{$self->sums}, $index, 1 ; 526 $self->wx_thumb_imglist->Remove($index); 527 510 528 } 511 529 … … 1027 1045 croak "Upload cancelled. ", $@ if $@ ; 1028 1046 1047 print "image_selection ", Dumper $_; 1048 push @{$self->uploaded_images}, $_; 1029 1049 } 1030 1050 @{$self->image_selection} if defined 1031 1051 $self->image_selection; 1032 1052 1053 if($self->remove_uploaded_from_selection){ 1054 $self->_remove_image_list($self->uploaded_images); 1055 $viewer_callback->(); 1056 } 1033 1057 my $time_end = time; 1034 1058 my $duration = $time_end - $time_begin;
Note: See TracChangeset
for help on using the changeset viewer.