[rkward] /: Insert separator between "main" toolbar actions and "context" actions.
Thomas Friedrichsmeier
thomas.friedrichsmeier at ruhr-uni-bochum.de
Wed Nov 4 14:31:59 UTC 2015
Git commit 1f3afd0399cb493efab1c313e5e31cf3cd24fdb7 by Thomas Friedrichsmeier.
Committed on 04/11/2015 at 14:27.
Pushed by tfry into branch 'master'.
Insert separator between "main" toolbar actions and "context" actions.
Essentially the trick was to remove the secondary tool bar...
M +1 -0 ChangeLog
M +2 -2 rkward/dataeditor/rkeditordataframepart.rc
M +6 -6 rkward/rkwardui.rc
M +2 -2 rkward/windows/rkcatchedx11windowpart.rc
M +2 -3 rkward/windows/rkcommandeditorwindowpart.rc
M +2 -2 rkward/windows/rkhelpwindow.rc
M +2 -2 rkward/windows/rkoutputwindow.rc
M +2 -2 rkward/windows/rkstandardactions.rc
http://commits.kde.org/rkward/1f3afd0399cb493efab1c313e5e31cf3cd24fdb7
diff --git a/ChangeLog b/ChangeLog
index 52ddb97..b691825 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+- Fix some minor toolbar glitches
- Complete rework of <optionset> UI for better usability
- Try harder to honor system locale settings
- Remove obsolete "Export tabular data" plugin (superceded by "Export Table / CSV")
diff --git a/rkward/dataeditor/rkeditordataframepart.rc b/rkward/dataeditor/rkeditordataframepart.rc
index d9e7f4b..6d793d2 100644
--- a/rkward/dataeditor/rkeditordataframepart.rc
+++ b/rkward/dataeditor/rkeditordataframepart.rc
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkeditordataframepart" version="64">
+<kpartgui name="rkeditordataframepart" version="640">
<MenuBar>
<Menu name="edit"><text>&Edit</text>
<Action name="cut"/>
@@ -37,7 +37,7 @@
<Action name="show_rownames"/>
<Action name="enable_editing"/>
</Menu>
- <ToolBar fullWidth="true" name="mdiToolBar">
+ <ToolBar fullWidth="true" name="mainToolBar">
<Action name="cut"/>
<Action name="copy"/>
<Action name="paste"/>
diff --git a/rkward/rkwardui.rc b/rkward/rkwardui.rc
index 2adeed5..6df03aa 100644
--- a/rkward/rkwardui.rc
+++ b/rkward/rkwardui.rc
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward_main" version="620">
+<kpartgui name="rkward_main" version="640">
<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.
@@ -90,11 +90,11 @@
</Menu>
</MenuBar>
<ToolBar fullWidth="true" name="mainToolBar">
- <Action name="open_any"/>
- <Action name="new_any"/>
- <Action name="save_any"/>
-</ToolBar>
-<ToolBar fullWidth="true" name="mdiToolBar"><text>Window specific actions bar</text>
+ <Action name="open_any"/>
+ <Action name="new_any"/>
+ <Action name="save_any"/>
+ <Separator/>
+ <Merge/>
<DefineGroup name="pretoolbar_actions_merge" append="pretoolbar_actions_merge"/>
<DefineGroup name="toolbar_actions_merge" append="toolbar_actions_merge"/>
<DefineGroup name="posttoolbar_actions_merge" append="posttoolbar_actions_merge"/>
diff --git a/rkward/windows/rkcatchedx11windowpart.rc b/rkward/windows/rkcatchedx11windowpart.rc
index 87c72cc..a191c4a 100644
--- a/rkward/windows/rkcatchedx11windowpart.rc
+++ b/rkward/windows/rkcatchedx11windowpart.rc
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward_x11window" version="620">
+<kpartgui name="rkward_x11window" version="640">
<MenuBar>
<Menu name="device"><text>&Device</text>
<Action name="device_activate"/>
@@ -38,7 +38,7 @@
</Menu>
<Merge/>
</MenuBar>
- <ToolBar name="mdiToolBar">
+ <ToolBar name="mainToolBar">
<Action name="device_copy_to_output"/>
<Separator/>
<Action name="plot_list"/>
diff --git a/rkward/windows/rkcommandeditorwindowpart.rc b/rkward/windows/rkcommandeditorwindowpart.rc
index 1f2ea1b..1d7da83 100644
--- a/rkward/windows/rkcommandeditorwindowpart.rc
+++ b/rkward/windows/rkcommandeditorwindowpart.rc
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward_commandeditor" version="54">
+<kpartgui name="rkward_commandeditor" version="640">
<MenuBar>
<Menu name="edit"><text>&Edit</text>
<Menu name="tools" group="edit_first_merge"><text>&Tools Move</text>
@@ -18,8 +18,7 @@
</Menu>
</MenuBar>
- <ToolBar fullWidth="true" name="mdiToolBar">
- <Separator group="posttoolbar_actions_merge"/>
+ <ToolBar fullWidth="true" name="mainToolBar">
<Action name="run_block" group="posttoolbar_actions_merge"/>
<Action name="setwd_to_script" group="posttoolbar_actions_merge"/>
</ToolBar>
diff --git a/rkward/windows/rkhelpwindow.rc b/rkward/windows/rkhelpwindow.rc
index 55cd006..df522c9 100644
--- a/rkward/windows/rkhelpwindow.rc
+++ b/rkward/windows/rkhelpwindow.rc
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward_helpwindow" version="640">
+<kpartgui name="rkward_helpwindow" version="641">
<MenuBar>
<Menu name="file"><text>&File</text>
<Action name="print_html"/>
@@ -20,7 +20,7 @@
<Action name="view_encoding"/>
</Menu>
</MenuBar>
- <ToolBar fullWidth="true" name="mdiToolBar">
+ <ToolBar fullWidth="true" name="mainToolBar">
<Action name="help_back" group="pretoolbar_actions_merge"/>
<Action name="help_forward" group="pretoolbar_actions_merge"/>
<Separator group="pretoolbar_actions_merge"/>
diff --git a/rkward/windows/rkoutputwindow.rc b/rkward/windows/rkoutputwindow.rc
index 1766340..d0af99a 100644
--- a/rkward/windows/rkoutputwindow.rc
+++ b/rkward/windows/rkoutputwindow.rc
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward_outputwindow" version="640">
+<kpartgui name="rkward_outputwindow" version="641">
<MenuBar>
<Menu name="file"><text>&File</text>
<Action name="print_html"/>
@@ -24,7 +24,7 @@
<Action name="output_refresh"/>
</Menu>
</MenuBar>
- <ToolBar fullWidth="true" name="mdiToolBar">
+ <ToolBar fullWidth="true" name="mainToolBar">
<Action name="output_flush"/>
<Action name="output_refresh"/>
</ToolBar>
diff --git a/rkward/windows/rkstandardactions.rc b/rkward/windows/rkstandardactions.rc
index a711ac2..a7b1cac 100644
--- a/rkward/windows/rkstandardactions.rc
+++ b/rkward/windows/rkstandardactions.rc
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward_standardactions" version="620">
+<kpartgui name="rkward_standardactions" version="640">
<!-- 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. -->
@@ -24,7 +24,7 @@
<Action name="window_configure"/>
</Menu>
</MenuBar>
- <ToolBar fullWidth="true" name="mdiToolBar">
+ <ToolBar fullWidth="true" name="mainToolBar">
<Action name="run_line" group="toolbar_actions_merge"/>
<Action name="run_selection" group="toolbar_actions_merge"/>
<Action name="run_all" group="toolbar_actions_merge"/>
More information about the rkward-tracker
mailing list