Changeset 5133 for extensions/pLoader/trunk/src/Uploader/GUI/Frame.pm

Timestamp:

Mar 13, 2010, 9:14:59 PM (14 years ago)

Author:

ronosman

Message:

Feature 1504 : move language switch in Preferences.

File:

• extensions/pLoader/trunk/src/Uploader/GUI/Frame.pm (modified) (11 diffs)

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

@@ -90 +90 @@
 
 
+
 my @properties = 
     qw/
@@ -146 +147 @@
 my $ID_TREE_CTX_MENU = 20000 ;
 my $ID_IMAGEVIEWER_CTX_MENU = 20100 ;
+
 
 sub new {
@@ -269 +271 @@
     $self->_initImgTypes;   
 
-    # only refresh when calling event is finished
-    Wx::Event::EVT_IDLE(
-        $self,
-        sub {
-            my ( $self, $event ) = @_;
-            if ( $self->image_preview_refresh and $self->image_preview->IsShown ){
-                $self->set_preview_image; 
-                $self->image_preview->Refresh;
-                $self->image_preview_refresh(0);
-            }
-
-            if($self->imageviewer_refresh){
-                $self->imageviewer->Refresh;
-                $self->imageviewer_refresh(0);
-            }
-            # have to support batch mode
-            if($self->imageviewer_item_refresh){
-                map {
-                    $self->imageviewer->ItemRefresh(
-                        $_
-                    )
-                } @{$self->imageviewer->GetSelectedItems};
-                $self->imageviewer_item_refresh(0);
-            }
-
-            if(!scalar @{$self->imageviewer->GetSelectedItems} and $self->dlg_piwigo_photo_properties->{_properties_notebook}->IsEnabled){
-                $self->dlg_piwigo_photo_properties->{_properties_notebook}->Enable(0);
-            }
-
-
-            $self->OnUpdateToolbar;
-            $event->Skip;
-        }
-    );
-
     $self->imageviewer->SelectItem(
         $self->current_imageviewer_index
@@ -591 +558 @@
             $main::GS_CHUNK_SIZE => {
                 value   => sub { wxTheApp->chunk_size(@_) },
+            },
+            $main::LANGUAGE => { label => gettext("Choose a language") },
+            $main::GS_LANGUAGE => {
+                selection => sub { wxTheApp->current_language(@_) },
+                choices => [ map { sprintf($_->[0], gettext($_->[2])) } @{wxTheApp->available_languages} ],
+                pre_process => sub { my ( $value ) = @_; wxTheApp->available_languages->[$value][1] },
+                frame_callback => sub { my ( $self, $ctrl, $event ) = @_;
+                    Wx::LogMessage(
+                        sprintf(
+                            "%s : %s",  
+                            gettext("pLoader needs to be restarted to display the new selected language"),
+                            gettext(wxTheApp->available_languages->[$event->GetSelection][2])
+                        )
+                    );
+                    wxTheApp->layout_clean(1);
+                },
             },
         }    
@@ -917 +900 @@
 }
 
-sub OnChooseLanguage {
-    my ( $self ) = @_;    
-
-  my $languages = wxTheApp->available_languages;
-
-
-  my $dialog = new Wx::SingleChoiceDialog( 
-    undef, 
-    gettext( "Choose a language" ), 
-    gettext( "Choose a language" ),
-    [ map { sprintf($_->[0], gettext($_->[2])) } @$languages ] 
-  );
-
-  if( $dialog->ShowModal() == wxID_OK ) {
-    wxTheApp->current_language(
-        $languages->[$dialog->GetSelection][1]
-    );
-
-    Wx::LogMessage(
-        sprintf(
-            "%s : %s",  
-            gettext("pLoader needs to be restarted to display the new selected language"),
-            gettext($languages->[$dialog->GetSelection][2])
-        )
-    );
-    wxTheApp->layout_clean(1);
-  }
-
-  $dialog->Destroy;
-
-}
 
 sub OnDefaultPhotoNameChanged {
@@ -1182 +1134 @@
     Wx::Event::EVT_MENU( $self, 103, \&OnUploadImages );
     Wx::Event::EVT_MENU( $self, 104, \&OnGlobalSettings );
-    #Wx::Event::EVT_MENU( $self, 105, \&OnChooseLanguage );
     Wx::Event::EVT_CHOICE( $self, 106, \&OnPhotoSelMode );
     Wx::Event::EVT_TREE_SEL_CHANGED( $self, $self->tree, \&OnTreeSelChanged );
@@ -1208 +1159 @@
     Wx::Event::EVT_BUTTON( $self, $main::PHOTO_PROPERTIES_UPLOAD, \&OnUploadImages );
     Wx::Event::EVT_BUTTON( $self, $self->imageviewer->add_button->GetId, \&OnAddImages );
+
+    # only refresh when calling event is finished
+    Wx::Event::EVT_IDLE(
+        $self,
+        sub {
+            my ( $self, $event ) = @_;
+
+            if ( $self->image_preview_refresh and $self->image_preview->IsShown ){
+                $self->set_preview_image; 
+                $self->image_preview->Refresh;
+                $self->image_preview_refresh(0);
+            }
+
+            if($self->imageviewer_refresh){
+                $self->imageviewer->Refresh;
+                $self->imageviewer_refresh(0);
+            }
+
+            if($self->imageviewer_item_refresh){
+                # for batch mode
+                map {
+                    $self->imageviewer->ItemRefresh(
+                        $_
+                    )
+                } @{$self->imageviewer->GetSelectedItems};
+                $self->imageviewer_item_refresh(0);
+            }
+
+            if(!scalar @{$self->imageviewer->GetSelectedItems} and $self->dlg_piwigo_photo_properties->{_properties_notebook}->IsEnabled){
+                $self->dlg_piwigo_photo_properties->{_properties_notebook}->Enable(0);
+            }
+
+            $self->OnUpdateToolbar;
+            $event->Skip;
+        }
+    );
 
 }
@@ -1939 +1926 @@
 
 
-        $tb->AddTool( $_->[0], $_->[1], $tb_icon1, $tb_icon2, wxITEM_NORMAL, $_->[1] );
+        $tb->AddTool( $_->[0], $_->[1], $tb_icon1, $tb_icon2, wxITEM_NORMAL, $_->[6] );
         $tb->EnableTool( $_->[0], $_->[4]);
     }
@@ -1945 +1932 @@
         [
             101, 
-            gettext("Add photo"), 
+            gettext("Add photos"), 
             wxTheApp->resource_path('tb_add.png'), 
             wxBITMAP_TYPE_PNG, 
             1, 
             wxTheApp->resource_path('tb_add.png'), 
-            gettext("Add photo for resizing and uploading")
+            gettext("Add photos for resizing and uploading")
         ],
         [
@@ -1959 +1946 @@
             1, 
             wxTheApp->resource_path('tb_remove.png'),
-            gettext("Remove photo from selection. Files are not deleted ")
+            gettext("Remove selected photos. Original files are not deleted ")
         ],
-#        [
-#            103, 
-#            gettext("Upload to Piwigo"), 
-#            wxTheApp->resource_path('tb_upload.png'), 
-#            wxBITMAP_TYPE_PNG, 
-#            wxTheApp->use_offline ? 0 : 1, 
-#            wxTheApp->resource_path('tb_upload.png'),
-#            gettext("Upload photos to Piwigo.")
-#        ],
         [
             104, 
@@ -1979 +1957 @@
             gettext("Change global settings.")
         ],
-#        [
-#            105, 
-#            gettext("Language choice"), 
-#            wxTheApp->resource_path('tb_i18n.png'), 
-#            wxBITMAP_TYPE_PNG, 
-#            1, 
-#            wxTheApp->resource_path('tb_i18n.png'),
-#            gettext("Language choice")
-#        ],
     
     );