<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/129992/">https://git.reviewboard.kde.org/r/129992/</a>
</td>
</tr>
</table>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; border-collapse: collapse; margin: 2px padding: 2px;">
<thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; font-size: 9pt; padding: 4px 8px; text-align: left;">
<a href="https://git.reviewboard.kde.org/r/129992/diff/2/?file=492311#file492311line537" style="color: black; font-weight: bold; text-decoration: underline;">keduvocdocument/keduvockvtml2writer.cpp</a>
<span style="font-weight: normal;">
(Diff revision 2)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
<th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">537</font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">if</span> <span class="p">(</span> <span class="n">KIO</span><span class="o">::</span><span class="n">upUrl</span><span class="p">(</span><span class="n">docDirUrl</span><span class="p">).</span><span class="n">isParentOf</span><span class="p">(</span> <span class="n">translation</span><span class="o">-></span><span class="n">imageUrl</span><span class="p">())</span> <span class="p">)</span> <span class="p">{</span></pre></td>
</tr>
</tbody>
</table>
<div style="margin-left: 2em;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">i don't think using docDirUrl and upUrl is what we want, since you're going two levels up in the url now, no?</p></pre>
</div>
</div>
<br />
<p>- Albert Astals Cid</p>
<br />
<p>On March 6th, 2017, 11:24 p.m. UTC, Xin Huang wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: 1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;">
<tr>
<td>
<div>Review request for KDE Edu.</div>
<div>By Xin Huang.</div>
<p style="color: grey;"><i>Updated March 6, 2017, 11:24 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
libkeduvocdocument
</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;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;"><div class="codehilite" style="background: #f8f8f8"><pre style="line-height: 125%"><span></span><span style="color: #008000; font-weight: bold">bool</span> <span style="color: #008000; font-weight: bold">KEduVocKvtml2Writer</span><span style="color: #666666">:</span><span style="color: #AA22FF">:writeTranslation</span><span style="color: #666666">(</span> <span style="color: #008000; font-weight: bold">QDomElement</span> <span style="color: #666666">&</span><span style="color: #008000; font-weight: bold">translationElement</span><span style="color: #666666">,</span> <span style="color: #008000; font-weight: bold">KEduVocTranslation</span><span style="color: #666666">*</span> <span style="color: #008000; font-weight: bold">translation</span> <span style="color: #666666">)</span>
{
<span style="color: #666666">//</span> <span style="color: #666666">...</span>
<span style="color: #666666">//</span> sound
if ( <span style="color: #666666">!</span>translation<span style="color: #666666">-></span>soundUrl()<span style="color: #666666">.</span>isEmpty() ) <span style="border: 1px solid #FF0000">{</span>
QString urlString;
qDebug() <span style="color: #666666"><<</span> <span style="color: #BA2121">"soundUrl"</span> <span style="color: #666666"><<</span> translation<span style="color: #666666">-></span>soundUrl();
if ( KIO<span style="color: #666666">::</span>upUrl(m_doc<span style="color: #666666">-></span><span style="color: #008000">url()</span><span style="color: #666666">.</span>adjusted(QUrl<span style="color: #666666">::</span>RemoveFilename))<span style="color: #666666">.</span>isParentOf( translation<span style="color: #666666">-></span>soundUrl()) ) <span style="border: 1px solid #FF0000">{</span>
<span style="color: #666666">//</span> try to save as <span style="color: #008000">relative</span> <span style="color: #008000">url</span>
urlString <span style="color: #666666">=</span> m_doc<span style="color: #666666">-></span><span style="color: #008000">url()</span><span style="color: #666666">.</span>toString(QUrl<span style="color: #666666">::</span>RemoveFilename) <span style="color: #666666">+</span> <span style="color: #BA2121">'/'</span> <span style="color: #666666">+</span> translation<span style="color: #666666">-></span>soundUrl()<span style="color: #666666">.</span>toString(); <span style="color: #666666">//</span> <span style="color: #666666"><------------</span> HERE
} <span style="color: #008000; font-weight: bold">else</span> {
urlString <span style="color: #666666">=</span> translation<span style="color: #666666">-></span>soundUrl()<span style="color: #666666">.</span><span style="color: #008000">url()</span>;
}
<span style="color: #008000; font-weight: bold">qDebug</span><span style="color: #666666">()</span> <span style="color: #666666"><<</span> <span style="color: #BA2121">"urlString"</span> <span style="color: #666666"><<</span> <span style="color: #008000; font-weight: bold">urlString</span><span style="color: #666666">;</span>
<span style="color: #008000; font-weight: bold">translationElement</span><span style="color: #0000FF; font-weight: bold">.appendChild</span><span style="color: #666666">(</span> <span style="color: #008000; font-weight: bold">newTextElement</span><span style="color: #666666">(</span> <span style="color: #008000; font-weight: bold">KVTML_SOUND</span><span style="color: #666666">,</span> <span style="color: #008000; font-weight: bold">urlString</span> <span style="color: #666666">)</span> <span style="color: #666666">);</span>
<span style="border: 1px solid #FF0000">}</span>
</pre></div>
</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Notice the line marked: The soundUrl of a translation parley passed in is "file:///path/to/kvtml/kvtmlfilename_files/File:En-us-Word.ogg", and the <code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: inherit;">m_doc->url()</code> is "file:///path/to/kvtml/kvtmlfilename.kvtml". By the old logic saving as relative url, the result will be "file:///path/to/kvtml/file:///path/to/kvtml/kvtmlfilename_files/Files:En-us-word.ogg".</p></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>keduvocdocument/keduvockvtml2writer.cpp <span style="color: grey">(ff9c292)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/129992/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>