diff -r 9a9c174934f5 -r 57d388cc48c1 photosgallery/viewframework/plugins/fullscreenviewplugin/data/glxfullscreenviewdata.rss
--- a/photosgallery/viewframework/plugins/fullscreenviewplugin/data/glxfullscreenviewdata.rss	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/plugins/fullscreenviewplugin/data/glxfullscreenviewdata.rss	Tue Feb 02 00:10:37 2010 +0200
@@ -145,8 +145,7 @@
                             txt = qtn_lgal_options_slideshow; 
                             cascade = r_glx_fullscreen_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 = EGlxCmdDetails;
                             txt = qtn_lgal_options_details; },  
                 MENU_ITEM { command = EGlxCmdAddToAlbum;
@@ -200,8 +199,7 @@
                         txt = qtn_lgal_options_slideshow; 
                         cascade = r_glx_fullscreen_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 = EGlxCmdDetails;
                         txt = qtn_lgal_options_details; },  
             MENU_ITEM { command = EGlxCmdAddToAlbum;
@@ -254,8 +252,7 @@
                        txt = qtn_lgal_options_slideshow; 
                        cascade = r_glx_fullscreen_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 = EGlxCmdDetails;
                        txt = qtn_lgal_options_details; },  
            MENU_ITEM { command = EGlxCmdAddToAlbum;
@@ -363,7 +360,7 @@
         {
         CBA_BUTTON
             {
-            id = EGlxCmdOptions;
+            id = EAknSoftkeyOptions;
             txt = text_softkey_option;
             },
         CBA_BUTTON