[rkward-cvs] SF.net SVN: rkward:[2442] trunk/rkward
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Mon Apr 6 12:22:57 UTC 2009
Revision: 2442
http://rkward.svn.sourceforge.net/rkward/?rev=2442&view=rev
Author: tfry
Date: 2009-04-06 12:22:57 +0000 (Mon, 06 Apr 2009)
Log Message:
-----------
Make all mdi windows use only one common toolbar. Fixes jumpyness issues
Modified Paths:
--------------
trunk/rkward/ChangeLog
trunk/rkward/rkward/dataeditor/rkeditordataframepart.rc
trunk/rkward/rkward/rkconsolepart.rc
trunk/rkward/rkward/rkwardui.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/rkworkplaceview.cpp
Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog 2009-04-06 09:27:12 UTC (rev 2441)
+++ trunk/rkward/ChangeLog 2009-04-06 12:22:57 UTC (rev 2442)
@@ -1,3 +1,5 @@
+- Fix jumping toolbar
+- Fixed: Several harmless warnings were silenced
- Fixed: Argument hints would always stay on top regardless of focus
- Fix crash when reaching bottom of command history in context sensitive search
TODO: Backport needed?
Modified: trunk/rkward/rkward/dataeditor/rkeditordataframepart.rc
===================================================================
--- trunk/rkward/rkward/dataeditor/rkeditordataframepart.rc 2009-04-06 09:27:12 UTC (rev 2441)
+++ trunk/rkward/rkward/dataeditor/rkeditordataframepart.rc 2009-04-06 12:22:57 UTC (rev 2442)
@@ -13,13 +13,13 @@
<!-- <Menu name="windows"><text>&Windows</text>
<Action name="window_close"/>
</Menu>-->
- <ToolBar fullWidth="true" name="editToolBar">
- <Action name="cut"/>
- <Action name="copy"/>
- <Action name="paste"/>
- <Separator/>
- <Action name="paste_to_selection"/>
- <Action name="paste_to_table"/>
- </ToolBar>
</MenuBar>
+ <ToolBar fullWidth="true" name="mdiToolBar">
+ <Action name="cut"/>
+ <Action name="copy"/>
+ <Action name="paste"/>
+ <Separator/>
+ <Action name="paste_to_selection"/>
+ <Action name="paste_to_table"/>
+ </ToolBar>
</kpartgui>
Modified: trunk/rkward/rkward/rkconsolepart.rc
===================================================================
--- trunk/rkward/rkward/rkconsolepart.rc 2009-04-06 09:27:12 UTC (rev 2441)
+++ trunk/rkward/rkward/rkconsolepart.rc 2009-04-06 12:22:57 UTC (rev 2442)
@@ -21,11 +21,9 @@
<Action name="function_reference"></Action>
</Menu>
</MenuBar>
- <ToolBar fullWidth="true" name="runToolBar">
+ <ToolBar fullWidth="true" name="mdiToolBar">
<Action name="run_selection"/>
<Action name="interrupt"/>
- <Separator/>
- <Merge/>
</ToolBar>
<Menu name="rkconsole_context_menu">
<Action name="rkconsole_copy"></Action>
Modified: trunk/rkward/rkward/rkwardui.rc
===================================================================
--- trunk/rkward/rkward/rkwardui.rc 2009-04-06 09:27:12 UTC (rev 2441)
+++ trunk/rkward/rkward/rkwardui.rc 2009-04-06 12:22:57 UTC (rev 2442)
@@ -80,6 +80,6 @@
<Action name="prev_window"/>
<Action name="next_window"/>
</ToolBar>
-<ToolBar fullWidth="true" name="runToolBar">
+<ToolBar fullWidth="true" name="mdiToolBar">
</ToolBar>
</kpartgui>
Modified: trunk/rkward/rkward/windows/rkcommandeditorwindowpart.rc
===================================================================
--- trunk/rkward/rkward/windows/rkcommandeditorwindowpart.rc 2009-04-06 09:27:12 UTC (rev 2441)
+++ trunk/rkward/rkward/windows/rkcommandeditorwindowpart.rc 2009-04-06 12:22:57 UTC (rev 2442)
@@ -25,7 +25,7 @@
<Action name="function_reference"></Action>
</Menu>
</MenuBar>
- <ToolBar fullWidth="true" name="runToolBar">
+ <ToolBar fullWidth="true" name="mdiToolBar">
<Action name="run_line"/>
<Action name="run_selection"/>
<Action name="run_all"/>
Modified: trunk/rkward/rkward/windows/rkcommandlogpart.rc
===================================================================
--- trunk/rkward/rkward/windows/rkcommandlogpart.rc 2009-04-06 09:27:12 UTC (rev 2441)
+++ trunk/rkward/rkward/windows/rkcommandlogpart.rc 2009-04-06 12:22:57 UTC (rev 2442)
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="0.4.8">
+<kpartgui name="rkward" version="0.5.0">
<Menubar>
<Menu name="edit"><text>&Edit</text>
<Action name="log_select_all"/>
@@ -23,7 +23,7 @@
<Separator/>
<Action name="log_configure"/>
</Menu>
- <ToolBar fullWidth="true" name="runToolBar">
+ <ToolBar fullWidth="true" name="mdiToolBar">
<Action name="log_run_selection"/>
</ToolBar>
</kpartgui>
Modified: trunk/rkward/rkward/windows/rkhelpwindow.rc
===================================================================
--- trunk/rkward/rkward/windows/rkhelpwindow.rc 2009-04-06 09:27:12 UTC (rev 2441)
+++ trunk/rkward/rkward/windows/rkhelpwindow.rc 2009-04-06 12:22:57 UTC (rev 2442)
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="0.4.8">
+<kpartgui name="rkward" version="0.5.0">
<MenuBar>
<Menu name="file"><text>&File</text>
<Action name="print_help"/>
@@ -12,11 +12,10 @@
</Menu>
<Merge/>
</MenuBar>
- <ToolBar fullWidth="true" name="navigation_toolbar">
+ <ToolBar fullWidth="true" name="mdiToolbar">
<Action name="help_back"/>
<Action name="help_forward"/>
- </ToolBar>
- <ToolBar name="runToolBar">
+ <Separator/>
<Action name="run_selection"/>
</ToolBar>
</kpartgui>
Modified: trunk/rkward/rkward/windows/rkoutputwindow.rc
===================================================================
--- trunk/rkward/rkward/windows/rkoutputwindow.rc 2009-04-06 09:27:12 UTC (rev 2441)
+++ trunk/rkward/rkward/windows/rkoutputwindow.rc 2009-04-06 12:22:57 UTC (rev 2442)
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="0.4.8">
+<kpartgui name="rkward" version="0.5.0">
<MenuBar>
<Menu name="file"><text>&File</text>
<Action name="print_output"/>
@@ -14,7 +14,7 @@
<Action name="output_refresh"/>
</Menu>
</MenuBar>
- <ToolBar fullWidth="true" name="mainToolBar">
+ <ToolBar fullWidth="true" name="mdiToolBar">
<Action name="output_flush"/>
<Action name="output_refresh"/>
</ToolBar>
Modified: trunk/rkward/rkward/windows/rkworkplaceview.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkworkplaceview.cpp 2009-04-06 09:27:12 UTC (rev 2441)
+++ trunk/rkward/rkward/windows/rkworkplaceview.cpp 2009-04-06 12:22:57 UTC (rev 2442)
@@ -2,7 +2,7 @@
rkworkplaceview - description
-------------------
begin : Tue Sep 26 2006
- copyright : (C) 2006, 2007 by Thomas Friedrichsmeier
+ copyright : (C) 2006, 2007, 2009 by Thomas Friedrichsmeier
email : tfry at users.sourceforge.net
***************************************************************************/
@@ -191,6 +191,7 @@
RKMDIWindow *w = activePage ();
if (w) {
setCaption (w->shortCaption ());
+ w->activate (); // not always automatically active
} else {
setCaption (QString ());
}
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