Changeset 4467 for extensions/pLoader/trunk/src/Uploader/GUI/wxFrameAUI.pm

Timestamp:

Dec 10, 2009, 3:21:06 PM (14 years ago)

Author:

ronosman

Message:

Feature 1052 added : photo re-upload management. When uploading an already added photo, the user is warned and has a choice on action for files, simple properties and multi-values properties.

File:

• extensions/pLoader/trunk/src/Uploader/GUI/wxFrameAUI.pm (modified) (11 diffs)

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

@@ -148 +148 @@
 use Uploader::GUI::wxImageProcessingProgressDlg;
 use Uploader::GUI::wxChoiceFilteredPanel;
+use Uploader::GUI::wxImageReuploadDlg;
 use Wx::Html;
 use Uploader::GUI::wxImagePreview;
@@ -155 +156 @@
 use Storable;
 use Uploader::GUI::wxPropertyGridPanel;
+use Uploader::GUI::wxPhotoProperties;
 use utf8;
 $|=1;
@@ -206 +208 @@
         sub { $self->UploadImagesViewerRefresh(@_) }
     );
+        
+        $self->imagelist->ReuploadCallback(
+            sub {
+                    Uploader::GUI::wxImageReuploadDlg->new(
+            { 
+                                title      => gettext("Photo update management"),
+                properties => {
+                                        $main::ID_REUPLOAD_ACTION_FILES        => { 
+                                                                                                                    selection=>sub {$self->imagelist->reupload_action_files(@_)},
+                                                                                                                                                                label=>gettext("What shall we do with files? (thumbnail, resized, high resolution)"),
+                                                                                labels=>[
+                                                                                                                                                                           gettext("nothing"),
+                                                                                                                                                                           gettext("replace"),
+                                                                                                                                                                       ],                                                                                                                                                               
+                                                                                                            },
+                                                                    $main::ID_REUPLOAD_ACTION_PROPERTIES   => { 
+                                                                                                                    selection=>sub{$self->imagelist->reupload_action_properties(@_)},
+                                                                                                                                                                label=>gettext("What shall we do with single value properties?(caption, comment, author, create date)"),
+                                                                                labels=>[
+                                                                                                                                                                           gettext("nothing"),
+                                                                                                                                                                           gettext("fill if empty (only replace properties currently empty in Piwigo)"),
+                                                                                                                                                                           gettext("replace"),
+                                                                                                                                                                       ],                                                                                                                                                               
+                                                                                                                  },
+                                                                        $main::ID_REUPLOAD_ACTION_PROPERTIES_M => { 
+                                                                                                                    selection=>sub{$self->imagelist->reupload_action_properties_m(@_)},
+                                                                                                                                                                label=>gettext("What shall we do with multiple values properties? (categories, tags)"),
+                                                                                labels=>[
+                                                                                                                                                                           gettext("nothing"),
+                                                                                                                                                                           gettext("append (keep existing and add new)"),
+                                                                                                                                                                           gettext("replace"),
+                                                                                                                                                                       ],                                                                                                                                                               
+                                                                                                                  },
+                                                                        $main::ID_REUPLOAD_NOT_ASK             => { 
+                                                                                                                    value=>sub{$self->imagelist->reupload_not_ask(@_)}, 
+                                                                                label=>gettext("Do not ask me again"),                                                                                                                                                          
+                                                                                                                  },
+                                                                        $main::ID_REUPLOAD_TEXT                => { 
+                                                                                label=>gettext("A least one photo has already been added in the past."),                                                                                                                                                                
+                                                                                                                  },
+                                                },
+            }
+                        )->ShowModal();
+                }
+        );
 
 
@@ -277 +324 @@
 sub _set_setting_properties {
     my ( $self ) = @_;
+        
 
     $self->piwigo_properties(
@@ -607 +655 @@
     }
     (
-        $self->image_prop_piwigo,
+        $self->image_prop_piwigo,
         $self->image_prop_exif,
         $self->image_prop_tags,
@@ -663 +711 @@
 sub _refresh_settings_panels_properties {
     my ( $self ) = @_;  
-
+        
     $self->image_prop_piwigo->properties(
         $self->piwigo_properties
@@ -701 +749 @@
 sub _init_settings_panels {
     my ( $self ) = @_;  
+
 
     $self->image_prop_piwigo(
@@ -868 +917 @@
         ->CenterPane->Resizable->CloseButton(0) );
 
+                
     $self->manager->AddPane( 
         $self->create_tree, 
@@ -1079 +1129 @@
         [
             $self->hd_settings_panel, 
-            gettext("HD"),
+            gettext("High definition"),
         ],
         [
@@ -1745 +1795 @@
     my ( $self ) = @_;  
 
+
     $self->imageviewer->Refresh;
+
+    $self->image_preview->image(
+        0
+    ) if !$self->imageviewer->GetItemCount;
+
+
+    $self->image_preview->Refresh;
     Wx::Yield();
 }
@@ -1841 +1899 @@
 
     my $wximagelist = $self->imagelist->wx_thumb_imglist;
-print Dumper "SetNewFilesViewerRefresh", $self->imagelist->current_image;
+    #print Dumper "SetNewFilesViewerRefresh", $self->imagelist->current_image;
     my $indx = $wximagelist->Add(
         Wx::Bitmap->new(