From 9da610e098595e62de5d0085b3c4fe53ba135dff Mon Sep 17 00:00:00 2001
From: Jose Dapena Paz <jdapena@igalia.com>
Date: Tue, 1 Dec 2009 18:47:58 +0100
Subject: [PATCH] Moved ui files to src/widgets

---
 src/hildon2/Makefile.am                      |    9 ---
 src/hildon2/ui/modest-main-window-ui.xml     |   98 --------------------------
 src/hildon2/ui/modest-msg-edit-window-ui.xml |   93 ------------------------
 src/hildon2/ui/modest-msg-view-window-ui.xml |   70 ------------------
 src/widgets/Makefile.am                      |   10 +++
 src/widgets/ui/modest-main-window-ui.xml     |   98 ++++++++++++++++++++++++++
 src/widgets/ui/modest-msg-edit-window-ui.xml |   93 ++++++++++++++++++++++++
 src/widgets/ui/modest-msg-view-window-ui.xml |   70 ++++++++++++++++++
 8 files changed, 271 insertions(+), 270 deletions(-)
 delete mode 100644 src/hildon2/ui/modest-main-window-ui.xml
 delete mode 100644 src/hildon2/ui/modest-msg-edit-window-ui.xml
 delete mode 100644 src/hildon2/ui/modest-msg-view-window-ui.xml
 create mode 100644 src/widgets/ui/modest-main-window-ui.xml
 create mode 100644 src/widgets/ui/modest-msg-edit-window-ui.xml
 create mode 100644 src/widgets/ui/modest-msg-view-window-ui.xml

diff --git a/src/hildon2/Makefile.am b/src/hildon2/Makefile.am
index b973121..6e8f794 100644
--- a/src/hildon2/Makefile.am
+++ b/src/hildon2/Makefile.am
@@ -102,14 +102,6 @@ libmodest_ui_la_LIBADD = \
 	$(MODEST_HILDON_NOTIFY_LIBS) \
 	$(MODEST_CALENDAR_WIDGETS_LIBS)
 
-UI_FILES=\
-	ui/modest-main-window-ui.xml \
-	ui/modest-msg-edit-window-ui.xml \
-	ui/modest-msg-view-window-ui.xml
-
-uidir = $(datadir)/modest/ui
-ui_DATA = $(UI_FILES)
-
 serviceentry_DATA   = com.nokia.modest.service
 desktopentry_DATA   = modest.desktop
 backupsettings_DATA = modest.conf
@@ -118,7 +110,6 @@ restore_SCRIPTS = modest-restore.sh
 ossocudscripts_SCRIPTS = modest-clean.sh
 
 EXTRA_DIST=\
-	$(UI_FILES) \
 	$(PIXMAP_FILES) \
 	$(serviceentry_DATA) \
 	$(desktopentry_DATA) \
diff --git a/src/hildon2/ui/modest-main-window-ui.xml b/src/hildon2/ui/modest-main-window-ui.xml
deleted file mode 100644
index 43730ab..0000000
--- a/src/hildon2/ui/modest-main-window-ui.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<!--
- * Copyright (c) 2006, Nokia Corporation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the Nokia Corporation nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<ui>
-
-  <menubar name="MenuBar">
-    
-    <menu name="EmailMenu" action="Email">
-      <menuitem name="EmailNewFolderMenu" action="EmailNewFolder"/>
-      <separator/>
-      <menuitem name="EmailReplyAllMenu" action="EmailReplyAll"/>
-      <menuitem name="EmailForwardMenu" action="EmailForward"/>
-      <separator/>
-      <menuitem name="EmailContentsMenu"     action="EmailContents"/>
-      <menuitem name="EmailPurgeAttachmentsMenu" action="EmailPurgeAttachments"/>
-      <separator/>
-      <menuitem name="EmailRenameMenu" action="EmailRenameFolder"/>
-      <separator/>
-      <menuitem name="EmailDetailsMenu" action="EmailDetails"/>
-    </menu>
-
-    <menu name="EditMenu" action="Edit">
-      <menuitem name="EditSelectAllMenu" action="EditSelectAll"/>
-      <menuitem name="EditMarkAsReadMenu" action="EditMarkAsRead"/>
-      <menuitem name="EditMarkAsUnreadMenu" action="EditMarkAsUnread"/>
-      <separator/>
-      <menuitem name="EditMoveToMenu" action="EditMoveTo"/>
-    </menu>
-
-    <menu name="AccountsMenu" action="Accounts">
-      <placeholder name="AccountsMenuAdditions" />
-   </menu>
-
-    <menu name="ToolsMenu" action="Tools">
-      <menuitem name="ToolsSettingsMenu" action="ToolsSettings"/>
-      <menuitem name="ToolsAccountsMenu" action="ToolsAccounts"/>
-      <menuitem name="ToolsSMTPServersMenu" action="ToolsSMTPServers"/>
-      <separator/>
-      <menu name="ToolsSendReceiveMainMenu" action="ToolsSendReceive">
-        <menuitem name="ToolsSendReceiveAllMenu"  action="ToolsSendReceiveAll"/>
-        <menuitem name="ToolsSendReceiveCancelSendingMenu"  action="ToolsSendReceiveCancelSending"/>
-        <separator/>
-        <placeholder name="ToolsMenuAdditions" />
-      </menu>
-      <separator/>
-      <menuitem name="ToolsContactsMenu" action="ToolsContacts"/>
-    </menu>
-    
-  </menubar>
-
-  <toolbar name="ToolBar">
-    <toolitem action="ToolbarMessageNew"/> 
-    <toolitem action="ToolbarMessageReply"/> 
-    <toolitem action="ToolbarDeleteMessage"/>
-    <toolitem action="ToggleFolders"/>
-    <toolitem action="ToolbarSort" position="bot"/>
-    <toolitem action="ToolbarSendReceive" position="bot"/>
-    <placeholder name="ProgressBarView"  position="bot"/>
-    <toolitem action="ToolbarCancel" position="bot"/>
-  </toolbar>
-
-  <popup name="ToolbarReplyCSM" action="ToolbarCSM">
-    <menuitem action="ToolbarMessageForward"/>
-    <menuitem action="ToolbarMessageReplyAll"/>
-<!--   <menuitem action="ToolbarMessageReply"/> -->
-  </popup>
-
-  <accelerator name="AccelZoomMinus" action="ZoomMinus"/>
-  <accelerator name="AccelZoomPlus" action="ZoomPlus"/>
-  <accelerator name="AccelToggleFullscreen" action="ToggleFullscreen"/>
-</ui>
diff --git a/src/hildon2/ui/modest-msg-edit-window-ui.xml b/src/hildon2/ui/modest-msg-edit-window-ui.xml
deleted file mode 100644
index e563c99..0000000
--- a/src/hildon2/ui/modest-msg-edit-window-ui.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<!--
- * Copyright (c) 2006, Nokia Corporation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the Nokia Corporation nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<ui>
-
-  <menubar name="MenuBar">
-
-    <menu name="EmailMenu" action="Email">
-      <menuitem name="SaveToDraftsMenu" action="ActionsSaveToDrafts"/>
-      <separator/>
-      <menuitem name="CheckNamesMenu" action="CheckNames"/>
-    </menu>
-
-    <menu name="EditMenu" action="Edit">
-      <menuitem name="UndoMenu" action="Undo"/>
-    </menu>
-
-    <menu name="ViewMenu" action="View">
-      <menuitem name="ViewCcFieldMenu" action="ViewCcField"/>
-      <menuitem name="ViewBccFieldMenu" action="ViewBccField"/>
-    </menu>
-
-    <menu name="FormatMenu" action="Format">
-      <menu name="AlignmentMenu" action="Alignment">
-         <menuitem name="AlignmentLeftMenu" action="AlignmentLeft"/>
-         <menuitem name="AlignmentCenterMenu" action="AlignmentCenter"/>
-         <menuitem name="AlignmentRightMenu" action="AlignmentRight"/>
-      </menu>
-      <separator/>
-      <menuitem name="FileFormatPlainTextMenu" action="FileFormatPlainText"/>
-      <menuitem name="FileFormatFormattedTextMenu" action="FileFormatFormattedText"/>
-    </menu>
-
-    <menu name="AttachmentsMenu" action="Attachments">
-      <menuitem name="InsertImageMenu" action="InsertImage"/>
-      <separator/>
-      <menuitem name="RemoveAttachmentsMenu" action="RemoveAttachments"/>
-    </menu>
-
-    <menu name="ToolsMenu" action="Tools">
-      <menuitem name="MessageSettingsMenu" action="MessageSettings"/>
-      <menu name="MessagePriorityMenu" action="MessagePriority">
-	<menuitem name="MessagePriorityHighMenu" action="MessagePriorityHigh"/>
-	<menuitem name="MessagePriorityNormalMenu" action="MessagePriorityNormal"/>
-	<menuitem name="MessagePriorityLowMenu" action="MessagePriorityLow"/>
-      </menu>
-      <separator/>
-      <menuitem name="FindInMessageMenu" action="FindInMessage"/>
-    </menu>
-
-  </menubar>
-
-  <toolbar name="ToolBar">
-    <placeholder name="FontAttributes" />
-    <toolitem action="ActionsBold"/>
-    <toolitem action="ActionsItalics"/>
-    <placeholder name="FontColor" />
-  </toolbar>
-
-  <accelerator name="AccelToggleFullscreen" action="ToggleFullscreen"/>
-  <accelerator name="AccelCloseWindow" action="CloseWindowShortcut"/>
-  <accelerator name="AccelSend" action="SendShortcut"/>
-  <accelerator name="AccelSend2" action="SendShortcut2"/>
-  <accelerator name="AccelUndo" action="Undo"/>
-
-</ui>
diff --git a/src/hildon2/ui/modest-msg-view-window-ui.xml b/src/hildon2/ui/modest-msg-view-window-ui.xml
deleted file mode 100644
index aca66e5..0000000
--- a/src/hildon2/ui/modest-msg-view-window-ui.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<!--
- * Copyright (c) 2006, Nokia Corporation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the Nokia Corporation nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<ui>
-
-  <menubar name="MenuBar">
-    <menu name="MessageMenu" action="Email">
-      <menuitem name="MessageReplyAllMenu" action="EmailReplyAll"/>
-      <menuitem name="MessageForwardMenu" action="EmailForward"/>
-      <separator/>
-      <menuitem name="MessageNewMenu"  action="EmailNewDefault"/>
-      <separator/>
-      <menuitem name="MessageDetailsMenu"      action="EmailDetails"/>
-    </menu>
-
-    <menu name="AttachmentsMenu" action="Attachments">
-      <menuitem name="SaveAttachmentMenu" action="SaveAttachment"/>
-      <menuitem name="RemoveAttachmentMenu" action="RemoveAttachment"/>
-    </menu>
-
-   <menu name="ToolsMenu" action="Tools">
-      <menuitem name="ToolsAddToContactsMenu" action="ToolsAddToContacts"/>
-   </menu>
-
-  </menubar>
-
-  <toolbar name="ToolBar">
-    <toolitem action="ToolbarMessageReply"/>
-    <toolitem action="ToolbarMessageReplyAll"/>
-    <toolitem action="ToolbarMessageForward"/>
-    <toolitem action="ToolbarDeleteMessage"/>
-    <toolitem action="ToolbarDownloadExternalImages"/>
-    <toolitem action="ToolbarMessageBack" position="bot"/>
-    <toolitem action="ToolbarMessageNext" position="bot"/>
-  </toolbar>
-
-  <accelerator name="AccelEmailReply" action="EmailReply"/>
-  <accelerator name="AccelZoomMinus" action="ZoomMinus"/>
-  <accelerator name="AccelZoomPlus" action="ZoomPlus"/>
-  <accelerator name="AccelToggleFullscreen" action="ToggleFullscreen"/>
-  <accelerator name="AccelFindInMessage" action="FindInMessage"/>
-
-  </ui>
diff --git a/src/widgets/Makefile.am b/src/widgets/Makefile.am
index 4a7a74b..dd91be8 100644
--- a/src/widgets/Makefile.am
+++ b/src/widgets/Makefile.am
@@ -176,3 +176,13 @@ LDADD = \
 	$(MODEST_TOOLKIT_LIBS) 		\
 	$(MODEST_CALENDAR_WIDGETS_LIBS)
 
+UI_FILES=\
+	ui/modest-main-window-ui.xml \
+	ui/modest-msg-edit-window-ui.xml \
+	ui/modest-msg-view-window-ui.xml
+
+uidir = $(datadir)/modest/ui
+ui_DATA = $(UI_FILES)
+
+EXTRA_DIST=\
+	$(UI_FILES)
diff --git a/src/widgets/ui/modest-main-window-ui.xml b/src/widgets/ui/modest-main-window-ui.xml
new file mode 100644
index 0000000..43730ab
--- /dev/null
+++ b/src/widgets/ui/modest-main-window-ui.xml
@@ -0,0 +1,98 @@
+<!--
+ * Copyright (c) 2006, Nokia Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<ui>
+
+  <menubar name="MenuBar">
+    
+    <menu name="EmailMenu" action="Email">
+      <menuitem name="EmailNewFolderMenu" action="EmailNewFolder"/>
+      <separator/>
+      <menuitem name="EmailReplyAllMenu" action="EmailReplyAll"/>
+      <menuitem name="EmailForwardMenu" action="EmailForward"/>
+      <separator/>
+      <menuitem name="EmailContentsMenu"     action="EmailContents"/>
+      <menuitem name="EmailPurgeAttachmentsMenu" action="EmailPurgeAttachments"/>
+      <separator/>
+      <menuitem name="EmailRenameMenu" action="EmailRenameFolder"/>
+      <separator/>
+      <menuitem name="EmailDetailsMenu" action="EmailDetails"/>
+    </menu>
+
+    <menu name="EditMenu" action="Edit">
+      <menuitem name="EditSelectAllMenu" action="EditSelectAll"/>
+      <menuitem name="EditMarkAsReadMenu" action="EditMarkAsRead"/>
+      <menuitem name="EditMarkAsUnreadMenu" action="EditMarkAsUnread"/>
+      <separator/>
+      <menuitem name="EditMoveToMenu" action="EditMoveTo"/>
+    </menu>
+
+    <menu name="AccountsMenu" action="Accounts">
+      <placeholder name="AccountsMenuAdditions" />
+   </menu>
+
+    <menu name="ToolsMenu" action="Tools">
+      <menuitem name="ToolsSettingsMenu" action="ToolsSettings"/>
+      <menuitem name="ToolsAccountsMenu" action="ToolsAccounts"/>
+      <menuitem name="ToolsSMTPServersMenu" action="ToolsSMTPServers"/>
+      <separator/>
+      <menu name="ToolsSendReceiveMainMenu" action="ToolsSendReceive">
+        <menuitem name="ToolsSendReceiveAllMenu"  action="ToolsSendReceiveAll"/>
+        <menuitem name="ToolsSendReceiveCancelSendingMenu"  action="ToolsSendReceiveCancelSending"/>
+        <separator/>
+        <placeholder name="ToolsMenuAdditions" />
+      </menu>
+      <separator/>
+      <menuitem name="ToolsContactsMenu" action="ToolsContacts"/>
+    </menu>
+    
+  </menubar>
+
+  <toolbar name="ToolBar">
+    <toolitem action="ToolbarMessageNew"/> 
+    <toolitem action="ToolbarMessageReply"/> 
+    <toolitem action="ToolbarDeleteMessage"/>
+    <toolitem action="ToggleFolders"/>
+    <toolitem action="ToolbarSort" position="bot"/>
+    <toolitem action="ToolbarSendReceive" position="bot"/>
+    <placeholder name="ProgressBarView"  position="bot"/>
+    <toolitem action="ToolbarCancel" position="bot"/>
+  </toolbar>
+
+  <popup name="ToolbarReplyCSM" action="ToolbarCSM">
+    <menuitem action="ToolbarMessageForward"/>
+    <menuitem action="ToolbarMessageReplyAll"/>
+<!--   <menuitem action="ToolbarMessageReply"/> -->
+  </popup>
+
+  <accelerator name="AccelZoomMinus" action="ZoomMinus"/>
+  <accelerator name="AccelZoomPlus" action="ZoomPlus"/>
+  <accelerator name="AccelToggleFullscreen" action="ToggleFullscreen"/>
+</ui>
diff --git a/src/widgets/ui/modest-msg-edit-window-ui.xml b/src/widgets/ui/modest-msg-edit-window-ui.xml
new file mode 100644
index 0000000..e563c99
--- /dev/null
+++ b/src/widgets/ui/modest-msg-edit-window-ui.xml
@@ -0,0 +1,93 @@
+<!--
+ * Copyright (c) 2006, Nokia Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<ui>
+
+  <menubar name="MenuBar">
+
+    <menu name="EmailMenu" action="Email">
+      <menuitem name="SaveToDraftsMenu" action="ActionsSaveToDrafts"/>
+      <separator/>
+      <menuitem name="CheckNamesMenu" action="CheckNames"/>
+    </menu>
+
+    <menu name="EditMenu" action="Edit">
+      <menuitem name="UndoMenu" action="Undo"/>
+    </menu>
+
+    <menu name="ViewMenu" action="View">
+      <menuitem name="ViewCcFieldMenu" action="ViewCcField"/>
+      <menuitem name="ViewBccFieldMenu" action="ViewBccField"/>
+    </menu>
+
+    <menu name="FormatMenu" action="Format">
+      <menu name="AlignmentMenu" action="Alignment">
+         <menuitem name="AlignmentLeftMenu" action="AlignmentLeft"/>
+         <menuitem name="AlignmentCenterMenu" action="AlignmentCenter"/>
+         <menuitem name="AlignmentRightMenu" action="AlignmentRight"/>
+      </menu>
+      <separator/>
+      <menuitem name="FileFormatPlainTextMenu" action="FileFormatPlainText"/>
+      <menuitem name="FileFormatFormattedTextMenu" action="FileFormatFormattedText"/>
+    </menu>
+
+    <menu name="AttachmentsMenu" action="Attachments">
+      <menuitem name="InsertImageMenu" action="InsertImage"/>
+      <separator/>
+      <menuitem name="RemoveAttachmentsMenu" action="RemoveAttachments"/>
+    </menu>
+
+    <menu name="ToolsMenu" action="Tools">
+      <menuitem name="MessageSettingsMenu" action="MessageSettings"/>
+      <menu name="MessagePriorityMenu" action="MessagePriority">
+	<menuitem name="MessagePriorityHighMenu" action="MessagePriorityHigh"/>
+	<menuitem name="MessagePriorityNormalMenu" action="MessagePriorityNormal"/>
+	<menuitem name="MessagePriorityLowMenu" action="MessagePriorityLow"/>
+      </menu>
+      <separator/>
+      <menuitem name="FindInMessageMenu" action="FindInMessage"/>
+    </menu>
+
+  </menubar>
+
+  <toolbar name="ToolBar">
+    <placeholder name="FontAttributes" />
+    <toolitem action="ActionsBold"/>
+    <toolitem action="ActionsItalics"/>
+    <placeholder name="FontColor" />
+  </toolbar>
+
+  <accelerator name="AccelToggleFullscreen" action="ToggleFullscreen"/>
+  <accelerator name="AccelCloseWindow" action="CloseWindowShortcut"/>
+  <accelerator name="AccelSend" action="SendShortcut"/>
+  <accelerator name="AccelSend2" action="SendShortcut2"/>
+  <accelerator name="AccelUndo" action="Undo"/>
+
+</ui>
diff --git a/src/widgets/ui/modest-msg-view-window-ui.xml b/src/widgets/ui/modest-msg-view-window-ui.xml
new file mode 100644
index 0000000..aca66e5
--- /dev/null
+++ b/src/widgets/ui/modest-msg-view-window-ui.xml
@@ -0,0 +1,70 @@
+<!--
+ * Copyright (c) 2006, Nokia Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<ui>
+
+  <menubar name="MenuBar">
+    <menu name="MessageMenu" action="Email">
+      <menuitem name="MessageReplyAllMenu" action="EmailReplyAll"/>
+      <menuitem name="MessageForwardMenu" action="EmailForward"/>
+      <separator/>
+      <menuitem name="MessageNewMenu"  action="EmailNewDefault"/>
+      <separator/>
+      <menuitem name="MessageDetailsMenu"      action="EmailDetails"/>
+    </menu>
+
+    <menu name="AttachmentsMenu" action="Attachments">
+      <menuitem name="SaveAttachmentMenu" action="SaveAttachment"/>
+      <menuitem name="RemoveAttachmentMenu" action="RemoveAttachment"/>
+    </menu>
+
+   <menu name="ToolsMenu" action="Tools">
+      <menuitem name="ToolsAddToContactsMenu" action="ToolsAddToContacts"/>
+   </menu>
+
+  </menubar>
+
+  <toolbar name="ToolBar">
+    <toolitem action="ToolbarMessageReply"/>
+    <toolitem action="ToolbarMessageReplyAll"/>
+    <toolitem action="ToolbarMessageForward"/>
+    <toolitem action="ToolbarDeleteMessage"/>
+    <toolitem action="ToolbarDownloadExternalImages"/>
+    <toolitem action="ToolbarMessageBack" position="bot"/>
+    <toolitem action="ToolbarMessageNext" position="bot"/>
+  </toolbar>
+
+  <accelerator name="AccelEmailReply" action="EmailReply"/>
+  <accelerator name="AccelZoomMinus" action="ZoomMinus"/>
+  <accelerator name="AccelZoomPlus" action="ZoomPlus"/>
+  <accelerator name="AccelToggleFullscreen" action="ToggleFullscreen"/>
+  <accelerator name="AccelFindInMessage" action="FindInMessage"/>
+
+  </ui>
-- 
1.7.9.5