Review Request: ActionProperties merging fix

[Andras Mantia]

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

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

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20100706/9cc47519/attachment.htm>