Changeset 3466

Timestamp:

Jun 26, 2009, 4:43:50 PM (15 years ago)

Author:

ronosman

Message:

Feature 1036 added. Rename a category from category list.

Location:

extensions/pLoader/trunk/src/Uploader

Files:

• GUI/wxApp.pm (modified) (2 diffs)
• GUI/wxFrameAUI.pm (modified) (6 diffs)
• PWG/WebServices.pm (modified) (1 diff)

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

@@ -896 +896 @@
                 Categories => gettext("Albums"),
                 'Add new category' => gettext("Add new album"), 
+                'Category name' => gettext("Album name :"),
+                'New category' => gettext("New album"),
             }
         );
@@ -902 +904 @@
         $self->branding(
             {
-                categorie  => gettext("categorie"),     
-                Categorie  => gettext("Categorie"),     
+                category  => gettext("categorie"),      
+                Category  => gettext("Categorie"),      
                 categories => gettext("categories"),    
                 Categories => gettext("Categories"),    
-                'Add new category' => gettext("Add new category"),      
+                'Add new category' => gettext("Add new category"),
+                'Category name' => gettext("Category name :"),
+                'New category' => gettext("New category"),
             }
         );

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

@@ -60 +60 @@
              wxTR_HIDE_ROOT
              wxTR_HAS_BUTTONS
+             wxTR_EDIT_LABELS
              wxMAXIMIZE
              wxOK
@@ -350 +351 @@
           EVT_MENU
           EVT_TREE_SEL_CHANGED
+          EVT_TREE_END_LABEL_EDIT
           EVT_CLOSE 
           EVT_LIST_END_LABEL_EDIT
@@ -1185 +1187 @@
            wxBORDER_NONE|
            wxCLIP_CHILDREN|
-#           wxTR_MULTIPLE|
-#           wxTR_EXTENDED|
-           wxTR_HAS_BUTTONS
-#           wxTR_HIDE_ROOT   
+           wxTR_HAS_BUTTONS|
+           wxTR_EDIT_LABELS 
         ) 
     );
@@ -1411 +1411 @@
     EVT_TREE_SEL_CHANGED( $self, $self->tree, \&OnTreeSelChanged );
     EVT_TREE_ITEM_RIGHT_CLICK( $self, $self->tree, \&OnTreeItemRightClick );
+    EVT_TREE_END_LABEL_EDIT( $self, $self->tree, \&OnTreeEndLabelEdit );
 
     EVT_LIST_END_LABEL_EDIT( $self, $self->imageviewer, \&OnImageViewerEndLabelEdit );
@@ -1543 +1544 @@
 }
 
+sub OnTreeEndLabelEdit {
+    my( $self, $event ) = @_;
+
+
+    my $category = $self->tree->GetPlData($event->GetItem);
+    my $category_id;
+    
+    $category_id = $category->{id} if 'HASH' eq ref($category) ;
+    my $comment;
+    my ( $success, $status_msg, $content ) = $self->pwg->SetInfoCategories( $event->GetLabel, $comment, $category_id);
+
+    my $ok = 1;
+    
+    if(!$success){
+        $ok = 0;
+    }
+
+    if('fail' eq $content->{stat}){
+        $ok = 0;
+    }
+
+    # method call failed
+    if(!$ok){
+        $event->Veto;
+        Wx::MessageBox( 
+            sprintf(
+                "%s %s", 
+                gettext("Update failed : "),
+                $status_msg
+            ),
+            gettext("Piwigo update error"),
+            wxOK | wxICON_EXCLAMATION, 
+        );
+        Wx::LogMessage("%s\n\n%s", Dumper($content), gettext("This function is not available. A Piwigo upgrade may resolve this issue."));
+    }
+}
 
 sub OnImageViewerItemRightClick {
@@ -1581 +1618 @@
     my $dialog = Wx::TextEntryDialog->new( 
         $self, 
-        sprintf("%s name :", wxTheApp->branding->{Category}), 
-        sprintf("Add new %s", wxTheApp->branding->{category}),
-        sprintf("New %s", wxTheApp->branding->{category}), 
+        wxTheApp->branding->{'Category name'}, 
+        wxTheApp->branding->{'Add new category'},
+        wxTheApp->branding->{'New category'}, 
     );
 

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

@@ -328 +328 @@
 }
 
+sub SetInfoCategories{
+    my ( $self, $name, $comment, $parentid ) = @_;
+
+    my $form = {
+        method            => 'pwg.categories.setInfo',
+        name              => $name,
+        comment           => $comment,
+        category_id       => $parentid,
+        
+    };
+
+    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 send_chunks {