Changeset 4478

Timestamp:

Dec 13, 2009, 6:42:29 PM (14 years ago)

Author:

ronosman

Message:

Bug 1322 fixed : clear photo properties panel after the last photo is deleted from photo selection.

Location:

extensions/pLoader/trunk/src/Uploader

Files:

• GUI/DlgCommon.pm (modified) (2 diffs)
• GUI/wxChoiceFilteredPanel.pm (modified) (1 diff)
• GUI/wxFrameAUI.pm (modified) (2 diffs)
• ImageList.pm (modified) (1 diff)

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

@@ -94 +94 @@
 };      
 
+my $clear_value = {
+    'Wx::TextCtrl' => sub { my ($ctrl) = @_; $ctrl->Clear},
+    'Wx::CheckBox' => sub { my ($ctrl) = @_; $ctrl->SetValue(0)},
+    'Wx::DatePickerCtrl' => sub { my ($ctrl) = @_; $ctrl->SetValue(Wx::DateTime->new->SetToCurrent)},
+};      
+
 sub SetProperties {
     my ( $self ) = @_;
@@ -177 +183 @@
 }
 
+sub ClearProperties {
+    my ( $self ) = @_;
+        
+        map {
+        my $ctrl =$self->FindWindow($_);
+        if(defined $ctrl){
+                # checkbox, static text
+            $clear_value->{ref $ctrl}->(
+                        $ctrl
+                    ) if exists  $clear_value->{ref $ctrl};
+                    # only works for control with items
+                    $ctrl->SetSelection(
+                        -1                      
+                    ) if exists $self->properties->{$_}->{selection};
+                }
+    }
+        keys %{$self->properties};
+
+}
 1;

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

@@ -183 +183 @@
 }
 
+sub ClearAllSelection {
+    my ( $self ) = @_;
+
+    my $row = 0;
+    
+    my $choices = $self->choices->();
+    map {
+        $self->listchoices->Check($row, 0) ;    
+        $row++;
+    }@$choices;
+
+        
+}
 
 sub SetSelection {

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

@@ -1527 +1527 @@
     $self->imageviewer->Refresh;        
 
-    $self->image_preview->image(
-        0
-    ) if !$self->imageviewer->GetItemCount;
+        if (!$self->imageviewer->GetItemCount){
+        $self->image_preview->image(
+            0
+        ); 
+            # have to reset
+                $self->dlg_piwigo_photo_properties->ClearProperties;
+        $self->piwigo_photo_properties_tags->ClearAllSelection;
+                $self->imagelist->SetCurrentImage(-1);
+        }
 
     $self->image_preview->Refresh;
@@ -1758 +1764 @@
 sub OnImageViewerItemSelected {
     my( $self, $event ) = @_;
-  
     my $bc = Wx::BusyCursor->new;
 

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

@@ -230 +230 @@
 
     $self->current_image(
-        $self->GetImage($indx)
+        $indx != -1 ? $self->GetImage($indx) : Uploader::Image->new()
     );
 }