Changeset 3227 for extras/pLoader/trunk/src/Uploader/GUI/wxFrameAUI.pm

Timestamp:

Mar 29, 2009, 12:51:40 PM (15 years ago)

Author:

ronosman

Message:

Feature 955 added : add a "Work Offline" mode to pLoader login.

File:

• extras/pLoader/trunk/src/Uploader/GUI/wxFrameAUI.pm (modified) (22 diffs)

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

@@ -298 +298 @@
 use File::Spec;
 use Wx::Locale qw/:default/;
+use Encode qw/encode decode is_utf8/;;
 
 
@@ -333 +334 @@
           thumbnail_settings
           preview_settings
-          is_connected
-
+          toolbar
       /;
 __PACKAGE__->mk_accessors( @properties );
@@ -346 +346 @@
           EVT_LIST_ITEM_SELECTED
           EVT_TREE_ITEM_RIGHT_CLICK
-          EVT_LIST_KEY_DOWN       
+          EVT_LIST_KEY_DOWN
+          EVT_UPDATE_UI       
       /;
       
@@ -373 +374 @@
                                       wxDEFAULT_FRAME_STYLE|wxMAXIMIZE
                                    );
-    $self->is_connected(
-        $params->{is_connected}
-    );
     $self->pwg( $params->{pwg} );
     $self->imagelist( $params->{imagelist} );
@@ -467 +465 @@
             },
             {
-                label => "Comment :",
+                label => gettext("Comment :"),
                 value => sub { $self->imagelist->current_image->site_comment(@_) },
                 type  => "LongText",
             },
             {
-                label => "Author :",
+                label => gettext("Author :"),
                 value => sub { $self->imagelist->current_image->site_author(@_) },
             },
             {
-                label    => "File name :",
+                label    => gettext("File name :"),
                 value    => sub { $self->imagelist->current_image->file(@_) },
                 readonly => 1,
             },
             {
-                label    => "Create date :",
+                label    => gettext("Create date :"),
                 value    => sub { $self->imagelist->current_image->create_date(@_) },
                 readonly => 1,
@@ -699 +697 @@
     $self->init_aui;
     $self->init_dnd_targets;
-
     if( $self->imagelist->wx_thumb_imglist->GetImageCount){
+printf("%s images\n", $self->imagelist->wx_thumb_imglist->GetImageCount); 
         $self->ShowImageViewer;
         
@@ -876 +874 @@
 
 sub init_aui {
-    my ( $self ) = @_;  
+    my ( $self ) = @_;
+    
+    my $url = wxTheApp->site_url;
+    
+    $url = gettext("empty - work Offline") if wxTheApp->use_offline;
 
     $self->manager->AddPane
@@ -884 +886 @@
     $self->manager->AddPane
       ( $self->create_tree, Wx::AuiPaneInfo->new->Name( "categories" )->Caption(
-          sprintf("%s - %s", gettext("Piwigo categories"), wxTheApp->site_url )
+          sprintf("%s - %s", gettext("Piwigo categories"), $url )
       )
         ->Right->Position( 0 )->Resizable->CloseButton(0) );
@@ -895 +897 @@
     $self->_init_aui_settings_panels;
 
-    my $tb = $self->create_toolbar;
+    $self->toolbar(
+        $self->create_toolbar
+    );
 
     $self->manager->AddPane
-      ( $tb, Wx::AuiPaneInfo->new->Name( "tb1" )->Caption( gettext("Tools") )
-        ->ToolbarPane->Top->Row( 1 )->LeftDockable( 0 )->RightDockable( 0 ) ) if defined $tb;
+      ( $self->toolbar, Wx::AuiPaneInfo->new->Name( "tb1" )->Caption( gettext("Tools") )
+        ->ToolbarPane->Top->Row( 1 )->LeftDockable( 0 )->RightDockable( 0 ) ) if defined $self->toolbar;
 
     $self->manager->Update;
@@ -921 +925 @@
     my ( $self ) = @_;
 
+    $self->toolbar->EnableTool(104, 0 );
     $self->manager->GetPane("global_settings")->Show(1);
     $self->manager->Update();    
@@ -1076 +1081 @@
 
     $self->tree->SetImageList( $self->treeimglist );
-    $self->populate_tree_categories if $self->is_connected;
+    $self->populate_tree_categories if !wxTheApp->use_offline;
     $self->tree ;
 }
@@ -1198 +1203 @@
     EVT_LIST_KEY_DOWN($self, $self->imageviewer, \&OnImageViewerKeyDown) ;
     EVT_CLOSE( $self, \&OnClose );
+    Wx::Event::EVT_UPDATE_UI( $self, $self, \&OnUpdateUI );
 
 
@@ -1225 +1231 @@
 }
 
+sub OnUpdateUI {
+    my( $self, $event ) = @_;
+    
+    if( $self->manager ){
+        if($self->manager->GetPane("global_settings")->IsShown){
+            $self->toolbar->EnableTool(104, 0);                 
+        }
+        else{
+            $self->toolbar->EnableTool(104, 1);                 
+        }
+    }
+}
+
 sub OnRemoveImages {
     my( $self, $event ) = @_;
@@ -1247 +1266 @@
     $self->progressdlg->Show(1);
     Wx::Yield();
+    
+    my $files = [
+        map {
+            encode('iso-8859-1', $_)
+        }@$file_paths    
+    ];
+    
+    # last is first !
+    if ( scalar @$files > 1 ){
+        my $first = shift @$files;
+        push @$files, $first;   
+    }
+    #print Dumper $files;
 
     $self->imagelist->SetNewFiles(
-        $file_paths
+        $files
     );
 
@@ -1335 +1367 @@
     my( $self, $event ) = @_;
   
-    my $image = $self->imagelist->images->[$event->GetIndex];
+    my $image = $self->imagelist->GetImage($event->GetIndex);
     $image->site_name(
         $event->GetLabel
@@ -1389 +1421 @@
     my( $self, $event ) = @_;
 
-#    eval {
+    eval {
         $self->ProcessImageSelection();    
-#    };
+    };
 }
 
@@ -1495 +1527 @@
         )
     ) if defined $self->imagelist->current_image->wx_thumb_file;
-    
+    print $self->imagelist->current_image->wx_thumb_file, " added with index ", $indx, "\n";    
     $self->imageviewer->Refresh(
         $wximagelist
@@ -1509 +1541 @@
     my ( $self ) = @_;
 
-    return if !scalar @{$self->imagelist->images};
+    return if !scalar @{$self->imagelist->sums};
 
     if( scalar @{$self->imagelist->categories} ){
@@ -1518 +1550 @@
             Uploader::GUI::wxImageProcessingProgressDlg->new(
                 { 
-                    title => gettext("Image upload progress information"),
+                    title    => gettext("Image upload progress information"),
                     bt_label => gettext("Cancel upload"), 
                  }
@@ -1587 +1619 @@
 
     # allways store
-    
+  
     wxTheApp->StoreConnectionProperties;
     
     $self->imagelist->Store;
+    wxTheApp->login_dlg->Destroy;       
     $self->Destroy;
 }
@@ -1619 +1652 @@
     (
         [
-            101, gettext("Add photo to selection"), '../res/tb_add.png', wxBITMAP_TYPE_PNG, 1, '../res/tb_add.png', gettext("Add photo to selection for resizing and uploading")
+            101, 
+            gettext("Add photo to selection"), 
+            '../res/tb_add.png', 
+            wxBITMAP_TYPE_PNG, 
+            1, 
+            '../res/tb_add.png', 
+            gettext("Add photo to selection for resizing and uploading")
         ],
         [
-            102, gettext("Remove photo from selection"), '../res/tb_remove.png', wxBITMAP_TYPE_PNG, 1, '../res/tb_remove.png',gettext("Remove photo from selection. Files are not deleted ")
+            102, 
+            gettext("Remove photo from selection"), 
+            '../res/tb_remove.png', 
+            wxBITMAP_TYPE_PNG, 
+            1, 
+            '../res/tb_remove.png',
+            gettext("Remove photo from selection. Files are not deleted ")
         ],
         [
-            103, gettext("Upload to Piwigo"), '../res/tb_upload.png', wxBITMAP_TYPE_PNG, 1, '../res/tb_upload.png',gettext("Upload photos to Piwigo.")
+            103, 
+            gettext("Upload to Piwigo"), 
+            '../res/tb_upload.png', 
+            wxBITMAP_TYPE_PNG, 
+            wxTheApp->use_offline ? 0 : 1, 
+            '../res/tb_upload.png',
+            gettext("Upload photos to Piwigo.")
         ],
         [
-            104, gettext("Global settings"), '../res/tb_settings.png', wxBITMAP_TYPE_PNG, 1, '../res/tb_settings.png',gettext("Change global settings.")
+            104, 
+            gettext("Global settings"), 
+            '../res/tb_settings.png', 
+            wxBITMAP_TYPE_PNG, 
+            0, 
+            '../res/tb_settings.png',
+            gettext("Change global settings.")
         ],
         [
-            105, gettext("Language choice"), '../res/tb_i18n.png', wxBITMAP_TYPE_PNG, 1, '../res/tb_i18n.png',gettext("Language choice")
+            105, 
+            gettext("Language choice"), 
+            '../res/tb_i18n.png', 
+            wxBITMAP_TYPE_PNG, 
+            1, 
+            '../res/tb_i18n.png',
+            gettext("Language choice")
         ],
     
@@ -1700 +1763 @@
   $self->frame->SetNewFiles($files) ;
 }
+
+
+
 
 1;