[gedit/wip/appmenu] Do not duplicate fallback. Just merge the ui.

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 5c8825473e3252b19b43036b71a8a745b26e2639
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Mon Dec 31 12:49:19 2012 +0100

    Do not duplicate fallback. Just merge the ui.

 gedit/gedit-ui-fallback.xml |  158 ++----------------------------------------
 gedit/gedit-ui.xml          |    9 +++
 gedit/gedit-window.c        |   27 ++++---
 3 files changed, 32 insertions(+), 162 deletions(-)
---
diff --git a/gedit/gedit-ui-fallback.xml b/gedit/gedit-ui-fallback.xml
index 2569172..5ff2eda 100644
--- a/gedit/gedit-ui-fallback.xml
+++ b/gedit/gedit-ui-fallback.xml
@@ -30,165 +30,23 @@
 
   <menubar name="MenuBar">
     <menu name="FileMenu" action="File">
-      <menuitem name="FileNewMenu" action="FileNew"/>
-      <placeholder name="FileOps_1"/>
-      <menuitem name="FileOpenMenu" action="FileOpen"/>
-      <placeholder name="FileOps_2"/>
-      <separator/>
-      <menuitem name="FileSaveMenu" action="FileSave"/>
-      <menuitem name="FileSaveAsMenu" action="FileSaveAs"/>
-      <placeholder name="FileOps_3"/>
-      <menuitem name="FileRevertMenu" action="FileRevert"/>
-      <placeholder name="FileOps_4"/>
-      <separator/>
-      <placeholder name="FileOps_5"/>
-      <menuitem name="FilePrintPreviewMenu" action="FilePrintPreview"/>
-      <menuitem name="FilePrintMenu" action="FilePrint"/>
-      <placeholder name="FileRecentsPlaceholder">
-        <separator/>
+      <placeholder name="FileQuitMenuHolder">
+        <menuitem name="FileQuitMenu" action="FileQuit"/>
       </placeholder>
-      <separator/>
-      <menuitem name="FileCloseMenu" action="FileClose"/>
-      <menuitem name="FileQuitMenu" action="FileQuit"/>
     </menu>
 
     <menu name="EditMenu" action="Edit">
-      <menuitem name="EditUndoMenu" action="EditUndo"/>
-      <menuitem name="EditRedoMenu" action="EditRedo"/>
-      <separator/>
-      <menuitem name="EditCutMenu" action="EditCut"/>
-      <menuitem name="EditCopyMenu" action="EditCopy"/>
-      <menuitem name="EditPasteMenu" action="EditPaste"/>
-      <menuitem name="EditDeleteMenu" action="EditDelete"/>
-      <placeholder name="EditOps_1" /> 
-      <separator/>
-      <placeholder name="EditOps_2" /> 
-      <menuitem name="EditSelectAllMenu" action="EditSelectAll"/>
-      <placeholder name="EditOps_3" />
-      <separator/>
-      <placeholder name="EditOps_4" />
-      <separator/>
-      <placeholder name="EditOps_5" />
-      <separator/>
-      <placeholder name="EditOps_6" />
-      <separator/>
-      <menuitem name="EditPreferencesMenu" action="EditPreferences"/>
-    </menu>
-
-    <menu name="ViewMenu" action="View">
-      <menuitem name="ViewToolbarMenu" action="ViewToolbar"/>
-      <menuitem name="ViewStatusbarMenu" action="ViewStatusbar"/>
-      <menuitem name="ViewSidePaneMenu" action="ViewSidePanel"/>
-      <menuitem name="ViewBottomPaneMenu" action="ViewBottomPanel"/>
-      <separator/>
-      <menuitem name="ViewFullscreenMenu" action="ViewFullscreen"/>
-      <separator/>
-      <menu name="ViewHighlightModeMenu" action="ViewHighlightMode">
-        <placeholder name="LanguagesMenuPlaceholder">
-        </placeholder>
-      </menu>
-    </menu>
-
-    <menu name="SearchMenu" action="Search">
-      <menuitem name="SearchFindMenu" action="SearchFind"/>
-      <menuitem name="SearchFindNextMenu" action="SearchFindNext"/>
-      <menuitem name="SearchFindPreviousMenu" action="SearchFindPrevious"/>
-      <placeholder name="SearchOps_1" />
-      <separator/>
-      <placeholder name="SearchOps_2" />
-      <separator/>
-      <menuitem name="SearchReplaceMenu" action="SearchReplace"/>
-      <placeholder name="SearchOps_3" />
-      <separator/>
-      <placeholder name="SearchOps_4" />
-      <separator/>
-      <menuitem name="SearchClearHighlight" action="SearchClearHighlight"/>      
-      <placeholder name="SearchOps_5" />
-      <separator/>
-      <placeholder name="SearchOps_6" />
-      <separator/>
-      <menuitem name="SearchGoToLineMenu" action="SearchGoToLine"/>      
-      <placeholder name="SearchOps_7" />
-      <separator/>
-      <placeholder name="SearchOps_8" />
-    </menu>
-
-    <menu name="ToolsMenu" action="Tools">
-      <placeholder name="ToolsOps_1" />
-      <separator/>
-      <placeholder name="ToolsOps_2" />
-      <separator/>
-      <placeholder name="ToolsOps_3" />
-      <separator/>
-      <placeholder name="ToolsOps_4" />
-      <separator/>
-      <placeholder name="ToolsOps_5" />
-    </menu>
-
-    <placeholder name="ExtraMenu_1" />
-
-    <menu name="DocumentsMenu" action="Documents">
-      <menuitem action="FileSaveAll" />
-      <menuitem action="FileCloseAll" />
-      <separator />
-      <menuitem action="DocumentsNewTabGroup"/>
-      <menuitem action="DocumentsPreviousTabGroup"/>
-      <menuitem action="DocumentsNextTabGroup"/>
-      <separator />
-      <placeholder name="DocumentsOps_1" />
-      <separator/>
-      <placeholder name="DocumentsOps_2" />
-      <separator/>
-      <placeholder name="DocumentsOps_3" />
-      <menuitem action="DocumentsPreviousDocument" />      
-      <menuitem action="DocumentsNextDocument" />
-      <separator/>
-      <menuitem action="DocumentsMoveToNewWindow"/>
-      <placeholder name="DocumentsListPlaceholder">
-      <separator/>
+      <placeholder name="EditPreferencesMenuHolder">
+        <menuitem name="EditPreferencesMenu" action="EditPreferences"/>
       </placeholder>
     </menu>
 
     <menu name="HelpMenu" action="Help">
-      <menuitem name="HelpContentsMenu" action="HelpContents"/>
-      <menuitem name="HelpAboutMenu" action="HelpAbout"/>
+      <placeholder name="HelpHolder">
+        <menuitem name="HelpContentsMenu" action="HelpContents"/>
+        <menuitem name="HelpAboutMenu" action="HelpAbout"/>
+      </placeholder>
     </menu>
   </menubar>
 
-  <toolbar name="ToolBar">
-    <toolitem action="FileNew"/>
-    <toolitem action="FileSave"/>
-    <separator/>
-    <toolitem action="FilePrint"/>
-    <separator/>
-    <toolitem action="EditUndo"/>
-    <toolitem action="EditRedo"/>
-    <separator/>
-    <toolitem action="EditCut"/>
-    <toolitem action="EditCopy"/>
-    <toolitem action="EditPaste"/>
-    <separator/>
-    <toolitem action="SearchFind"/>
-    <toolitem action="SearchReplace"/>
-  </toolbar>
-
-  <toolbar name="FullscreenToolBar">
-    <toolitem action="FileNew"/>
-    <toolitem action="FileSave"/>
-    <separator/>
-    <toolitem action="FilePrint"/>
-    <separator/>
-    <toolitem action="EditUndo"/>
-    <toolitem action="EditRedo"/>
-    <separator/>
-    <toolitem action="EditCut"/>
-    <toolitem action="EditCopy"/>
-    <toolitem action="EditPaste"/>
-    <separator/>
-    <toolitem action="SearchFind"/>
-    <toolitem action="SearchReplace"/>
-    <separator expand="true"/>
-    <toolitem action="LeaveFullscreen"/>
-  </toolbar>
-
 </ui>
diff --git a/gedit/gedit-ui.xml b/gedit/gedit-ui.xml
index 8676d1c..19a8f7f 100644
--- a/gedit/gedit-ui.xml
+++ b/gedit/gedit-ui.xml
@@ -49,6 +49,7 @@
       </placeholder>
       <separator/>
       <menuitem name="FileCloseMenu" action="FileClose"/>
+      <placeholder name="FileQuitMenuHolder" />
     </menu>
 
     <menu name="EditMenu" action="Edit">
@@ -70,6 +71,8 @@
       <placeholder name="EditOps_5" />
       <separator/>
       <placeholder name="EditOps_6" />
+      <separator/>
+      <placeholder name="EditPreferencesMenuHolder" />
     </menu>
 
     <menu name="ViewMenu" action="View">
@@ -146,6 +149,12 @@
       </placeholder>
     </menu>
 
+    <menu name="HelpMenu" action="Help">
+     <placeholder name="HelpOps_1" />
+     <separator/>
+     <placeholder name="HelpHolder" />
+    </menu>
+
   </menubar>
 
   <toolbar name="ToolBar">
diff --git a/gedit/gedit-window.c b/gedit/gedit-window.c
index 11e8214..db7349d 100644
--- a/gedit/gedit-window.c
+++ b/gedit/gedit-window.c
@@ -1566,24 +1566,27 @@ create_menu_bar_and_toolbar (GeditWindow *window,
 	g_object_unref (action_group);
 	window->priv->panels_action_group = action_group;
 
-	if (_gedit_app_has_app_menu (GEDIT_APP (g_application_get_default ())))
+	gtk_ui_manager_add_ui_from_resource (manager,
+					     "/org/gnome/gedit/ui/gedit-ui.xml",
+					     &error);
+	if (error != NULL)
 	{
-		gtk_ui_manager_add_ui_from_resource (manager,
-						     "/org/gnome/gedit/ui/gedit-ui.xml",
-						     &error);
+		g_warning ("Could not add ui definition: %s", error->message);
+		g_error_free (error);
+		return;
 	}
-	else
+
+	if (!_gedit_app_has_app_menu (GEDIT_APP (g_application_get_default ())))
 	{
 		gtk_ui_manager_add_ui_from_resource (manager,
 						     "/org/gnome/gedit/ui/gedit-ui-fallback.xml",
 						     &error);
-	}
-
-	if (error != NULL)
-	{
-		g_warning ("Could not add ui definition: %s", error->message);
-		g_error_free (error);
-		return;
+		if (error != NULL)
+		{
+			g_warning ("Could not add fallback ui definition: %s", error->message);
+			g_error_free (error);
+			return;
+		}
 	}
 
 	/* show tooltips in the statusbar */