Changeset 3227 for extras/pLoader/trunk/src/Uploader/GUI/wxApp.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/wxApp.pm (modified) (16 diffs)

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

@@ -302 +302 @@
           locale
           current_language
+          version
+          imagelist_version
+          use_offline
+          login_dlg
       / 
 );
@@ -313 +317 @@
 }
 
+
 sub OnInit {
     my( $self ) = @_;
+    
+    $self->version(
+        '2.0.1a'
+    );
+    
+    # to check if we can use stored cache
+    $self->imagelist_version(
+        '2'
+    );
 
     Wx::InitAllImageHandlers();
@@ -353 +367 @@
         $self->{current_language}||wxLANGUAGE_ENGLISH
     );
-
     
     $self->init_locale;
-    
-
-
-    my $ok = $self->Login();
+
+    my $not_exit = $self->Login();
     # user pressed OK
-    if($ok){
-        $self->pwg(
-            # get these parameters from dialog or from file
-            Uploader::PWG->new(
-                {
-                    site_url       => $self->site_url,
-                    site_username  => $self->site_username,
-                    site_password  => $self->site_password,
-                }
-            )
-        );
-      
-    
+    if($not_exit){
+        if( !$self->use_offline ){
+            while( $not_exit and !$self->_is_connected ){
+                $not_exit = $self->Login();
+            }
+        }
         $self->_init_imagelist;
         $self->_init_thumbimagelist;
-        
         $self->_init_frame;
     }
 
-    $ok;
-}
+    $not_exit;
+}
+
+
+sub _is_connected {
+    my ( $self ) = @_;
+
+    my $is_connected;
+
+    if($self->pwg->login_result->{stat} eq 'ok'){
+        $is_connected = 1;
+    }
+    else{
+        Wx::MessageBox( 
+            sprintf(
+                "%s\n\n%s %s %s",
+                $self->pwg->login_result->{message},
+                gettext("Connection to"),
+                $self->site_url,
+                gettext("failed"),
+            ),
+            gettext("Piwigo login error"),
+            wxOK | wxICON_EXCLAMATION, 
+        );
+    }
+    
+    $is_connected;
+}
+
 
 my $locale;
@@ -397 +427 @@
     $locale->AddCatalogLookupPathPrefix( '../locale');
     if(!$locale->AddCatalog( 'pLoader.mo' )){
-        print "Cannot find translation catalog files. Use default language\n";
+        Wx::LogMessage gettext("Cannot find translation catalog files. Use default language");
     }
         
@@ -428 +458 @@
     my $stored_imagelist;
     
+    my $use_new_imagelist;
+    
     if( -e $self->storable_file ){
         eval {
@@ -434 +466 @@
         if($@){
             Wx::LogMessage(
-                "An error has occured. Can not read %s\n%s",
+                gettext("An error has occured. Can not read %s\n%s"),
                 $self->storable_file,
                 $@
             );
-            $stored_imagelist = $self->_default_imagelist_params ;
+            $use_new_imagelist = 1 ;
         }
+        # should have a valid imagelist
+        else{
+            $use_new_imagelist = 1 unless $self->imagelist_version eq $stored_imagelist->{imagelist_version};
+            if($use_new_imagelist){
+                Wx::LogMessage(gettext("pLoader has to reset image cache."));
+            }
+        }
     }
     else{
+        $use_new_imagelist = 1 ;
+    }
+
+    if($use_new_imagelist){
         $stored_imagelist = $self->_default_imagelist_params ;
     }
+
 
     $self->imagelist(
@@ -449 +493 @@
             $stored_imagelist
         )
+    );
+
+    $self->imagelist->RescaleCallback(
+        sub { $self->RescaleImage(@_) }
     );
 
@@ -483 +531 @@
         count            => 0,
         storable_file    => $self->storable_file,
-        images           => [],
         userdata_dir     => $self->userdata_dir,
         default_name_prefix => 'Photo',
-        upload_rejects  =>  [],
-        ResizeCallback  => sub { $self->ResizeImage(@_) },
+        upload_rejects   =>  [],
+        image_sums       => {},
+        sums             => [],
+        version          => $self->version,
+        imagelist_version => $self->imagelist_version,
+        RescaleCallback  => sub { $self->RescaleImage(@_) },
+        ResizeCallback   => sub { $self->ResizeImage(@_) },
     };
 
@@ -496 +548 @@
     my ( $self ) = @_;  
 
-    my $dlg = Uploader::GUI::wxLoginDlg->new(
-        {
-            title         => gettext("Piwigo login"),
-            site_url      => sub { $self->site_url(@_) },
-            site_username => sub { $self->site_username(@_) },  
-            site_password => sub { $self->site_password(@_) },  
-        }
-    );
+    $self->login_dlg( 
+        Uploader::GUI::wxLoginDlg->new(
+            {
+                title         => gettext("Piwigo login"),
+                site_url      => sub { $self->site_url(@_) },
+                site_username => sub { $self->site_username(@_) },      
+                site_password => sub { $self->site_password(@_) },
+                use_offline   => sub { $self->use_offline(@_) },        
+            }
+        )
+    ) unless $self->login_dlg;
 
     my $icon = Wx::Icon->new();
     $icon->LoadFile('../res/favicon.ico', wxBITMAP_TYPE_ICO);
-    $dlg->SetIcon($icon);       
-
-    
-    my $rval = $dlg->ShowModal();
-    $dlg->Destroy;
+    $self->login_dlg->SetIcon($icon);   
+
+    
+    my $rval = $self->login_dlg->ShowModal();
+    $self->login_dlg->Show(0);
+
+    $self->pwg(
+        # get these parameters from dialog or from file
+        Uploader::PWG->new(
+            {
+                site_url       => $self->site_url,
+                site_username  => $self->site_username,
+                site_password  => $self->site_password,
+            }
+        )
+    );
     
     $rval;
@@ -605 +671 @@
     
     my $wximagelist = $self->imagelist->wx_thumb_imglist;
-    my $images = $self->imagelist->images;
+    my $sums = $self->imagelist->sums;
 
     map {
+        my $image = $self->imagelist->image_sums->{$_};
+
         $wximagelist->Add(
             Wx::Bitmap->new( 
-                $_->wx_thumb_file, 
+                $image->wx_thumb_file, 
                 $self->GetWxBitmapType($self->imagelist->type), 
             )
         );
     }
-    @$images ;
+    @$sums ;
 
 }
@@ -626 +694 @@
 
 
-sub ResizeImage {
+sub RescaleImage {
     my ( $self, $image_file, $image_file_out, $type, $ratio, $width, $height, $quality ) = @_;
    
@@ -682 +750 @@
     )){
         Wx::LogMessage(
-            "An error has occured. Can not save file %s",
+            gettext("An error has occured. Can not save file %s"),
             $image_file_out,
         )
@@ -688 +756 @@
 }
 
+sub ResizeImage {
+    my ( $self, $image_file, $image_file_out, $type, $width, $height, $quality ) = @_;
+   
+
+    my $image = Wx::Image->new(
+            $image_file, 
+            $self->GetWxBitmapType($type),
+            0
+    );
+
+    my $w;
+    my $h;
+
+    my $img_w = $image->GetWidth;
+    my $img_h = $image->GetHeight;
+    
+        # portrait
+        if( $img_w < $img_h ){
+            $w = $height;
+        }
+        else{
+            $w = $width;
+        }
+        # to respect aspect ratio
+        $h = sprintf(
+            "%.0f",
+            ($w*$img_h)/$img_w
+        );
+
+    
+
+    $image->Rescale(
+        $w,
+        $h,
+        wxIMAGE_QUALITY_HIGH
+    );
+
+    $image->Resize(
+        [ $width, $height ], [ 0, 20],
+    );
+    
+    $quality ||= 90;
+    
+    $image->SetOption( 
+        "quality", 
+        $quality 
+    );
+    
+    if(!$image->SaveFile(
+        $image_file_out,
+        $self->GetWxBitmapType($type),
+    )){
+        Wx::LogMessage(
+            gettext("An error has occured. Can not save file %s"),
+            $image_file_out,
+        )
+    };
+}
+
+
+
+
 sub _init_frame {
-    my ( $self ) = @_ ; 
+    my ( $self ) = @_;  
 
     my $config = Wx::ConfigBase::Get;
@@ -699 +829 @@
     my $sv = $config->ReadInt( "splitVertical", 150 );
     my $sh = $config->ReadInt( "splitHorizontal", 300 );
-        
-    my $url;
-    my $is_connected;
-    if($self->pwg->login_result->{stat} eq 'ok'){
-        $url = $self->site_url;
-        $is_connected = 1;    
-    }
-    else{
-        $url = gettext("Not connected");
-        Wx::MessageBox( 
-            sprintf(
-                "%s\n\n%s %s %s",
-                $self->pwg->login_result->{message},
-                gettext("Connection to"),
-                $self->site_url,
-                gettext("failed"),
-            ),
-            gettext("Piwigo login error"),
-            wxOK | wxICON_EXCLAMATION, 
-        );
-    }   
-        
+    
+    my $url = $self->site_url;
+    
+    if($self->use_offline){
+        $url = gettext("Work Offline");
+    }
 
     my ( $frame ) = Uploader::GUI::wxFrameAUI->new( 
@@ -728 +842 @@
             width     => $w,
             height    => $h,
-            title     => "pLoader - Piwigo uploader 2.0.1a - [$url]" ,
+            title     => sprintf("pLoader - Piwigo uploader %s - [%s]", $self->version, $url),
             pwg       => $self->pwg,
             imagelist => $self->imagelist,
-            is_connected => $is_connected,
         }
     );
@@ -743 +856 @@
     $icon->LoadFile('../res/favicon.ico', wxBITMAP_TYPE_ICO);
     $frame->SetIcon($icon);     
-
-
-    return 1;
-}
-
+}
 
 sub _readParams {