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

[tfry at users.sourceforge.net]

Revision: 2990
          http://rkward.svn.sourceforge.net/rkward/?rev=2990&view=rev
Author:   tfry
Date:     2010-09-03 15:27:56 +0000 (Fri, 03 Sep 2010)

Log Message:
-----------
Workaround against mysterious destabilization of the Edit menu over time.

Modified Paths:
--------------
    trunk/rkward/rkward/rkconsolepart.rc
    trunk/rkward/rkward/windows/rkstandardactions.rc

Modified: trunk/rkward/rkward/rkconsolepart.rc
===================================================================
--- trunk/rkward/rkward/rkconsolepart.rc	2010-09-03 14:02:49 UTC (rev 2989)
+++ trunk/rkward/rkward/rkconsolepart.rc	2010-09-03 15:27:56 UTC (rev 2990)
@@ -7,11 +7,21 @@
 			<Action name="file_export_html"/>
 		</Menu>
 		<Menu name="edit"><text>&Edit</text>
+<!-- Something strange is going on, here. When using the commented version, after switching
+a few times between console and script editor, the Edit menu will start to become shuffled.
+Probably a kdelibs bug (4.4.4).
+
+The uncommented version is not quite correct (the "paste special" action will be misplaced),
+but avoids the total derangement of the edit menu over time.
 			<Action name="rkconsole_copy" group="edit_paste_merge"/>
 			<Action name="rkconsole_copy_literal" group="edit_paste_merge"/>
 			<Action name="rkconsole_paste" group="edit_paste_merge"/>
-			<DefineGroup name="edit_paste_merge" append="edit_paste_merge"/>
 			<Separator/>
+			<Action name="rkconsole_clear"/> -->
+			<Action name="rkconsole_copy"/>
+			<Action name="rkconsole_copy_literal"/>
+			<Action name="rkconsole_paste"/>
+			<Separator/>
 			<Action name="rkconsole_clear"/>
 		</Menu>
 		<Menu name="view"><text>&View</text>
@@ -33,7 +43,7 @@
 		<Action name="rkconsole_copy"/>
 		<Action name="rkconsole_copy_literal"/>
 		<Action name="rkconsole_paste"/>
-		<DefineGroup name="edit_paste_merge" />
+		<DefineGroup name="rkconsole_context_merge_paste" />
 		<Separator/>
 		<DefineGroup name="rkconsole_context_merge1"/>
 		<Action name="interrupt"/>

Modified: trunk/rkward/rkward/windows/rkstandardactions.rc
===================================================================
--- trunk/rkward/rkward/windows/rkstandardactions.rc	2010-09-03 14:02:49 UTC (rev 2989)
+++ trunk/rkward/rkward/windows/rkstandardactions.rc	2010-09-03 15:27:56 UTC (rev 2990)
@@ -37,7 +37,7 @@
 		<Action name="function_reference" group="ktexteditor_popup_merge2"/>
 	</Menu>
 	<Menu name="rkconsole_context_menu">
-		<Action name="paste_special" group="edit_paste_merge"/>
+		<Action name="paste_special" group="rkconsole_context_merge_paste"/>
 		<Action name="run_selection" group="rkconsole_context_merge1"/>
 		<Action name="function_reference" group="rkconsole_context_merge2"/>
 	</Menu>


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