Review Request: Enable Shortcuts + Toolbar configuration in KmPlot

[Albert Astals Cid]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/101927/#review4639
-----------------------------------------------------------


This is my suggested patch, it let's xmlgui do its magic without forcing any of the stuff and as far as i can see solves all your problems

diff --git a/kmplot/kmplot_part.rc b/kmplot/kmplot_part.rc
index fc64866..91c225f 100644
--- a/kmplot/kmplot_part.rc
+++ b/kmplot/kmplot_part.rc
@@ -32,10 +32,7 @@
                        <Action name="maximumvalue"/>
                        <Action name="minimumvalue"/>
                </Menu>
-                <Menu name="settings"><text>&amp;Settings</text>
-                        <Separator />
-                        <Action name="options_configure_keybinding"/>
-                        <Action name="options_configure_toolbars"/>
+                <Menu name="settings">
                        <Action name="options_configure"/>
                </Menu>
                <Menu name="help"><text>&amp;Help</text>
diff --git a/kmplot/kmplot_part_readonly.rc b/kmplot/kmplot_part_readonly.rc
index 8d83ec9..417d929 100644
--- a/kmplot/kmplot_part_readonly.rc
+++ b/kmplot/kmplot_part_readonly.rc
@@ -29,7 +29,7 @@
                        <Action name="maximumvalue"/>
                        <Action name="minimumvalue"/>
                </Menu>
-                <Menu name="settings"><text>&amp;Settings</text>
+                <Menu name="settings">
                        <Action name="options_configure"/>
                </Menu>
                <Menu name="help"><text>&amp;Help</text>
diff --git a/kmplot/kmplot_shell.rc b/kmplot/kmplot_shell.rc
index 8c0824f..7f64cce 100644
--- a/kmplot/kmplot_shell.rc
+++ b/kmplot/kmplot_shell.rc
@@ -10,19 +10,6 @@
                        <Action name="file_quit"/>
                </Menu>
                <Merge/>
-                <Menu noMerge="1" name="settings"><text>&amp;Settings</text>
-                        <!--<Action name="options_show_toolbar"/>-->
-                        <Merge name="StandardToolBarMenuHandler" />
-                        <Action name="options_show_statusbar"/>
-                        <Separator/>
-                        <Action name="fullscreen" />
-                        <Merge/>
-<!--                        <Separator/>
-                        <Action name="options_configure_keybinding"/>
-                        <Action name="options_configure_toolbars"/>
-                        <Action name="options_configure"/>-->
-                        <Separator/>
-                </Menu>
                <Menu name="help"><text>&amp;Help</text>
                        <DefineGroup name="names_group" />
                </Menu>

- Albert


On July 12, 2011, 9:34 a.m., Burkhard Lück wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/101927/
> -----------------------------------------------------------
> 
> (Updated July 12, 2011, 9:34 a.m.)
> 
> 
> Review request for KDE Edu, Anne-Marie Mahfouf and Christoph Feck.
> 
> 
> Summary
> -------
> 
> Since around kde 4.1/4.2 selecting the menu items Settings->Configure Shortcuts and Settings->Configure Toolbars do not launch both configuration dialogs any more. So it is impossible now to change shortcuts and toolbar items in kmplot.
> 
> With this patch the toolbars dialog with both toolbars is opened and the items can be changed. The shortcuts dialog opens as well, but not all actions/shortcuts are listed, only New, Open, Quit, Full Screen Mode, Handbook, WhatsThis, About KDE, About KmPlot, Configure Shortcuts, Configure Toolbars, Report Bug, Show Statusbar and Switch Languages.
> All other actions/shortcuts can only be configured using kmplot_part_readonly in konqueror.
> That is the same behavior as in kde 3.9.
> 
> I don't understand all the magic behind shell/parts + menu/actions merging so I can not fix the missing actions in the shortcuts dialog.
> 
> Strange is that kmplot has 3 rc files (kmplot_shell.rc, kmplot_part.rc and kmplot_part_readonly.rc) whereas e.g okular/konsole (also usable as kparts in konqueror) have only two rc files.
> 
> 
> This addresses bugs 177014 and 268445.
>     http://bugs.kde.org/show_bug.cgi?id=177014
>     http://bugs.kde.org/show_bug.cgi?id=268445
> 
> 
> Diffs
> -----
> 
>   kmplot/kmplot_part.rc fc64866 
>   kmplot/kmplot_shell.rc 8c0824f 
> 
> Diff: http://git.reviewboard.kde.org/r/101927/diff
> 
> 
> Testing
> -------
> 
> Works for me as described above.
> 
> 
> Thanks,
> 
> Burkhard
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.kde.org/pipermail/kde-edu/attachments/20110712/f913b09a/attachment.htm