Changeset 3362

Timestamp:

May 28, 2009, 9:28:28 PM (15 years ago)

Author:

ronosman

Message:

Feature 1015 added : save current image selection and reload preview when pLoader starts.

Location:

extensions/pLoader/trunk/src/Uploader/GUI

Files:

• wxApp.pm (modified) (2 diffs)
• wxFrameAUI.pm (modified) (11 diffs)
• wxImageListCtrl.pm (modified) (2 diffs)

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

@@ -894 +894 @@
     my $prev_h = $config->ReadInt( "PreviewHeight", 300 );
     my $perspective = $config->Read( "Perspective" );
+    my $imageviewer_index = $config->ReadInt( "ImageviewerIndex", 0 );
     
     #printf("Config x %s, y %s, w %s, h %s, prev_w %s, prev_h %s\n", $x, $y, $w, $h, $prev_w, $prev_h);
@@ -915 +916 @@
             preview_h => $prev_h,
             perspective => $perspective,
+            imageviewer_index => $imageviewer_index,
         }
     );

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

@@ -24 +24 @@
 use Wx::DND;
 use Wx qw/
-             wxAUI_DOCKART_PANE_BORDER_SIZE
              wxNullBitmap
              wxID_OK
@@ -340 +339 @@
           preview_h
           perspective
+          current_imageviewer_index
       /;
 __PACKAGE__->mk_accessors( @properties );
@@ -392 +392 @@
         $params->{perspective}
     );
+    
+    $self->current_imageviewer_index(
+        $params->{imageviewer_index}||0
+    );
 
     $self->pwg( $params->{pwg} );
@@ -452 +456 @@
     $self->_InitEventHandlers;
     $self->_initImgTypes;   
+
+
+    $self->imageviewer->SelectItem(
+        $self->current_imageviewer_index
+    ) if $self->imageviewer->GetItemCount;
    
     $self;
@@ -734 +743 @@
     $self->init_panels;
 
-    #if(!$self->imagelist->wx_thumb_imglist->GetImageCount){
-    #    $self->imageviewer->Show(0);
-    #}
-
-    #    my $imglistpage = [
-    #        [
-    #            $self->imageviewer, 
-    #            gettext("Photo selection"),
-    #            '../res/images.png', 
-    #            wxBITMAP_TYPE_PNG,
-    #        ],
-    #    ];
-    
-
-
     $self->init_aui;
     $self->init_dnd_targets;
-    #$self->_populate_notebook($self->notebook, $imglistpage, 1);
 
     if( $self->imagelist->wx_thumb_imglist->GetImageCount){
@@ -760 +753 @@
             $self->imagelist->wx_thumb_imglist
         );
+       
     }
 
@@ -980 +974 @@
         ->ToolbarPane->Top->Row( 1 )->LeftDockable( 0 )->RightDockable( 0 ) ) if defined $self->toolbar;
 
-    if( $self->perspective){
+    if($self->perspective){
         $self->manager->LoadPerspective($self->perspective) if $self->perspective =~ /getting_started/;
     }
@@ -1504 +1498 @@
 sub OnImageViewerItemActivated {
     my( $self, $event ) = @_;
+    
+    $self->current_imageviewer_index(
+        $event->GetIndex
+    );
 
     $self->OnPhotoProperties;
@@ -1514 +1512 @@
     my $indx = $event->GetIndex;
 
+    $self->_on_imageviewer_item_selected($indx);
     # retrieve photo info for the last selected photo
-    $self->imagelist->SetCurrentImage($indx);
+    $event->Skip;
+}
+
+sub _on_imageviewer_item_selected {
+    my ( $self, $index ) = @_;  
+
+    $self->current_imageviewer_index($index);
+    $self->imagelist->SetCurrentImage($index);
     
     $self->imagelist->image_selection(
@@ -1527 +1533 @@
     $self->image_preview->Refresh;
 
-    my $bmp =         Wx::Bitmap->new( 
+    my $bmp = Wx::Bitmap->new( 
             $self->imagelist->current_image->preview_file, 
             $self->GetWxBitmapType($self->imagelist->type), 
@@ -1785 +1791 @@
     ( $params->{'PreviewWidth'}, $params->{'PreviewHeight'} ) = $self->image_preview->GetSizeWH ;
     $params->{Perspective} = $self->manager->SavePerspective;
+    $params->{ImageviewerIndex} = $self->current_imageviewer_index;
     
 

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

@@ -39 +39 @@
              wxLIST_NEXT_ALL
              wxLIST_STATE_SELECTED
-             wxLIST_STATE_DONTCARE 
+             wxLIST_STATE_DONTCARE
+             wxLIST_STATE_FOCUSED 
          /;
 use Wx::Event qw/
@@ -154 +155 @@
 }
 
+sub SelectItem {
+    my ( $self, $index ) = @_;
 
+    $self->SetItemState(
+        $index,
+        wxLIST_STATE_SELECTED,
+        wxLIST_STATE_SELECTED
+    );  
+}
 
 1;