Changeset 4469 for extensions/pLoader/trunk/src

Timestamp:

Dec 10, 2009, 9:04:35 PM (15 years ago)

Author:

ronosman

Message:

Code factorization for properties management : use an inherited class instead of a module.

Location:

extensions/pLoader/trunk/src/Uploader/GUI

Files:

• DlgCommon.pm (modified) (2 diffs)
• wxImageReuploadDlg.pm (modified) (4 diffs)

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

@@ -2 +2 @@
 use strict;
 
+use base qw/
+               Class::Accessor::Fast
+           /; 
+
+__PACKAGE__->mk_accessors(     
+    qw/
+        properties
+      /
+);
+
+
 sub SetProperties {
-    my ($dlg, $properties ) = @_;
+    my ( $self ) = @_;
         
         map {
-        my $ctrl =$dlg->FindWindow($_);
+        my $ctrl =$self->FindWindow($_);
         #printf("ctrl %s : %s\n", $_, $ctrl);           
         if(defined $ctrl){
                 # checkbox, static text
                 $ctrl->SetLabel(
-           $dlg->properties->{$_}->{label}
-                ) if exists$dlg->properties->{$_}->{label};
+           $self->properties->{$_}->{label}
+                ) if exists$self->properties->{$_}->{label};
 
         $ctrl->SetValue(
-           $dlg->properties->{$_}->{value}->()
-                ) if exists$dlg->properties->{$_}->{value};
+           $self->properties->{$_}->{value}->()
+                ) if exists$self->properties->{$_}->{value};
 
         # radiobox
-        my $labels =$dlg->properties->{$_}->{labels};
+        my $labels =$self->properties->{$_}->{labels};
                 $labels||=[];
                 for(my $i=0; $i < scalar @$labels ; $i++){
@@ -26 +37 @@
                 # only works for control with items
                 $ctrl->SetSelection(
-                    $dlg->properties->{$_}->{selection}->()                     
-                ) if exists $dlg->properties->{$_}->{selection};
+                    $self->properties->{$_}->{selection}->()                    
+                ) if exists $self->properties->{$_}->{selection};
                 
                 }
     }
-        keys %$properties;
+        keys %{$self->properties};
 }
 
 sub GetProperties {
-    my ($dlg, $properties ) = @_;
+    my ( $self ) = @_;
 
         map {
-        my $ctrl =$dlg->FindWindow($_);
+        my $ctrl = $self->FindWindow($_);
         #printf("ctrl %s : %s\n", $_, $ctrl);           
         if(defined $ctrl){
                 # checkbox, static text
 
-        $dlg->properties->{$_}->{value}->(
+        $self->properties->{$_}->{value}->(
             $ctrl->GetValue()
-                ) if exists$dlg->properties->{$_}->{value};
+                ) if exists $self->properties->{$_}->{value};
 
-        $dlg->properties->{$_}->{selection}->(
+        $self->properties->{$_}->{selection}->(
                     $ctrl->GetSelection()                       
-                ) if exists $dlg->properties->{$_}->{selection};
+                ) if exists $self->properties->{$_}->{selection};
                 
                 }
     }
-        keys %$properties;
+        keys %{$self->properties};
 }
 1;

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

@@ -27 +27 @@
              wxGREEN
          /;
-use base qw/Wx::Dialog Class::Accessor::Fast/;
+#use base qw/Wx::Dialog Class::Accessor::Fast Uploader::GUI::DlgCommon/;
+use base qw/Wx::Dialog Uploader::GUI::DlgCommon/;
 use Wx::Event qw/
                     EVT_UPDATE_UI
@@ -34 +35 @@
                 /;
 
-__PACKAGE__->mk_accessors( 
-    qw/
-        properties
-      / 
-);
 use Carp;
-use Uploader::GUI::DlgCommon;
 
 sub new {
@@ -57 +52 @@
         );
 
-        Uploader::GUI::DlgCommon::SetProperties($self, $self->properties);
+        $self->SetProperties();
         $self->_initEventHandlers();
 
@@ -95 +90 @@
     my ( $self ) = @_;
 
-    Uploader::GUI::DlgCommon::GetProperties($self, $self->properties);
+    $self->GetProperties();
                 
     $self->Destroy;