diff -r 78ad99c24f08 -r 420f6808bf21 photosgallery/viewframework/plugins/gridviewplugin/data/glxgridviewdata.rss
--- a/photosgallery/viewframework/plugins/gridviewplugin/data/glxgridviewdata.rss	Tue May 25 12:42:31 2010 +0300
+++ b/photosgallery/viewframework/plugins/gridviewplugin/data/glxgridviewdata.rss	Wed Jun 09 09:41:51 2010 +0300
@@ -128,16 +128,12 @@
                   MENU_ITEM { command = EGlxCmdSend;
                               txt = qtn_options_send_via; 
                               flags = EEikMenuItemSpecific; },
-                  MENU_ITEM { command = EGlxCmdSingleClickSend;
-                                txt = qtn_options_send_via;},   
                   MENU_ITEM { command = EGlxCmdAiwShareOnOvi; 
                            /* txt comes from ShareOnline 4.3 */ 
                            flags = EEikMenuItemSpecific;},        
                   MENU_ITEM { command = EGlxCmdDelete;
                               txt = qtn_lgal_options_delete; 
                               flags = EEikMenuItemSpecific; }, 
-                  MENU_ITEM { command = EGlxCmdSingleClickDelete;
-                            txt = qtn_lgal_options_delete;}, 
                    MENU_ITEM { command = EGlxCmdSlideshowPlay;
                               txt = qtn_lgal_options_slideshow;
                               flags = EEikMenuItemSpecific;},
@@ -145,8 +141,6 @@
                               txt = qtn_lgal_options_slideshow;
                               cascade = r_grid_shw_menu; },
                   MENU_ITEM { command = EGlxCmdAiwEdit; 
-                              txt = qtn_lgal_options_edit; }, 
-                  MENU_ITEM { command = EGlxCmdAiwSingleClickEdit; 
                               txt = qtn_lgal_options_edit; 
                               flags = EEikMenuItemSpecificListQuery;}, 
                   MENU_ITEM { command = EGlxCmdDetails;
@@ -161,10 +155,6 @@
                   MENU_ITEM { command = EGlxCmdAddTag;
                               txt = qtn_lgal_options_properties_add_tag;
                               flags = EEikMenuItemSpecific; }, 
-                  MENU_ITEM { command = EGlxCmdSingleClickAddToAlbum;
-                              txt = qtn_lgal_options_add_to_album;},
-                  MENU_ITEM { command = EGlxCmdSingleClickAddTag;
-                              txt = qtn_lgal_options_properties_add_tag;}, 
                   MENU_ITEM { command = EAknCmdHelp; 
                               txt = qtn_options_help; },
                   MENU_ITEM { command = EAknCmdExit; 
@@ -182,21 +172,15 @@
                   MENU_ITEM { command = EGlxCmdSend;
                               txt = qtn_options_send_via; 
                               flags = EEikMenuItemSpecific; },  
-                  MENU_ITEM { command = EGlxCmdSingleClickSend;
-                              txt = qtn_options_send_via;},  
                   MENU_ITEM { command = EGlxCmdAiwShareOnOvi; 
                            /* txt comes from ShareOnline 4.3 */ 
                                flags = EEikMenuItemSpecific;},  
                   MENU_ITEM { command = EGlxCmdRemoveFrom;
                               txt = qtn_lgal_options_remove_from_album; 
                               flags = EEikMenuItemSpecific; },
-                  MENU_ITEM { command = EGlxCmdSingleClickRemoveFrom;
-                              txt = qtn_lgal_options_remove_from_album;},
                   MENU_ITEM { command = EGlxCmdDelete;
                               txt = qtn_lgal_options_delete; 
                               flags = EEikMenuItemSpecific; },
-                  MENU_ITEM { command = EGlxCmdSingleClickDelete;
-                              txt = qtn_lgal_options_delete;},
                   MENU_ITEM { command = EGlxCmdSlideshowPlay;
                               txt = qtn_lgal_options_slideshow;
                               flags = EEikMenuItemSpecific;},
@@ -204,8 +188,6 @@
                               txt = qtn_lgal_options_slideshow;
                               cascade = r_grid_shw_menu; },
                   MENU_ITEM { command = EGlxCmdAiwEdit; 
-                              txt = qtn_lgal_options_edit; }, 
-                  MENU_ITEM { command = EGlxCmdAiwSingleClickEdit; 
                               txt = qtn_lgal_options_edit; 
                               flags = EEikMenuItemSpecificListQuery;}, 
                   MENU_ITEM { command = EGlxCmdDetails;
@@ -217,10 +199,9 @@
                   MENU_ITEM { command = EGlxCmdAddToAlbum;
                               txt = qtn_lgal_options_add_to_album; 
                               flags = EEikMenuItemSpecific; },
-                  MENU_ITEM { command = EGlxCmdSingleClickAddToAlbum;
-                              txt = qtn_lgal_options_add_to_album;},
-                  MENU_ITEM { command = EGlxCmdSingleClickAddTag;
-                              txt = qtn_lgal_options_properties_add_tag;}, 
+                  MENU_ITEM { command = EGlxCmdAddTag;
+                              txt = qtn_lgal_options_properties_add_tag;
+                              flags = EEikMenuItemSpecific; }, 
                   MENU_ITEM { command = EAknCmdHelp; 
                               txt = qtn_options_help; },
                   MENU_ITEM { command = EAknCmdExit; 
@@ -238,21 +219,15 @@
         MENU_ITEM { command = EGlxCmdSend;
                     txt = qtn_options_send_via; 
                     flags = EEikMenuItemSpecific; },
-        MENU_ITEM { command = EGlxCmdSingleClickSend;
-                    txt = qtn_options_send_via;},  
         MENU_ITEM { command = EGlxCmdAiwShareOnOvi; 
                  /* txt comes from ShareOnline 4.3 */ 
                  flags = EEikMenuItemSpecific;},  
         MENU_ITEM { command=EGlxCmdRemoveFrom; 
                     txt = qtn_lgal_options_remove_from_tag; 
                     flags = EEikMenuItemSpecific; },
-        MENU_ITEM { command=EGlxCmdSingleClickRemoveFrom; 
-                    txt = qtn_lgal_options_remove_from_tag;},
         MENU_ITEM { command = EGlxCmdDelete;
                     txt = qtn_lgal_options_delete; 
                     flags = EEikMenuItemSpecific; }, 
-        MENU_ITEM { command = EGlxCmdSingleClickDelete;
-                    txt = qtn_lgal_options_delete;}, 
         MENU_ITEM { command = EGlxCmdSlideshowPlay;
                     txt = qtn_lgal_options_slideshow;
                     flags = EEikMenuItemSpecific;},
@@ -260,8 +235,6 @@
                     txt = qtn_lgal_options_slideshow;
                     cascade = r_grid_shw_menu; },
         MENU_ITEM { command = EGlxCmdAiwEdit; 
-                    txt = qtn_lgal_options_edit; }, 
-        MENU_ITEM { command = EGlxCmdAiwSingleClickEdit; 
                     txt = qtn_lgal_options_edit; 
                     flags = EEikMenuItemSpecificListQuery;}, 
         MENU_ITEM { command = EGlxCmdDetails;
@@ -270,13 +243,12 @@
                     txt = qtn_options_list_mark_all;},   
 		MENU_ITEM { command = EAknUnmarkAll;
                     txt = qtn_options_list_unmark_all;},
-        MENU_ITEM { command = EGlxCmdSingleClickAddToAlbum;
-                    txt = qtn_lgal_options_add_to_album;},
+        MENU_ITEM { command = EGlxCmdAddToAlbum;
+                    txt = qtn_lgal_options_add_to_album;
+                    flags = EEikMenuItemSpecific; },
         MENU_ITEM { command = EGlxCmdAddTag;
                     txt = qtn_lgal_options_properties_add_tag; 
                     flags = EEikMenuItemSpecific; },
-        MENU_ITEM { command = EGlxCmdSingleClickAddTag;
-                    txt = qtn_lgal_options_properties_add_tag;}, 
          MENU_ITEM { command = EAknCmdHelp; 
                      txt = qtn_options_help; },
          MENU_ITEM { command = EAknCmdExit;