Changeset 5537 for extensions

Timestamp:

Apr 1, 2010, 4:23:43 PM (14 years ago)

Author:

ronosman

Message:

Refactor multiselection mode display.

Location:

extensions/pLoader/trunk/src/Uploader/GUI

Files:

• Frame.pm (modified) (7 diffs)
• wxPhotoProperties.pm (modified) (2 diffs)

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

@@ -770 +770 @@
     my ( $self ) = @_;
 
-    $self->piwigo_photo_properties_dlg->{_properties_notebook}->Enable(0);
+    $self->piwigo_photo_properties_dlg->SetDisabled;
     $self->imageviewer->OnEmpty;
 }
@@ -777 +777 @@
     my ( $self ) = @_;
 
-    $self->piwigo_photo_properties_dlg->{_properties_notebook}->Enable(1);
+    $self->piwigo_photo_properties_dlg->SetEnabled;
     $self->imageviewer->OnNotEmpty;
 }
@@ -1095 +1095 @@
             }
 
-            if(!scalar @{$self->imageviewer->GetSelectedItems} and $self->piwigo_photo_properties_dlg->{_properties_notebook}->IsEnabled){
-                $self->piwigo_photo_properties_dlg->{_properties_notebook}->Enable(0);
+            if(!$self->selected_images_count and $self->piwigo_photo_properties_dlg->IsEnabled){
+                $self->piwigo_photo_properties_dlg->SetDisabled;
             }
 
@@ -1104 +1104 @@
     );
 
+}
+
+
+sub selected_images_count {
+    my ( $self ) = @_;
+
+    scalar @{$self->imageviewer->GetSelectedItems};
 }
 
@@ -1370 +1377 @@
     my $indx = $event->GetIndex;
 
-    $self->piwigo_photo_properties_dlg->{_properties_notebook}->Enable(1) 
-        if !$self->piwigo_photo_properties_dlg->{_properties_notebook}->IsEnabled;
+    $self->piwigo_photo_properties_dlg->SetEnabled 
+        if !$self->piwigo_photo_properties_dlg->IsEnabled;
     $self->_on_imageviewer_item_selected($indx);
 
@@ -1437 +1444 @@
 
 
-    $self->piwigo_photo_properties_dlg->{_multi_selection_mode_panel}{_text1}->SetLabel(
-        sprintf(gettext("You have selected a batch of %s photos"), $self->imageviewer->GetSelectectItemsCount )
-    );
-
-    $self->piwigo_photo_properties_dlg->{_multi_selection_mode_panel}{_text2}->SetLabel(
-        gettext("Changes apply to the whole batch")
-    );
-
-    $self->piwigo_photo_properties_dlg->{_multi_selection_mode_panel}->Show(1);
-    $self->piwigo_photo_properties_dlg->Layout;
+    $self->piwigo_photo_properties_dlg->SetMultiSelectionMode(
+        $self->imageviewer->GetSelectectItemsCount
+    );
 }
 
@@ -1452 +1452 @@
     my( $self ) = @_;
 
-    $self->piwigo_photo_properties_dlg->{_multi_selection_mode_panel}->Show(0);
-    $self->piwigo_photo_properties_dlg->Layout;
-
+    $self->piwigo_photo_properties_dlg->SetSingleSelectionMode;
 }
 

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

@@ -33 +33 @@
                     EVT_CLOSE
                 /;
-
+use Wx::Locale qw/:default/;
 use Carp;
 use Data::Dumper;
@@ -119 +119 @@
 }
 
+
+sub SetEnabled {
+    my ( $self ) = @_;
+
+    $self->{_properties_notebook}->Enable(1);
+}
+
+sub SetDisabled {
+    my ( $self ) = @_;
+
+    $self->{_properties_notebook}->Enable(0);
+}
+
+sub IsEnabled {
+    my ( $self ) = @_;
+
+    $self->{_properties_notebook}->IsEnabled;
+}
+
+
+sub SetMultiSelectionMode {
+    my ( $self, $count ) = @_;
+
+    $self->{_multi_selection_mode_panel}{_text1}->SetLabel(
+        sprintf(gettext("You have selected a batch of %s photos"), $count )
+    );
+
+    $self->{_multi_selection_mode_panel}{_text2}->SetLabel(
+        gettext("Changes apply to the whole batch")
+    );
+
+    $self->{_multi_selection_mode_panel}->Show(1);
+    $self->Layout;
+}
+
+
+sub SetSingleSelectionMode {
+    my ( $self ) = @_;
+
+    $self->{_multi_selection_mode_panel}->Show(0);
+    $self->Layout;
+}
 1;