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

Timestamp:

Jun 25, 2009, 5:52:30 PM (15 years ago)

Author:

ronosman

Message:

Feature 1014 added : save layout configuration in a .pLoader.layout file.

File:

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

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

@@ -302 +302 @@
           thumb_dir
           conf_file
+          layout_file
           locale
           current_language
@@ -310 +311 @@
           branding
           frame
+          perspective
+          imageviewerIndex
+          frameLayout
       / 
 );
@@ -331 +335 @@
     # to check if we can use stored cache
     $self->imagelist_version(
-        '3'
+        '4'
     );
 
@@ -349 +353 @@
 
     my $conf = retrieve $self->conf_file if -e $self->conf_file;        
+    my $layout = retrieve $self->layout_file if -e $self->layout_file;  
 
     if(defined $conf ){
@@ -355 +360 @@
     else {
         $self->_readParams( 'pLoader.ini' ) unless defined $conf ;
+    }
+
+    if(defined $layout ){
+        $self->SetKeyValues($layout);
     }
 
@@ -467 +476 @@
             },
             $self->conf_file
+        );
+    };
+}
+
+sub StoreLayoutProperties {
+    my ( $self ) = @_;
+
+    eval {    
+        store( 
+            {
+                map{
+                   $_ => $self->{$_},
+                }
+                qw/
+                      perspective
+                      imageviewerIndex
+                      frameLayout
+                /
+            },
+            $self->layout_file
         );
     };
@@ -540 +569 @@
         filter           => 'Lanczos',
         blur             => 0.9,
-        quality          => 100,
+        quality          => 95,
         wx_quality       => 80,
         th_quality       => 90,
@@ -658 +687 @@
     );
 
-    
+    $self->layout_file(
+        File::Spec->catfile(
+            $self->userdata_dir, 
+            ".$applicationName.layout"
+        )
+    );
 
     $self->storable_file(
@@ -895 +929 @@
     my ( $self ) = @_;  
 
-    my $config = Wx::ConfigBase::Get;
-
-    my $x = $config->ReadInt( "X", 50 );
-    my $y = $config->ReadInt( "Y", 50 );
-    my $w = $config->ReadInt( "Width", 1024 );
-    my $h = $config->ReadInt( "height", 768 );
-    my $prev_w = $config->ReadInt( "PreviewWidth", 400 );
-    my $prev_h = $config->ReadInt( "PreviewHeight", 300 );
-    my $perspective = $config->Read( "Perspective" );
-    my $imageviewer_index = $config->ReadInt( "ImageviewerIndex", 0 );
-    
-    #printf("Config x %s, y %s, w %s, h %s, prev_w %s, prev_h %s\n", $x, $y, $w, $h, $prev_w, $prev_h);
-    
     my $url = $self->site_url;
     
@@ -917 +938 @@
         Uploader::GUI::wxFrameAUI->new( 
             {
-                x         => $x,
-                y         => $y,
-                width     => $w,
-                height    => $h,
                 title     => sprintf("pLoader - Piwigo uploader %s - [%s]", $self->version, $url),
                 pwg       => $self->pwg,
                 imagelist => $self->imagelist,
-                preview_w => $prev_w,
-                preview_h => $prev_h,
-                perspective => $perspective,
-                imageviewer_index => $imageviewer_index,
+                perspective => $self->perspective,
+                imageviewer_index => $self->imageviewerIndex,
+                frameLayout => $self->frameLayout,
             }
         )
     );
-        
-    $self->frame->SetSize( $x, $y, $w, $h );
+ 
     $self->frame->Show( 1 );
     $self->SetTopWindow( $self->frame );