diff -r 9a9c174934f5 -r 57d388cc48c1 photosgallery/viewframework/plugins/gridviewplugin/data/glxgridviewdata.rss
--- a/photosgallery/viewframework/plugins/gridviewplugin/data/glxgridviewdata.rss	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/plugins/gridviewplugin/data/glxgridviewdata.rss	Tue Feb 02 00:10:37 2010 +0200
@@ -152,11 +152,9 @@
                               txt = qtn_lgal_options_slideshow;
                               cascade = r_grid_shw_menu; },
                   MENU_ITEM { command = EGlxCmdAiwEdit; 
-                              txt = qtn_lgal_options_edit; 
-                              cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE;}, 
+                              txt = qtn_lgal_options_edit; }, 
                   MENU_ITEM { command = EGlxCmdAiwSingleClickEdit; 
                               txt = qtn_lgal_options_edit; 
-                              cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE;
                               flags = EEikMenuItemSpecificListQuery;}, 
                   MENU_ITEM { command = EGlxCmdDetails;
                               txt = qtn_lgal_options_details; },    
@@ -229,11 +227,9 @@
                               txt = qtn_lgal_options_slideshow;
                               cascade = r_grid_shw_menu; },
                   MENU_ITEM { command = EGlxCmdAiwEdit; 
-                              txt = qtn_lgal_options_edit; 
-                              cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE;}, 
+                              txt = qtn_lgal_options_edit; }, 
                   MENU_ITEM { command = EGlxCmdAiwSingleClickEdit; 
                               txt = qtn_lgal_options_edit; 
-                              cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE;
                               flags = EEikMenuItemSpecificListQuery;}, 
                   MENU_ITEM { command = EGlxCmdDetails;
                               txt = qtn_lgal_options_details; },    
@@ -303,11 +299,9 @@
                     txt = qtn_lgal_options_slideshow;
                     cascade = r_grid_shw_menu; },
         MENU_ITEM { command = EGlxCmdAiwEdit; 
-                    txt = qtn_lgal_options_edit; 
-                    cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE;}, 
+                    txt = qtn_lgal_options_edit; }, 
         MENU_ITEM { command = EGlxCmdAiwSingleClickEdit; 
                     txt = qtn_lgal_options_edit; 
-                    cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE;
                     flags = EEikMenuItemSpecificListQuery;}, 
         MENU_ITEM { command = EGlxCmdDetails;
                     txt = qtn_lgal_options_details; },    
@@ -506,7 +500,7 @@
         {
         CBA_BUTTON
             {
-            id = EGlxCmdOptions;
+            id = EAknSoftkeyOptions;
             txt = text_softkey_option;
             },
         CBA_BUTTON
@@ -529,7 +523,7 @@
         {
         CBA_BUTTON
             {
-            id = EGlxCmdOptions;
+            id = EAknSoftkeyOptions;
             txt = text_softkey_option;
             },
         CBA_BUTTON