[rkward-cvs] SF.net SVN: rkward:[2913] trunk/rkward/rkward
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Tue Jun 29 15:39:12 UTC 2010
Revision: 2913
http://rkward.svn.sourceforge.net/rkward/?rev=2913&view=rev
Author: tfry
Date: 2010-06-29 15:39:12 +0000 (Tue, 29 Jun 2010)
Log Message:
-----------
Apparently, the ui.rc files must not use the same name. Otherwise merging indices (DefineGroup-tags) defined in one of the parts will be removed when removing any other of the parts
Modified Paths:
--------------
trunk/rkward/rkward/misc/rkdummypart.rc
trunk/rkward/rkward/rkconsolepart.rc
trunk/rkward/rkward/rkwardui.rc
trunk/rkward/rkward/windows/detachedwindowcontainer.rc
trunk/rkward/rkward/windows/rkcatchedx11windowpart.rc
trunk/rkward/rkward/windows/rkcommandeditorwindowpart.rc
trunk/rkward/rkward/windows/rkcommandlogpart.rc
trunk/rkward/rkward/windows/rkhelpwindow.rc
trunk/rkward/rkward/windows/rkoutputwindow.rc
trunk/rkward/rkward/windows/rkstandardactions.rc
trunk/rkward/rkward/windows/rktoplevelwindowgui.rc
Modified: trunk/rkward/rkward/misc/rkdummypart.rc
===================================================================
--- trunk/rkward/rkward/misc/rkdummypart.rc 2010-06-29 10:28:23 UTC (rev 2912)
+++ trunk/rkward/rkward/misc/rkdummypart.rc 2010-06-29 15:39:12 UTC (rev 2913)
@@ -1,4 +1,4 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="50">
+<kpartgui name="rkward_dummypart" version="54">
<!-- Just an empty file to silence warnings -->
</kpartgui>
\ No newline at end of file
Modified: trunk/rkward/rkward/rkconsolepart.rc
===================================================================
--- trunk/rkward/rkward/rkconsolepart.rc 2010-06-29 10:28:23 UTC (rev 2912)
+++ trunk/rkward/rkward/rkconsolepart.rc 2010-06-29 15:39:12 UTC (rev 2913)
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="53">
+<kpartgui name="rkward_console" version="54">
<MenuBar>
<Menu name="file"><text>&File</text>
<Action name="file_print"/>
Modified: trunk/rkward/rkward/rkwardui.rc
===================================================================
--- trunk/rkward/rkward/rkwardui.rc 2010-06-29 10:28:23 UTC (rev 2912)
+++ trunk/rkward/rkward/rkwardui.rc 2010-06-29 15:39:12 UTC (rev 2913)
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="53">
+<kpartgui name="rkward_main" version="54">
<MenuBar>
<!-- The Main Window ui.rc is the only one, where merging happens, reliably. That is, why we need to define
a lot of merge points, here, which can then be used be mdi windows and their children.
Modified: trunk/rkward/rkward/windows/detachedwindowcontainer.rc
===================================================================
--- trunk/rkward/rkward/windows/detachedwindowcontainer.rc 2010-06-29 10:28:23 UTC (rev 2912)
+++ trunk/rkward/rkward/windows/detachedwindowcontainer.rc 2010-06-29 15:39:12 UTC (rev 2913)
@@ -1,6 +1,6 @@
<!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">
+<kpartgui name="rkward_detachedwindow" version="54">
<MenuBar>
<Menu name="file"><text>&File</text>
<DefineGroup name="file_dummy_merge" />
Modified: trunk/rkward/rkward/windows/rkcatchedx11windowpart.rc
===================================================================
--- trunk/rkward/rkward/windows/rkcatchedx11windowpart.rc 2010-06-29 10:28:23 UTC (rev 2912)
+++ trunk/rkward/rkward/windows/rkcatchedx11windowpart.rc 2010-06-29 15:39:12 UTC (rev 2913)
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="54">
+<kpartgui name="rkward_x11window" version="54">
<MenuBar>
<Menu name="device"><text>&Device</text>
<Action name="device_activate"/>
Modified: trunk/rkward/rkward/windows/rkcommandeditorwindowpart.rc
===================================================================
--- trunk/rkward/rkward/windows/rkcommandeditorwindowpart.rc 2010-06-29 10:28:23 UTC (rev 2912)
+++ trunk/rkward/rkward/windows/rkcommandeditorwindowpart.rc 2010-06-29 15:39:12 UTC (rev 2913)
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="53">
+<kpartgui name="rkward_commandeditor" version="54">
<MenuBar>
<Menu name="edit"><text>&Edit</text>
<Menu name="tools" group="edit_first_merge"><text>&Tools Move</text>
@@ -8,7 +8,7 @@
<Action name="mark_block" group="edit_select_merge"/>
<Action name="unmark_block" group="edit_select_merge"/>
</Menu>
- <Menu name="run" noMerge="1"><text>&Run</text>
+ <Menu name="run"><text>&Run</text>
<Action name="run_block" group="postrun_actions_merge"/>
<Separator group="postrun_actions_merge"/>
<Action name="setwd_to_script" group="postrun_actions_merge"/>
Modified: trunk/rkward/rkward/windows/rkcommandlogpart.rc
===================================================================
--- trunk/rkward/rkward/windows/rkcommandlogpart.rc 2010-06-29 10:28:23 UTC (rev 2912)
+++ trunk/rkward/rkward/windows/rkcommandlogpart.rc 2010-06-29 15:39:12 UTC (rev 2913)
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="51">
+<kpartgui name="rkward_commandlog" version="54">
<MenuBar>
<Menu name="edit"><text>&Edit</text>
<Action name="log_select_all"/>
Modified: trunk/rkward/rkward/windows/rkhelpwindow.rc
===================================================================
--- trunk/rkward/rkward/windows/rkhelpwindow.rc 2010-06-29 10:28:23 UTC (rev 2912)
+++ trunk/rkward/rkward/windows/rkhelpwindow.rc 2010-06-29 15:39:12 UTC (rev 2913)
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="50">
+<kpartgui name="rkward_helpwindow" version="54">
<MenuBar>
<Menu name="file"><text>&File</text>
<Action name="print_help"/>
Modified: trunk/rkward/rkward/windows/rkoutputwindow.rc
===================================================================
--- trunk/rkward/rkward/windows/rkoutputwindow.rc 2010-06-29 10:28:23 UTC (rev 2912)
+++ trunk/rkward/rkward/windows/rkoutputwindow.rc 2010-06-29 15:39:12 UTC (rev 2913)
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="50">
+<kpartgui name="rkward_outputwindow" version="54">
<MenuBar>
<Menu name="file"><text>&File</text>
<Action name="print_output"/>
Modified: trunk/rkward/rkward/windows/rkstandardactions.rc
===================================================================
--- trunk/rkward/rkward/windows/rkstandardactions.rc 2010-06-29 10:28:23 UTC (rev 2912)
+++ trunk/rkward/rkward/windows/rkstandardactions.rc 2010-06-29 15:39:12 UTC (rev 2913)
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="53">
+<kpartgui name="rkward_standardactions" version="54">
<!-- What is this for, wouldn't it be easier to just inline these actions in the parts where they
end up? Yes, but then they would be separate actions, internally, and each could be assigned
a shortcut of its own. This is needed to tie them all together. -->
Modified: trunk/rkward/rkward/windows/rktoplevelwindowgui.rc
===================================================================
--- trunk/rkward/rkward/windows/rktoplevelwindowgui.rc 2010-06-29 10:28:23 UTC (rev 2912)
+++ trunk/rkward/rkward/windows/rktoplevelwindowgui.rc 2010-06-29 15:39:12 UTC (rev 2913)
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="52">
+<kpartgui name="rkward_toplevel" version="54">
<MenuBar>
<Merge/>
<Menu name="window"><text>&Window</text>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list