Changeset 4589 for extensions/pLoader/trunk/src/Uploader/GUI/wxGlobalSettings.pm

Timestamp:

Dec 30, 2009, 10:52:22 PM (14 years ago)

Author:

ronosman

Message:

Bug fixes for new global settings dialog box.

File:

• extensions/pLoader/trunk/src/Uploader/GUI/wxGlobalSettings.pm (modified) (6 diffs)

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

@@ -55 +55 @@
         $params->{properties}
     );
+
+    $self->frame_callback(
+        $params->{frame_callback}
+    );
+
     $self->{cpane_resize} = $self->FindWindow($main::CPANE_RESIZE);
     $self->{cpane_resize_advanced} = $self->FindWindow($main::CPANE_RESIZE_ADVANCED);
@@ -86 +91 @@
     EVT_CLOSE( $self, \&OnClose );
     Wx::Event::EVT_COLLAPSIBLEPANE_CHANGED( $self, $self->{cpane_resize}, \&OnPaneChanged );
-    Wx::Event::EVT_COLLAPSIBLEPANE_CHANGED( $self, $self->{cpane_resize_advanced}, \&OnAdvancedPaneChanged );
+    Wx::Event::EVT_COLLAPSIBLEPANE_CHANGED( $self, $self->{cpane_resize_advanced}, \&OnPaneChanged );
     Wx::Event::EVT_COLLAPSIBLEPANE_CHANGED( $self, $self->{cpane_hd}, \&OnPaneChanged );
-    Wx::Event::EVT_COLLAPSIBLEPANE_CHANGED( $self, $self->{cpane_hd_advanced}, \&OnAdvancedPaneChanged );
+    Wx::Event::EVT_COLLAPSIBLEPANE_CHANGED( $self, $self->{cpane_hd_advanced}, \&OnPaneChanged );
     Wx::Event::EVT_COLLAPSIBLEPANE_CHANGED( $self, $self->{cpane_watermark}, \&OnPaneChanged );
-    Wx::Event::EVT_COLLAPSIBLEPANE_CHANGED( $self, $self->{cpane_transfert_advanced}, \&OnAdvancedPaneChanged );
+    Wx::Event::EVT_COLLAPSIBLEPANE_CHANGED( $self, $self->{cpane_transfert_advanced}, \&OnPaneChanged );
 
 }
@@ -111 +116 @@
     my( $self, $event ) = @_;
 
-#    $self->_set_size(
-#        $event->GetCollapsed
-#    );
-    $self->Layout;
-    $event->Skip;
-}
-
-sub OnAdvancedPaneChanged {
-    my( $self, $event ) = @_;
-
-    $self->Layout;
-    $event->Skip;
-
-}
+    $self->_layout;
+    $event->Skip;
+}
+
+sub _layout {
+    my( $self ) = @_;
+
+    $self->Layout; 
+    $self->GetSizer->Fit($self);
+    my $size = $self->GetSize;
+    $self->frame_callback->($size);
+
+}
+
 
 sub OnDefaultPhotoCaption {
@@ -162 +167 @@
     my $b = 1;
     if('CODE' eq ref $self->properties->{$id}->{selection}){
-        $b = $self->properties->{$id}->{selection}->()
+        $b = !$self->properties->{$id}->{selection}->()
     }
 
     $self->{cpane_resize}->Collapse($b);
-    $self->Layout;
-    $event->Skip;
-
-}
-
-
-sub _set_size {
-    my ( $self, $collapsed ) = @_;
-
-    printf("collapsed %s\n", $collapsed);
-    my $new_size = $collapsed ? Wx::Size->new(200, 200) : Wx::Size->new(800, 800);
-    printf("collapsed %s, %s\n", $new_size->GetWidth, $new_size->GetHeight);
-
-    $self->SetMinSize($new_size);
-    $self->Layout;
-}
+    $self->_layout;
+    $event->Skip;
+
+}
+
 
 sub OnHDUpload {
@@ -196 +190 @@
     }
     $self->{cpane_hd}->Collapse($b);
-    $self->Layout;
+    $self->_layout;
     $event->Skip;
 }
@@ -210 +204 @@
 
     $self->{cpane_watermark}->Collapse($b);
-    $self->Layout;
+    $self->_layout;
     $event->Skip;
 }