* Fixes NB#89211 remove the fullscreen option from hildon2 UI

pmo-trunk-r6070

diff --git a/src/hildon2/ui/modest-main-window-ui.xml b/src/hildon2/ui/modest-main-window-ui.xml
index 9d8c53a..250f3ea 100644 (file)
--- a/src/hildon2/ui/modest-main-window-ui.xml
+++ b/src/hildon2/ui/modest-main-window-ui.xml
@@ -68,12 +68,6 @@
       <menuitem name="ViewSortMenu" action="ViewSort"/>
       <separator/>
       <menuitem name="ViewToggleFoldersMenu" action="ToggleFolders"/>
-      <menuitem name="ViewToggleFullscreenMenu" action="ViewToggleFullscreen"/>
-      <separator/>
-      <menu name="ViewShowToolbarMainMenu" action="ViewShowToolbar">
-        <menuitem name="ViewShowToolbarNormalScreenMenu" action="ViewShowToolbarNormalScreen"/>
-        <menuitem name="ViewShowToolbarFullScreenMenu" action="ViewShowToolbarFullScreen"/>
-      </menu>
       <separator/>
       <placeholder name="ViewMenuAdditions" />
    </menu>

diff --git a/src/hildon2/ui/modest-msg-edit-window-ui.xml b/src/hildon2/ui/modest-msg-edit-window-ui.xml
index 149b3c2..96f4bf6 100644 (file)
--- a/src/hildon2/ui/modest-msg-edit-window-ui.xml
+++ b/src/hildon2/ui/modest-msg-edit-window-ui.xml
@@ -54,13 +54,6 @@
     </menu>
 
     <menu name="ViewMenu" action="View">
-      <menuitem name="ViewToggleFullscreenMenu" action="ViewToggleFullscreen"/>
-      <separator/>
-      <menu name="ShowToolbarMenu" action="ShowToolbar">
-       <menuitem name="ViewShowToolbarNormalScreenMenu" action="ViewShowToolbarNormalScreen"/>
-       <menuitem name="ViewShowToolbarFullScreenMenu" action="ViewShowToolbarFullScreen"/>
-      </menu>
-      <separator/>
       <menuitem name="ViewCcFieldMenu" action="ViewCcField"/>
       <menuitem name="ViewBccFieldMenu" action="ViewBccField"/>
     </menu>

diff --git a/src/hildon2/ui/modest-msg-view-window-ui.xml b/src/hildon2/ui/modest-msg-view-window-ui.xml
index 9ece723..aee2e90 100644 (file)
--- a/src/hildon2/ui/modest-msg-view-window-ui.xml
+++ b/src/hildon2/ui/modest-msg-view-window-ui.xml
@@ -63,15 +63,8 @@
        <menuitem name="Zoom200Menu" action="Zoom200"/>
       </menu>
       <separator/>
-      <menuitem name="ViewToggleFullscreenMenu" action="ViewToggleFullscreen"/>
-      <separator/>
-      <menu name="ViewShowToolbarMenu" action="ViewShowToolbar">
-       <menuitem name="ViewShowToolbarNormalScreenMenu" action="ViewShowToolbarNormalScreen"/>
-       <menuitem name="ViewShowToolbarFullScreenMenu" action="ViewShowToolbarFullScreen"/>
-      </menu>
-      <separator/>
-      <menuitem name="ViewPreviousMessageMenu" action="ViewPreviousMessage"/>
       <menuitem name="ViewNextMessageMenu" action="ViewNextMessage"/>
+      <menuitem name="ViewPreviousMessageMenu" action="ViewPreviousMessage"/>
     </menu>
 
     <menu name="AttachmentsMenu" action="Attachments">