[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdevelop/src
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2008-09-14 15:58:41
Message-ID: 1221407921.563092.14865.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 860913 by apaku:

Play by the rules of xmlgui and remove the noMerge stuff. This allows us
to benefit from ui_standars.rc which covers all the standard actions we
use. Needed all the DefineGroup elements to make sure kate finds the
groups/mergeppoints it expects so stuff like "Save As" shows up at the
right position in the menu. Needs up-to-date kdevplatform to work as
some of the action names have changed.
CCMAIL:aacid@kde.org


 M  +25 -59    kdevelopui.rc  


--- trunk/KDE/kdevelop/src/kdevelopui.rc #860912:860913
@@ -1,43 +1,23 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui version="58" name="kdevelop" >
+<kpartgui version="62" name="kdevelop" >
 <MenuBar>
-  <Menu name="file" noMerge="1">
+  <Menu name="file">
     <text context="@title:menu">File</text>
-    <Action name="file_new"/>
-    <DefineGroup name="new_merge"/>
-    <Separator/>
-    <Action name="file_open"/>
-    <Action name="file_open_recent"/>
-    <DefineGroup name="open_merge"/>
-    <Separator/>
-    <DefineGroup name="save_merge"/>
-    <Action name="file_save_all"/>
-    <Separator/>
-    <DefineGroup name="revert_merge"/>
-    <Action name="file_revert_all"/>
-    <Separator/>
-    <DefineGroup name="print_merge"/>
-    <Merge/>
-    <Separator/>
-    <Action name="file_close"/>
-    <DefineGroup name="close_merge"/>
-    <Action name="file_close_all"/>
-    <Action name="file_closeother"/>
-    <Separator/>
-    <Action name="file_quit"/>
+    <DefineGroup append="new_merge" name="new_merge"/>
+    <DefineGroup append="open_merge" name="open_merge"/>
+    <DefineGroup append="save_merge" name="save_merge"/>
+    <DefineGroup append="revert_merge" name="revert_merge"/>
+    <DefineGroup append="print_merge" name="print_merge"/>
+    <Action name="file_closeother" append="close_merge"/>
+    <DefineGroup append="close_merge" name="close_merge"/>
   </Menu>
 
-  <Menu name="edit" noMerge="1">
+  <Menu name="edit">
     <text context="@title:menu">Edit</text>
-    <DefineGroup name="edit_undo_merge"/>
-    <Separator/>
-    <DefineGroup name="edit_paste_merge"/>
-    <Separator/>
-    <DefineGroup name="edit_select_merge"/>
-    <Separator/>
-    <DefineGroup name="edit_find_merge"/>
-    <DefineGroup name="kdev_edit_find_merge"/>
-    <Separator/>
+    <DefineGroup append="edit_undo_merge" name="edit_undo_merge"/>
+    <DefineGroup append="edit_paste_merge" name="edit_paste_merge"/>
+    <DefineGroup append="edit_select_merge" name="edit_select_merge"/>
+    <DefineGroup append="edit_find_merge" name="edit_find_merge"/>
     <DefineGroup name="edit_formatting"/>
     <Separator/>
     <Merge/>
@@ -49,7 +29,7 @@
   <Action name="bookmarks" group="search_menu_merge" />
 -->
 
-  <Menu name="view" noMerge="1">
+  <Menu name="view">
     <text context="@title:menu">View</text>
     <Action name="add_toolview"/>
     <Action name="remove_view"/>
@@ -68,7 +48,7 @@
     <DefineGroup name="view_operations"/>
   </Menu>
 
-  <Menu name="project" noMerge="1">
+  <Menu name="project">
     <text context="@title:menu">Project</text>
     <DefineGroup name="project_new"/>
     <Action name="project_open"/>
@@ -87,7 +67,7 @@
     <Action name="project_config_menu" />
   </Menu>
 
-  <Menu name="run" noMerge="1">
+  <Menu name="run">
     <text name="@title:menu">Run</text>
 
     <Action name="run_default_target" />
@@ -104,7 +84,7 @@
     <Merge />
   </Menu>
 
-  <Menu name="tools" noMerge="1">
+  <Menu name="tools">
     <text context="@title:menu">Tools</text>
 
     <DefineGroup name="tools_operations"/>
@@ -122,29 +102,15 @@
 
   <Merge/>
 
-  <Menu name="settings" noMerge="1">
+  <Menu name="settings">
     <text context="@title:menu">Settings</text>
-    <Action name="settings_show_menubar" />
-    <Action name="settings_show_statusbar" />
-    <Merge name="StandardToolBarMenuHandler" />
-    <Action name="settings_main_toolbar"/>
-    <Action name="settings_build_toolbar"/>
-    <Action name="settings_view_toolbar"/>
-    <Action name="settings_browser_toolbar"/>
-    <DefineGroup name="show_toolbar_merge" />
-    <Action name="settings_viewbar"/>
-    <Action name="settings_statusbar"/>
-    <DefineGroup name="show_merge" />
-    <Separator />
-    <Action name="options_configure_keybinding" />
-    <Action name="set_configure_toolbars" />
-    <Action name="settings_configure_notifications" />
-    <Action name="settings_configure_editors" />
-    <Action name="settings_configure" />
-    <DefineGroup name="configure_merge" />
+    <DefineGroup append="show_toolbar_merge" name="show_toolbar_merge"/>
+    <DefineGroup append="show_merge" name="show_merge" />
+    <Action name="options_configure_editors" append="configure_merge" />
+    <DefineGroup append="configure_merge" name="configure_merge" />
   </Menu>
 
-  <Menu name="window" noMerge="1">
+  <Menu name="window">
     <text context="@title:menu">Window</text>
     <Action name="new_window"/>
     <Separator/>
@@ -175,7 +141,7 @@
 
 </MenuBar>
 
-<ToolBar name="mainToolBar" position="Top" noMerge="1">
+<ToolBar name="mainToolBar" position="Top">
   <text>Main Toolbar</text>
   <Action name="file_new" />
   <Action name="switch_area" />
[prev in list] [next in list] [prev in thread] [next in thread]