Changeset 5041 for extensions/pLoader/trunk/src/Uploader/GUI/wxApp.pm

Timestamp:

03/05/10 07:41:14 (3 years ago)

Author:

ronosman

Message:

Feature 1478 added : ability to set properties for a photo selection.

Files:

• extensions/pLoader/trunk/src/Uploader/GUI/wxApp.pm (modified) (14 diffs)

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

@@ -214 +214 @@
     $self->_init_userdir;
 
-    my $conf = retrieve $self->conf_file if -e $self->conf_file;        
+    my $conf = retrieve $self->conf_file if -e $self->conf_file;
 
     if(defined $conf ){
@@ -407 +407 @@
     while(++$i<$n){    
         push @$list, join(
-                    ', ', 
-                        map{ gettext($_) }
-                        @$pl[$i..$n] 
-                );
+            ', ', 
+            map{ gettext($_) }
+            @$pl[$i..$n] 
+        );
     }
     push @$list, gettext($pl->[$n]);
-        
-        $list;
+    
+    $list;
 }
 
@@ -425 +425 @@
             grep {$_} 
             map{
-                            #  a locale may be unavailable due to system limitations ( ex: chinese, japanese when language pack are not installed )
-                            if(Wx::Locale::IsAvailable($_->[1])){
-                            my $locale = Wx::Locale->new($_->[1]);
-                            $locale->AddCatalogLookupPathPrefix(
+                #  a locale may be unavailable due to system limitations ( ex: chinese, japanese when language pack are not installed )
+                if(Wx::Locale::IsAvailable($_->[1])){
+                    my $locale = Wx::Locale->new($_->[1]);
+                    $locale->AddCatalogLookupPathPrefix(
                         File::Spec->catfile($self->root_dir, $self->locale_dir)
                     );
-                            $_ if $locale->AddCatalog('pLoader');
-                                }
+                    $_ if $locale->AddCatalog('pLoader');
+                }
             }
             @{$self->languages}
@@ -483 +483 @@
         Wx::LogMessage gettext("Cannot find translation catalog files for %s. Use default language"), $locale->GetCanonicalName();
     }
-    $self->locale($locale);     
+    $self->locale($locale);    
 }
 
@@ -531 +531 @@
 
 sub _init_imagelist {
-    my ( $self ) = @_;  
+    my ( $self ) = @_;    
 
     my $stored_imagelist;
@@ -643 +643 @@
 
 sub Login {
-    my ( $self ) = @_;  
+    my ( $self ) = @_;    
 
     $self->login_dlg( 
@@ -650 +650 @@
                 title         => gettext("Piwigo login"),
                 site_url      => sub { $self->site_url(@_) },
-                site_username => sub { $self->site_username(@_) },      
+                site_username => sub { $self->site_username(@_) },    
                 site_password => sub { $self->site_password(@_) },
-                use_offline   => sub { $self->use_offline(@_) },        
+                use_offline   => sub { $self->use_offline(@_) },    
             }
         )
@@ -677 +677 @@
                 $self->site_url
             )
-        );      
+        );    
     }
 
@@ -729 +729 @@
             );
             mkdir $userdatadir;
-        }       
+        }    
     }
 
@@ -791 +791 @@
 
     map {
-        my $image = $self->imagelist->image_sums->{$_};
+        my $image = $self->imagelist->image_sums->{$_};
 
         $wximagelist->Add(
@@ -864 +864 @@
         $self->GetWxBitmapType($type),
     )){
-        Wx::LogMessage(
-            gettext("An error has occured. Can not save file %s"),
-            $image_file_out,
-        )
+        Wx::LogMessage(
+            gettext("An error has occured. Can not save file %s"),
+            $image_file_out,
+        )
     };
 }
@@ -882 +882 @@
                 categories => gettext("albums"),
                 Categories => gettext("Albums"),
-                'Add new category' => gettext("Add new album"), 
+                'Add new category' => gettext("Add new album"),
                 'Category name' => gettext("Album name :"),
                 'New category' => gettext("New album"),
@@ -943 +943 @@
 
 
-        my $expr_params ;
-        eval { $expr_params = read_file( $file ); } ;
-        
-        my $paramValues = [] ;
-        if($expr_params){
-                my $expr = '$paramValues = ' ;
-                $expr .=  "$expr_params ; " ;
-                eval $expr ;
-        }
-        
-        return unless 'ARRAY' eq ref $paramValues ;
-        
-        if(scalar(@$paramValues )){
-            my $params = $paramValues->[0] ;
-            $self->SetKeyValues($params);
-        }
+    my $expr_params ;
+    eval { $expr_params = read_file( $file ); } ;
+    
+    my $paramValues = [] ;
+    if($expr_params){
+        my $expr = '$paramValues = ' ;
+        $expr .=  "$expr_params ; " ;
+        eval $expr ;
+    }
+    
+    return unless 'ARRAY' eq ref $paramValues ;
+    
+    if(scalar(@$paramValues )){
+        my $params = $paramValues->[0] ;
+        $self->SetKeyValues($params);
+    }
 }
 
 sub _read_default_user_properties {
-        my( $self, $file ) = @_ ;
-
-
-        my $expr_params ;
-        eval { $expr_params = read_file( $file ); } ;
-        my $properties;
-        if($expr_params){
-                my $expr = '$properties = ' ;
-                $expr .=  " { $expr_params }; " ;
-                eval $expr ;
-        }
-        $properties = {} unless 'HASH' eq ref $properties;
-        $self->user_defined_properties($properties);
+    my( $self, $file ) = @_ ;
+
+
+    my $expr_params ;
+    eval { $expr_params = read_file( $file ); } ;
+    my $properties;
+    if($expr_params){
+        my $expr = '$properties = ' ;
+        $expr .=  " { $expr_params }; " ;
+        eval $expr ;
+    }
+    $properties = {} unless 'HASH' eq ref $properties;
+    $self->user_defined_properties($properties);
 
 }
@@ -981 +981 @@
 
 sub SetKeyValues {
-    my ( $self, $params )= @_;  
+    my ( $self, $params )= @_;    
 
     foreach( keys %$params ) {