Changeset 6520

Timestamp:

Jun 11, 2010, 9:25:24 AM (14 years ago)

Author:

ronosman

Message:

Add thumbnails in progress list.

Location:

extensions/pLoader/trunk/src/Uploader/GUI

Files:

• Frame.pm (modified) (1 diff)
• ImageProgressDlg.pm (modified) (2 diffs)
• ListCtrlProgress.pm (modified) (7 diffs)

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

@@ -707 +707 @@
                 cancel_cbk => sub { wxTheApp->cancel_queues },
                 column_item_data => {
-                    0 => sub { my ( $image ) = @_; $image->{site_name} },
-                    1 => sub { my ( $image ) = @_; 1+$image->{add_rank} },
+                    0 => sub { return undef },
+                    1 => sub { my ( $image ) = @_; $image->{site_name} },
                     2 => sub { my ( $image ) = @_; sprintf("%u", $image->{progress}) },
                     3 => sub { my ( $image ) = @_; $image->{status} },
-                    4 => sub { my ( $image ) = @_; $image->{file} },
                 },
+                columns => [ map{ gettext $_ } qw/
+                    Photo
+                    Name
+                    Progress
+                    Status 
+                    /
+                ],
             }
         )

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

@@ -65 +65 @@
 
     $self->columns(
-        ['Name', 'Rank', '%', 'Status', 'File']
+        $params->{columns},
     );
 
@@ -121 +121 @@
     my $item = $image->{add_rank};
     $self->listctrl->replace_item_data($item, $image);
-}
-
-
-sub auto_size_columns {
-    my ( $self ) = @_;
-
-    map{
-       $self->listctrl->SetColumnWidth($_, -1);
-    }(0..$self->listctrl->GetColumnCount);
-
+    $self->listctrl->replace_item_wximage(
+        $item,
+        $image->{wx_thumb_file}
+    );
 }
 

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

@@ -5 +5 @@
     wxDefaultSize
     wxGA_SMOOTH
+    wxBITMAP_TYPE_JPEG
+    wxIMAGE_LIST_SMALL
 /;
 
@@ -14 +16 @@
         column_item_data
         item_data
+        wx_imagelist
+        wx_images
+        thumb_size
     /
 );
@@ -25 +30 @@
     my ( $self ) = $class->SUPER::new(@_);
 
+    $self->thumb_size(48);
+
     $self->progress_bars([]);
     $self->item_data([]);
+    $self->wx_imagelist(
+        Wx::ImageList->new(
+            $self->thumb_size, $self->thumb_size, 1
+        )
+    );
+
+
+    $self->SetImageList( $self->wx_imagelist, wxIMAGE_LIST_SMALL ) ;
+
+
+    $self->wx_images([]);
 
     Wx::Event::EVT_PAINT(
@@ -62 +80 @@
 
 
+sub replace_item_wximage {
+    my ( $self, $item, $filename ) = @_;
+
+    unless(defined $self->wx_images->[$item]){
+        $self->wx_images->[$item] = resize_to(
+            Wx::Bitmap->new( 
+                $filename, 
+                wxBITMAP_TYPE_JPEG,
+            ),
+            $self->thumb_size
+        );
+
+        $self->wx_imagelist->Add(
+            $self->wx_images->[$item]
+        );
+
+    }
+
+}
+
+
+sub resize_to {
+    my( $image, $size ) = @_;
+
+    if( $image->GetWidth != $size || $image->GetHeight != $size ) {
+        return Wx::Bitmap->new
+          ( Wx::Image->new( $image )->Rescale( $size, $size ) );
+    } else {
+        return $image;
+    }
+}
+
 sub add_progress_items {
     my ( $self, $added_items ) = @_;
@@ -91 +141 @@
 
 
+sub OnGetItemColumnImage {
+    my ( $self, $item, $column ) = @_;
+
+    my $indx = -1;
+    if( 0 == $column ){
+        $indx = $item;
+    }
+
+    $indx;
+}
+
 
 sub get_item_progress_rect {
@@ -96 +157 @@
 
     my $rect = $self->GetItemRect($item);
-    #my $pos = $self->GetItemPosition($item);
+
     # cumulate columns widths. If progress bar is column 4, 
     # cumulate columns widths 0, 1, 2, 3
@@ -154 +215 @@
 
     $progress_bar->Move(
-        $bar_pos
+        Wx::Point->new(
+            $bar_pos->x,
+            $bar_pos->y + $self->thumb_size/3
+        )
     );
 
     $progress_bar->SetSize(
-        $rect->GetSize
+        [ $rect->GetWidth, $self->thumb_size/3 ]
     );
 }