Changeset 4479

Timestamp:

Dec 13, 2009, 8:21:10 PM (14 years ago)

Author:

ronosman

Message:

Feature 1282 added : user defined default property values. The pairs property/value are defined in the properties.ini file.

Location:

extensions/pLoader/trunk/src

Files:

• Uploader/GUI/wxApp.pm (modified) (6 diffs)
• properties.ini (added)

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

@@ -112 +112 @@
                   eng_upload_hd
                   privacy_level
+                  user_defined_properties
       / 
 );
@@ -133 +134 @@
     # to check if we can use stored cache
     $self->imagelist_version(
-        '9'
+        '10'
     );
 
@@ -180 +181 @@
     }
 
+    $self->_read_default_user_properties( 'properties.ini' ) ;
+        
     # when language is switched, need a new layout
     unlink $self->layout_file if $self->layout_clean;
@@ -511 +514 @@
     my $params = {
         new_files        => [],
-        hd_filter        => 'Lanczos',
-        hd_blur          => 0.9,
-        hd_quality       => 95,
-        hd_w             => 1600,
-        hd_h             => 1200,
-        hd_interlace     => 'Line',
-        thumb_size       => 120,
+        hd_filter        => $self->user_defined_properties->{hd_filter}||'Lanczos',
+        hd_blur          => $self->user_defined_properties->{hd_blur}||0.9,
+        hd_quality       => $self->user_defined_properties->{hd_quality}||95,
+        hd_w             => $self->user_defined_properties->{hd_w}||1600,
+        hd_h             => $self->user_defined_properties->{hd_h}||1200,
+        hd_interlace     => $self->user_defined_properties->{hd_interlace}||'Line',
+        thumb_size       => $self->user_defined_properties->{thumbnail_size}||120,
         site_thumb_dir   => $self->thumb_dir,
-        wx_thumb_size    => 100,
+        wx_thumb_size    => $self->user_defined_properties->{wx_thumbnail_size}||100,
         wx_thumb_dir     => $self->wx_thumb_dir,
-        resize_w         => 800,
-        resize_h         => 600,
+        resize_w         => $self->user_defined_properties->{resize_w}||800,
+        resize_h         => $self->user_defined_properties->{resize_h}||600,
         site_resized_dir => $self->resized_dir,
         type             => 'jpg',
-        filter           => 'Lanczos',
-        blur             => 0.9,
-        quality          => 95,
-        wx_quality       => 90,
-        th_quality       => 90,
-        auto_rotate      => 1,
-                upload_hd        => 'No',
-        remove_uploaded_from_selection => 1,
-        interlace        => 'Line',
-        create_resized   => 1,
+        filter           => $self->user_defined_properties->{resize_filter}||'Lanczos',
+        blur             => $self->user_defined_properties->{resize_blur}||0.9,
+        quality          => $self->user_defined_properties->{resize_quality}||95,
+        wx_quality       => $self->user_defined_properties->{wx_thumbnail_quality}||90,
+        th_quality       => $self->user_defined_properties->{thumbnail_quality}||90,
+        auto_rotate      => $self->user_defined_properties->{auto_rotate}||1,
+                upload_hd        => $self->user_defined_properties->{upload_hd}||'No',
+        remove_uploaded_from_selection => $self->user_defined_properties->{remove_uploaded_from_selection}||1,
+        interlace        => $self->user_defined_properties->{resize_interlace}||'Line',
+        create_resized   => $self->user_defined_properties->{create_resized}||1,
         prefix           => 'TN',
         count            => 0,
         storable_file    => $self->storable_file,
         userdata_dir     => $self->userdata_dir,
-        default_photo_name => 'File name',
-        default_name_prefix => gettext('Photo '),
+        default_photo_name => $self->user_defined_properties->{default_photo_name}||'File name',
+        default_name_prefix => $self->user_defined_properties->{default_name_prefix}||gettext('Photo '),
         upload_rejects   =>  [],
         image_sums       => {},
@@ -548 +551 @@
         RescaleCallback  => sub { $self->RescaleImage(@_) },
         ResizeCallback   => sub { $self->ResizeImage(@_) },
-        watermark_text => gettext("my watermark"),
-        watermark_text_size => 12,
-        watermark_position => 'Center',
-        watermark_y => 10,
-        watermark_x => 10,
-        watermark_color => 'White',
+        watermark_text => $self->user_defined_properties->{watermark_text}||gettext("my watermark"),
+        watermark_text_size => $self->user_defined_properties->{watermark_text_size}||12,
+        watermark_position => $self->user_defined_properties->{watermark_position}||'Center',
+        watermark_y => $self->user_defined_properties->{watermark_y}||10,
+        watermark_x => $self->user_defined_properties->{watermark_x}||10,
+        watermark_color => $self->user_defined_properties->{watermark_color}||'White',
                 reupload_action_files => 1,
                 reupload_action_properties => 2,
@@ -946 +949 @@
 }
 
+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);
+
+}
+