[rkward-cvs] SF.net SVN: rkward:[2791] trunk/rkward/rkward

[tfry at users.sourceforge.net]

Revision: 2791
          http://rkward.svn.sourceforge.net/rkward/?rev=2791&view=rev
Author:   tfry
Date:     2010-03-17 10:08:49 +0000 (Wed, 17 Mar 2010)

Log Message:
-----------
Finally fix GUI merge problems for script editor inside main window

Modified Paths:
--------------
    trunk/rkward/rkward/rkwardui.rc
    trunk/rkward/rkward/windows/detachedwindowcontainer.rc
    trunk/rkward/rkward/windows/rkcommandeditorwindowpart.rc

Modified: trunk/rkward/rkward/rkwardui.rc
===================================================================
--- trunk/rkward/rkward/rkwardui.rc	2010-03-17 08:29:15 UTC (rev 2790)
+++ trunk/rkward/rkward/rkwardui.rc	2010-03-17 10:08:49 UTC (rev 2791)
@@ -34,6 +34,17 @@
 	<!-- These menus are actually defined in KParts. We also declare them here, to avoid menus jumping around -->
 	<Menu name="edit"><text>&Edit</text>
 		<Action name="edit_menu_dummy"/>
+		<DefineGroup name="edit_first_merge" />
+		<Separator />
+		<DefineGroup name="edit_undo_merge" />
+		<Separator />
+		<DefineGroup name="edit_paste_merge" />
+		<DefineGroup name="after_edit_paste_merge" />
+		<Separator />
+		<DefineGroup name="edit_select_merge" />
+		<Separator />
+		<DefineGroup name="edit_find_merge" />
+		<Separator />
 	</Menu>
 	<Menu name="view"><text>&View</text>
 		<Action name="view_menu_dummy"/>

Modified: trunk/rkward/rkward/windows/detachedwindowcontainer.rc
===================================================================
--- trunk/rkward/rkward/windows/detachedwindowcontainer.rc	2010-03-17 08:29:15 UTC (rev 2790)
+++ trunk/rkward/rkward/windows/detachedwindowcontainer.rc	2010-03-17 10:08:49 UTC (rev 2791)
@@ -1,4 +1,5 @@
 <!DOCTYPE kpartgui>
+<!-- This contains *mostly* a duplicate of rkwardui.rc. Perhaps the two can be merged one day, but that's not as trivial as it may sound.. -->
 <kpartgui name="rkward" version="53">
 	<MenuBar>
 		<Menu name="file"><text>&File</text>
@@ -8,9 +9,17 @@
 			<DefineGroup name="device_dummy_merge" />
 		</Menu>
 		<Menu name="edit"><text>&Edit</text>
-			<DefineGroup name="edit_paste_merge" append="edit_paste_merge" />
-			<DefineGroup name="after_edit_paste_merge" append="edit_paste_merge" />
-			<DefineGroup name="edit_select_merge" append="edit_select_merge" />
+			<DefineGroup name="edit_first_merge" />
+			<Separator />
+			<DefineGroup name="edit_undo_merge" />
+			<Separator />
+			<DefineGroup name="edit_paste_merge" />
+			<DefineGroup name="after_edit_paste_merge" />
+			<Separator />
+			<DefineGroup name="edit_select_merge" />
+			<Separator />
+			<DefineGroup name="edit_find_merge" />
+			<Separator />
 		</Menu>
 		<Menu name="view"><text>&View</text>
 			<DefineGroup name="view_dummy_merge" />

Modified: trunk/rkward/rkward/windows/rkcommandeditorwindowpart.rc
===================================================================
--- trunk/rkward/rkward/windows/rkcommandeditorwindowpart.rc	2010-03-17 08:29:15 UTC (rev 2790)
+++ trunk/rkward/rkward/windows/rkcommandeditorwindowpart.rc	2010-03-17 10:08:49 UTC (rev 2791)
@@ -2,7 +2,7 @@
 <kpartgui name="rkward" version="53">
 	<MenuBar>
 		<Menu name="edit"><text>&Edit</text>
-			<Menu name="tools"><text>&Tools Move</text>
+			<Menu name="tools" group="edit_first_merge"><text>&Tools Move</text>
 				<Merge/>
 			</Menu>
 			<Action name="mark_block" group="edit_select_merge"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.