Changeset 3383 for extensions/pLoader

Timestamp:

Jun 1, 2009, 4:04:58 PM (15 years ago)

Author:

ronosman

Message:

Bug 1004 fixed : keep category tree layout after adding a new category.

Location:

extensions/pLoader/trunk/src/Uploader

Files:

• GUI/wxFrameAUI.pm (modified) (8 diffs)
• PWG/WebServices.pm (modified) (2 diffs)

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

@@ -867 +867 @@
     $self->general_settings_panel->Show(0);
 
-if(0){
-    $self->image_preview(
-        Wx::StaticBitmap->new(
-            $self,
-            -1,
-            wxNullBitmap,
-            wxDefaultPosition,
-            [$self->preview_w, $self->preview_h]
-        )
-    );
-}
     $self->image_preview(
         Uploader::GUI::wxImagePreview->new(
@@ -1005 +994 @@
     $self->manager->AddPane
       ( $self->image_preview, Wx::AuiPaneInfo->new->Name( "preview" )
-        ->Floatable(1)->Resizable->CloseButton(1));
+        ->Floatable(1)->Fixed->CloseButton(1));
 
 
@@ -1218 +1207 @@
     ) if defined wxTheApp->pwg ;
     
-    $self->tree->ExpandAll;
+    #$self->tree->ExpandAll;
 
 }
@@ -1256 +1245 @@
           $name = $_->[0];
       }
-       $id = $tree->AppendItem( 
+
+      $id = $tree->AppendItem( 
                                    $parent_id, 
                                    $name,
@@ -1543 +1533 @@
     my ( $self, $event ) = @_;
 
-    my $item = $self->tree->GetSelection;
-
-    my $category = $self->tree->GetPlData($item);
+    my $parent_item = $self->tree->GetSelection;
+
+    my $category = $self->tree->GetPlData($parent_item);
     my $category_id;
     
@@ -1559 +1549 @@
     if( $dialog->ShowModal != wxID_CANCEL ) {
         my $name = $dialog->GetValue;
-        my ( $status, $status_msg ) = $self->pwg->AddCategories( $name, $category_id);
-        $self->_refresh_tree_categories_helper;
+        my ( $success, $status_msg, $content ) = $self->pwg->AddCategories( $name, $category_id);
+
+        if($success){
+            $self->_append_category($parent_item, $name, $content->{id});
+        }
     }
     $dialog->Destroy;
@@ -1568 +1561 @@
     my ( $self, $event ) = @_;
 
-    $self->_refresh_tree_categories_helper;
-}
-
-sub _refresh_tree_categories_helper {
+    $self->_refresh_all_categories_helper;
+}
+
+
+sub _refresh_all_categories_helper {
     my ( $self ) = @_;  
 
@@ -1580 +1574 @@
     $self->pwg->RefreshCategories();
     $self->populate_tree_categories;
+}
+
+sub _append_category {
+    my ( $self, $parent_id, $name, $id ) = @_;
+
+    $self->tree->SelectItem(
+        $self->tree->AppendItem(
+            $parent_id, 
+            $name, 
+            1, 
+            -1, 
+            itemData($id)
+        )
+    );
 }
 

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

@@ -164 +164 @@
     
     $hresult ||= {};
+
     my $categories = $hresult->{result}{categories};
-
 
     $categories;        
@@ -292 +292 @@
     );
 
-    return ( $result->is_success, $result->status_line );
+    my $content = {};
+        eval {
+            $content = from_json(
+                $result->content
+            );
+        };
+
+    return ( $result->is_success, $result->status_line, $content );
         
 }