[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-core-devel
Subject: Re: Review Request: ActionProperties merging fix
From: "David Faure" <faure () kde ! org>
Date: 2010-07-07 15:04:27
Message-ID: 20100707150427.12590.17564 () localhost
[Download RAW message or body]
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://reviewboard.kde.org/r/4531/#review6410
-----------------------------------------------------------
Hmm, yeah, I'm not surprised, ActionProperties for shortcuts were only added for \
saving the user's changes. Can you explain why you install a global file with \
shortcuts, rather than calling kaction->setShortcut? Just curious.
- David
On 2010-07-06 20:58:39, Andras Mantia wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://reviewboard.kde.org/r/4531/
> -----------------------------------------------------------
>
> (Updated 2010-07-06 20:58:39)
>
>
> Review request for kdelibs and David Faure.
>
>
> Summary
> -------
>
> When using replaceXMLFile (but it might happen in any case when setXMLFile is \
> called on a gui client), the code tries to copy over the local ActionProperties \
> section to the global one, so it doesn't get lost if the global file has a higher \
> version number. Unfortunately when doing so, it removed all ActionProperties from \
> the global file. This way it is not possible to have global xmlui files containing \
> ActionProperties. The patch fixes it, by only removing the properties of those \
> actions that are present in the local file as well. This way user shortcut changes \
> are preserved, even if the global file comes with different shortcuts, and global \
> shortcuts are taken in account if they were not overwritten by the user. I suppose \
> this was the intended behavior.
>
> Diffs
> -----
>
> /trunk/KDE/kdelibs/kdeui/xmlgui/kxmlguiversionhandler.cpp 1146838
>
> Diff: http://reviewboard.kde.org/r/4531/diff
>
>
> Testing
> -------
>
> I did some basic testing with KDevelop, that has this code (view is a KTextEditor \
> view, a KXMLGuiClient): //in KDE >= 4.4 we can use KXMLGuiClient::replaceXMLFile to \
> provide //katepart with out own restructured UI configuration
> QStringList katePartUIs = KGlobal::mainComponent().dirs()->findAllResources("data", \
> "kdevelop/katepartui.rc"); const QString katePartUI = katePartUIs.last();
> const QString katePartLocalUI = KStandardDirs::locateLocal("data", \
> "kdevelop/katepartui.rc"); view->replaceXMLFile(katePartUI, katePartLocalUI);
>
>
> Thanks,
>
> Andras
>
>
[Attachment #3 (text/html)]
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 \
solid;"> <tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="http://reviewboard.kde.org/r/4531/">http://reviewboard.kde.org/r/4531/</a>
</td>
</tr>
</table>
<br />
<pre>Hmm, yeah, I'm not surprised, ActionProperties for shortcuts were only \
added for saving the user's changes. Can you explain why you install a global \
file with shortcuts, rather than calling kaction->setShortcut? Just curious.</pre> \
<br />
<p>- David</p>
<br />
<p>On July 6th, 2010, 8:58 p.m., Andras Mantia wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" \
style="background-image: \
url('http://reviewboard.kde.orgrb/images/review_request_box_top_bg.png'); \
background-position: left top; background-repeat: repeat-x; border: 1px black \
solid;"> <tr>
<td>
<div>Review request for kdelibs and David Faure.</div>
<div>By Andras Mantia.</div>
<p style="color: grey;"><i>Updated 2010-07-06 20:58:39</i></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0;">When using replaceXMLFile (but it might happen \
in any case when setXMLFile is called on a gui client), the code tries to copy over \
the local ActionProperties section to the global one, so it doesn't get lost if \
the global file has a higher version number. Unfortunately when doing so, it removed \
all ActionProperties from the global file. This way it is not possible to have global \
xmlui files containing ActionProperties. The patch fixes it, by only removing the \
properties of those actions that are present in the local file as well. This way user \
shortcut changes are preserved, even if the global file comes with different \
shortcuts, and global shortcuts are taken in account if they were not overwritten by \
the user. I suppose this was the intended behavior.</pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0;">I did some basic testing with KDevelop, that \
has this code (view is a KTextEditor view, a KXMLGuiClient):
//in KDE >= 4.4 we can use KXMLGuiClient::replaceXMLFile to provide
//katepart with out own restructured UI configuration
QStringList katePartUIs = \
KGlobal::mainComponent().dirs()->findAllResources("data", \
"kdevelop/katepartui.rc"); const QString katePartUI = katePartUIs.last();
const QString katePartLocalUI = KStandardDirs::locateLocal("data", \
"kdevelop/katepartui.rc"); view->replaceXMLFile(katePartUI, \
katePartLocalUI); </pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>/trunk/KDE/kdelibs/kdeui/xmlgui/kxmlguiversionhandler.cpp <span style="color: \
grey">(1146838)</span></li>
</ul>
<p><a href="http://reviewboard.kde.org/r/4531/diff/" style="margin-left: 3em;">View \
Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic