Changeset 3504 for extensions/pLoader

Timestamp:

Jul 3, 2009, 2:23:11 PM (15 years ago)

Author:

ronosman

Message:

Feature 1039 added. Feature 1040 added. Filter and add Piwigo tags.
The tag list is filtered based on user input ( tag beginning with same characters ) or tag status ( All, Selected, Not selected ).
When a search result is empty, user is asked for tag creation confirmation.
When a search result returns a single result, the user input is autocompleted and the tag is selected if user validates with Enter.

Location:

extensions/pLoader/trunk/src/Uploader

Files:

• GUI/wxChoiceFilteredPanel.pm (added)
• GUI/wxChoiceGridPanel.pm (deleted)
• GUI/wxFrameAUI.pm (modified) (5 diffs)
• PWG/WebServices.pm (modified) (1 diff)

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

@@ -24 +24 @@
 use Wx::DND;
 use Wx qw/
+             wxYES_NO
+             wxYES
+             wxICON_QUESTION
              wxITEM_NORMAL
              wxNullBitmap
@@ -369 +372 @@
 use Uploader::GUI::wxImageListCtrl;
 use Uploader::GUI::wxImageProcessingProgressDlg;
-use Uploader::GUI::wxChoiceGridPanel;
+use Uploader::GUI::wxChoiceFilteredPanel;
 use Wx::Html;
 use Uploader::GUI::wxHtmlWindow;
@@ -428 +431 @@
         sub { $self->UploadImagesViewerRefresh(@_) }
     );
-
 
 
@@ -718 +720 @@
 
     $self->image_tags(
-        sub { $self->imagelist->current_image->site_tags(@_) }
+        sub { eval { $self->imagelist->current_image->site_tags(@_) } }
     );
 
     $self->piwigo_tags(
-        wxTheApp->pwg->tags||[]
+        sub { wxTheApp->pwg->tags }
     );  
+}
+
+sub _create_piwigo_tag {
+    my ( $self, $name ) = @_;
+    
+    if(
+        Wx::MessageBox( 
+            sprintf(
+                gettext("Do you want to create \"%s\" ?"), 
+                $name,
+            ),
+            gettext("Piwigo search information"),
+            wxYES_NO | wxICON_QUESTION, 
+        ) == wxYES 
+    ){    
+        $self->pwg->AddTags($name);
+        $self->pwg->RefreshTags;
+    }
 }
 
@@ -905 +925 @@
 
     $self->image_prop_tags(
-        Uploader::GUI::wxChoiceGridPanel->new( 
+        Uploader::GUI::wxChoiceFilteredPanel->new( 
             { 
                 parentwnd    => $self,
                 choices      => $self->piwigo_tags,
-                selection    => $self->image_tags, 
+                selection    => $self->image_tags,
+                creation_callback => sub { $self->_create_piwigo_tag(@_) }, 
             }
         )    

extensions/pLoader/trunk/src/Uploader/PWG/WebServices.pm

@@ -209 +209 @@
 }
 
+sub AddTags {
+    my ( $self, $name ) = @_;
+
+    my $form = {
+        method            => 'pwg.tags.add',
+        name              => $name,
+        
+    };
+
+    my $result = $self->uagent->post(
+        $self->urlbase.'/ws.php?format=json',
+        $form
+    );
+
+    my $content = {};
+        eval {
+            $content = from_json(
+                $result->content
+            );
+        };
+
+    return ( $result->is_success, $result->status_line, $content );
+        
+} 
+
 
 sub UploadImage {