[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-core-devel
Subject: Review Request: Write to the correct xmlFile in KToolBar::Private::slotContextShowText()
From: "Albert Astals Cid" <tsdgeos () terra ! es>
Date: 2012-01-28 15:28:32
Message-ID: 20120128152832.1885.46343 () vidsolbach ! de
[Download RAW message or body]
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/103812/
-----------------------------------------------------------
Review request for kdelibs and David Faure.
Description
-------
KToolBar::Private::slotContextShowText() was assuming that the xmlgui file it had to \
write was KGlobal::mainComponent.componentName() + "ui.rc";
which is obviously wrong since we have a setXMLFile function for a reason.
I tried using
xmlguiClient->xmlFile()
directly but in Okular we use the same the same toolbar name defined in two xml \
files, so that still did not work because this means we end up with just one KToolbar \
(yes i know that might be a misuse of the API).
So i ended up going through the actioncollections to find the action and get the \
correct client from there.
This addresses bug 292574.
http://bugs.kde.org/show_bug.cgi?id=292574
Diffs
-----
kdeui/widgets/ktoolbar.cpp cce242b
Diff: http://git.reviewboard.kde.org/r/103812/diff/diff
Testing
-------
Fixes the issue in Okular, i tested it does still work with Kate that is using the \
ui.rc scheme.
Thanks,
Albert Astals Cid
[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://git.reviewboard.kde.org/r/103812/">http://git.reviewboard.kde.org/r/103812/</a>
</td>
</tr>
</table>
<br />
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" \
style="background-image: \
url('http://git.reviewboard.kde.org/media/rb/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 Albert Astals Cid.</div>
<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; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">KToolBar::Private::slotContextShowText() was assuming that the xmlgui \
file it had to write was KGlobal::mainComponent.componentName() + "ui.rc";
which is obviously wrong since we have a setXMLFile function for a reason.
I tried using
xmlguiClient->xmlFile()
directly but in Okular we use the same the same toolbar name defined in two xml \
files, so that still did not work because this means we end up with just one KToolbar \
(yes i know that might be a misuse of the API).
So i ended up going through the actioncollections to find the action and get the \
correct client from there.</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; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">Fixes the issue in Okular, i tested it does still work with Kate that is \
using the ui.rc scheme.</pre> </td>
</tr>
</table>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Bugs: </b>
<a href="http://bugs.kde.org/show_bug.cgi?id=292574">292574</a>
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>kdeui/widgets/ktoolbar.cpp <span style="color: grey">(cce242b)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/103812/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