Changeset 6738 for extensions/pLoader/trunk

Timestamp:

Jul 30, 2010, 7:06:16 PM (14 years ago)

Author:

ronosman

Message:

Add a notebook to display "Preparation" and "Transfer" panels. The transfer progress list is no longer displayed as a dialog box. The photos are removed from the preparation panel when transfer begins.

Location:

extensions/pLoader/trunk

Files:

• locale/fr_FR/pLoader.mo (modified) (previous)
• locale/fr_FR/pLoader.po (modified) (1 diff)
• src/Uploader/GUI/Frame.pm (modified) (9 diffs)
• src/Uploader/GUI/ImageProgressDlg.pm (modified) (2 diffs)
• src/Uploader/GUI/Layout/ImageProgress.pm (modified) (2 diffs)
• src/Uploader/Images.pm (modified) (2 diffs)

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

@@ -772 +772 @@
 msgid "sending"
 msgstr "envoie"
+
+msgid "Preparation"
+msgstr "Préparation"
+
+msgid "Progress"
+msgstr "Progression"
+
+msgid "Status"
+msgstr "Statut"
+
+msgid "Clear list"
+msgstr "Vider la liste"

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

@@ -122 +122 @@
     imageviewer_refresh
     imageviewer_item_refresh
-    horizontal_splitter
     destination_category_dlg
     destination_categories
     categories_treectrl
+    prepare_transfer_notebook
 /;
 __PACKAGE__->mk_accessors( @properties );
@@ -595 +595 @@
     my $sizer_h = Wx::BoxSizer->new( wxHORIZONTAL );
     
+    $self->prepare_transfer_notebook(
+        Wx::Notebook->new(
+            $self,
+            -1,
+            wxDefaultPosition,
+            wxDefaultSize,
+            0
+        )
+    );
 
     $self->imageviewer(
         Uploader::GUI::wxImageListCtrl->new( 
             { 
-                parentwnd    => $self,
+                parentwnd    => $self->prepare_transfer_notebook,
                 images       => $self->images,
                 image_size   => $self->preferences->wx_thumb_size,
@@ -645 +654 @@
     }
 
+    $self->prepare_transfer_notebook->AddPage(
+        $self->imageviewer,
+        gettext("Preparation")
+    );
+
+    $self->prepare_transfer_notebook->AddPage(
+        $self->upload_progressdlg,
+        gettext("Transfer")
+    );
+
     # the imageviewer has a stretch factor of 1 : expands its size on frame resize
-    $sizer_h->Add( $self->imageviewer, 1, wxEXPAND|wxALL, 2 );
+    $sizer_h->Add( $self->prepare_transfer_notebook, 1, wxEXPAND|wxALL, 2 );
     $sizer_h->Add( $self->piwigo_photo_properties_dlg, 0, wxEXPAND|wxALL, 2 );
 
@@ -702 +721 @@
         Uploader::GUI::ImageProgressDlg->new(
             { 
-                title           => gettext("Image upload progress information"),
+                parentwnd       => $self->prepare_transfer_notebook,
                 progress_column => 2,
                 cancel_cbk      => sub { wxTheApp->cancel_all },
@@ -714 +733 @@
                 columns => [ map{ gettext $_ } qw/
                     Photo
-                    Name
+                    Caption
                     Progress
                     Status 
@@ -723 +742 @@
     );
 
-    $self->upload_progressdlg->Hide;
+    $self->upload_progressdlg->Enable(0);
+
 
 
@@ -1035 +1055 @@
             my ( $handler, $event ) = @_;
             my $data = $event->GetData;
-            $handler->upload_progressdlg->Show(1);
-            $handler->upload_progressdlg->RequestUserAttention(wxUSER_ATTENTION_INFO);
+            $handler->upload_progressdlg->Enable(1);
+            $handler->prepare_transfer_notebook->ChangeSelection(1);
             $handler->upload_progressdlg->add_images($data);
+            wxTheApp->images->remove_processed if $self->preferences->remove_uploaded_from_selection;
+            $handler->refresh_image_context;
         } 
     );
@@ -1061 +1083 @@
             my $data = $event->GetData;
             $handler->upload_progressdlg->batch_end($data);
-            wxTheApp->images->remove_processed;
-            $handler->refresh_image_context;
         } 
     );
@@ -1630 +1650 @@
     $self->destination_category_dlg->Destroy;
 
-    $self->upload_progressdlg->Destroy;
-
     wxTheApp->stop_all;
     

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

@@ -31 +31 @@
     wxMINIMIZE_BOX
 /;
-use base qw/Wx::Dialog Class::Accessor::Fast/;
+use base qw/Wx::Panel Class::Accessor::Fast/;
 use Wx::Event qw/
     EVT_BUTTON
@@ -54 +54 @@
 
     my $self = $class->SUPER::new(
-        undef, 
+        $params->{parentwnd}, 
         -1,
-        $params->{title},
         wxDefaultPosition,
         wxDefaultSize,
-             wxDIALOG_NO_PARENT|
-             wxDEFAULT_DIALOG_STYLE|
-             wxMAXIMIZE_BOX|
-             wxMINIMIZE_BOX
 
     );

extensions/pLoader/trunk/src/Uploader/GUI/Layout/ImageProgress.pm

@@ -20 +20 @@
     my( $parent_wnd ) = @_;
 
-    my $panel = Wx::Panel->new($parent_wnd, -1, wxDefaultPosition, wxDefaultSize);
+#    my $panel = Wx::Panel->new($parent_wnd, -1, wxDefaultPosition, wxDefaultSize);
+    my $panel = $parent_wnd;
     
     my( $topsizer ) = Wx::BoxSizer->new( wxVERTICAL );
@@ -29 +30 @@
             $panel, 
             $main::ID_LISTCTRL, 
-            wxDefaultPosition, [600, 400],
+            wxDefaultPosition, [500, 400],
             wxLC_REPORT|wxLC_VIRTUAL
         )

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

@@ -104 +104 @@
     );
 
+    $self->set_to_be_removed(
+        $self->global_rank
+    );
+
     $self->global_rank_indx->{
         $self->global_rank
@@ -245 +249 @@
     return if ( $self->is_empty );
     return if (! defined $self->to_be_removed_grank );
-
     my $to_remove_indx = [];
     # check if the global rank correspond