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

Timestamp:

Mar 30, 2010, 2:29:37 PM (14 years ago)

Author:

ronosman

Message:

Feature 1554 added : use caption as prefix.

File:

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

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

@@ -305 +305 @@
                     $self->imagelist->current_image->site_name;
                 },
-                pre_process => sub { sub { $self->imagelist->GetCurrentImageDefaultName(@_); } },
+                pre_process => sub { sub { $self->imagelist->GetCurrentImageCaption(@_); } },
                 choices =>
                 [
-                    map { gettext $_ } @{wxTheApp->default_photo_names}
+                    map { gettext $_ } @{wxTheApp->caption_patterns}
                 ],
                 frame_callback => sub { $self->imageviewer_item_refresh(1); },
@@ -361 +361 @@
     $self->global_settings(
         {
-            $main::DEFAULT_PHOTO_CAPTION => { label => gettext("Default photo caption") },
+            $main::DEFAULT_PHOTO_CAPTION => { label => gettext("Default caption pattern") },
             $main::CPANE_RESIZE_ADVANCED => { label => gettext("Advanced") },
             $main::CPANE_HD_ADVANCED => { label => gettext("Advanced") },
@@ -370 +370 @@
             $main::GS_CLOSE => { label => gettext("Close")},
             $main::GS_DEFAULT_PHOTO_CAPTION => {
-                string_selection => sub { $self->imagelist->default_photo_name(@_) },
+                string_selection => sub { $self->imagelist->default_caption_pattern(@_) },
                 choices =>
                 [
-                    map { gettext $_ } @{wxTheApp->default_photo_names}
+                    map { gettext $_ } @{wxTheApp->caption_patterns}
                 ],
-                pre_process => sub { my ( $value ) = @_; wxTheApp->eng_default_photo_names->{$value} },
+                pre_process => sub { my ( $value ) = @_; wxTheApp->eng_caption_patterns->{$value} },
                 frame_callback => sub { 
                     my( $self, $ctrl, $event ) = @_; 
@@ -381 +381 @@
                 },
             },
-            $main::PHOTO_CAPTION_PREFIX => { label => gettext("Photo caption  prefix") },
+            $main::PHOTO_CAPTION_PREFIX => { label => gettext("Default caption") },
             $main::GS_PHOTO_CAPTION_PREFIX => {
-                value => sub { $self->imagelist->default_name_prefix(@_) },
+                value => sub { $self->imagelist->default_caption(@_) },
             },
             $main::GS_AUTO_ROTATE => {
@@ -895 +895 @@
 
 
-sub OnDefaultPhotoNameChanged {
-    my ( $self ) = @_;
-    
-    Wx::LogMessage("New default_photo_name %s", $self->imagelist->default_photo_name);    
-}
-
-
 sub OnGeneralSettingsClose {
     my ( $self, $event ) = @_;
@@ -1073 +1066 @@
     Wx::Event::EVT_BUTTON( $self, $main::PHOTO_PROPERTIES_UPLOAD, \&OnUploadImages );
     Wx::Event::EVT_BUTTON( $self, $self->imageviewer->add_button->GetId, \&OnAddImages );
-
+    Wx::Event::EVT_KEY_DOWN($self, \&OnKeyDown );
 
     # only refresh when calling event is finished
@@ -1513 +1506 @@
 
 }
+
 
 sub OnUploadImages {