Changeset 3365 for extensions/pLoader

Timestamp:

May 29, 2009, 10:31:24 PM (15 years ago)

Author:

ronosman

Message:

Feature 1016 added : popup menu for Photo selection with "Prperties" and "Preview" menu items.

Location:

extensions/pLoader/trunk

Files:

• res/mnu_folder_new.png (added)
• res/mnu_preview.png (added)
• res/mnu_properties.png (added)
• res/mnu_refresh.png (added)
• src/Uploader/GUI/wxFrameAUI.pm (modified) (9 diffs)

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

@@ -351 +351 @@
           EVT_LIST_ITEM_SELECTED
           EVT_LIST_ITEM_ACTIVATED
+          EVT_LIST_ITEM_RIGHT_CLICK
           EVT_TREE_ITEM_RIGHT_CLICK
           EVT_LIST_KEY_DOWN
@@ -370 +371 @@
 
 my $ID_TREE_CTX_MENU = 20000 ;
+my $ID_IMAGEVIEWER_CTX_MENU = 20100 ;
 
 sub new {
@@ -379 +381 @@
                                       [ $params->{x}, $params->{y} ],
                                       [ $params->{width}, $params->{height} ],
-                                      wxDEFAULT_FRAME_STYLE|wxMAXIMIZE
+                                      wxDEFAULT_FRAME_STYLE
                                    );
     $self->preview_w(
@@ -1025 +1027 @@
     my ( $self ) = @_;
 
+    $self->manager->GetPane("photo_properties")->Show(1);
+    $self->manager->Update();    
+        
+}
+
+sub OnPreview {
+    my ( $self ) = @_;
+
     $self->manager->GetPane("preview")->Float->Show(1);
-    $self->manager->GetPane("photo_properties")->Show(1);
     $self->manager->Update();    
         
@@ -1296 +1305 @@
     EVT_TREE_SEL_CHANGED( $self, $self->tree, \&OnTreeSelChanged );
     EVT_TREE_ITEM_RIGHT_CLICK( $self->tree, $self->tree, \&OnTreeItemRightClick );
+
     EVT_LIST_END_LABEL_EDIT( $self, $self->imageviewer, \&OnImageViewerEndLabelEdit );
     EVT_LIST_ITEM_ACTIVATED( $self, $self->imageviewer, \&OnImageViewerItemActivated );
     EVT_LIST_ITEM_SELECTED($self, $self->imageviewer, \&OnImageViewerItemSelected) ;
+    EVT_LIST_ITEM_RIGHT_CLICK($self, $self->imageviewer, \&OnImageViewerItemRightClick) ;
+
     EVT_LIST_KEY_DOWN($self, $self->imageviewer, \&OnImageViewerKeyDown) ;
+
     EVT_CLOSE( $self, \&OnClose );
     Wx::Event::EVT_UPDATE_UI( $self, $self, \&OnUpdateUI );
@@ -1306 +1319 @@
     Wx::Event::EVT_MENU( $self, 1+$ID_TREE_CTX_MENU, \&OnAddCategories );
     Wx::Event::EVT_MENU( $self, 2+$ID_TREE_CTX_MENU, \&OnRefreshCategories );
+    Wx::Event::EVT_MENU( $self, 1+$ID_IMAGEVIEWER_CTX_MENU, \&OnPhotoProperties );
+    Wx::Event::EVT_MENU( $self, 2+$ID_IMAGEVIEWER_CTX_MENU, \&OnPreview );
+
+
 }
 
@@ -1415 +1432 @@
     map {
         $ctx_mnu->Append(
-            @$_
-        );
+            @$_[0..2]
+        )->SetBitmap(Wx::Bitmap->new($_->[3],wxBITMAP_TYPE_PNG));
     }
     (
@@ -1428 +1445 @@
                 gettext("to the currently selected"),
                 wxTheApp->branding->{category},
-            )
+            ),
+            '../res/mnu_folder_new.png',
         ],
         [
@@ -1436 +1454 @@
                 "Refresh %s list.",
                 wxTheApp->branding->{category},
-            )
+            ),
+            '../res/mnu_refresh.png',
         ],
     );
-    $self->PopupMenu($ctx_mnu, $point);
+
+    $self->PopupMenu($ctx_mnu, wxDefaultPosition);
+        
+}
+
+
+sub OnImageViewerItemRightClick {
+    my( $self, $event ) = @_;
+
+    my $point = $event->GetPoint ;
+    my $ctx_mnu = Wx::Menu->new;
+    
+    map {
+        $ctx_mnu->Append(
+            @$_[0..2]
+        )->SetBitmap(Wx::Bitmap->new($_->[3],wxBITMAP_TYPE_PNG));
+    }
+    (
+        [
+            1+$ID_IMAGEVIEWER_CTX_MENU, 
+            gettext("Properties"),
+            gettext("Modify photo properties"),
+            '../res/mnu_properties.png',
+        ],
+        [
+            2+$ID_IMAGEVIEWER_CTX_MENU, 
+            gettext("Preview"),
+            gettext("Display photo preview"),
+            '../res/mnu_preview.png',
+        ],
+    );
+    
+    $self->PopupMenu($ctx_mnu, wxDefaultPosition);
+        
         
 }