<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/118237/">https://git.reviewboard.kde.org/r/118237/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On August 1st, 2014, 5:42 p.m. CEST, <b>Martin Klapetek</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<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/118237/diff/1/?file=273922#file273922line121" style="color: black; font-weight: bold; text-decoration: underline;">contact-list-widget.cpp</a>
<span style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">ContactListWidget::ContactListWidget(QWidget *parent)</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">116</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">if</span> <span class="p">(</span><span class="n">KTp</span><span class="o">::</span><span class="n">kpeopleEnabled</span><span class="p">())</span> <span class="p">{</span></pre></td>
<th bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">121</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">setIndentation</span><span class="p">(</span><span class="mi">0</span><span class="p">);</span></pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#ebb1ba" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">117</font></th>
<td bgcolor="#ffc5ce" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">setIndentation</span><span class="p">(</span><span class="mi">18</span><span class="p">);</span></pre></td>
<th bgcolor="#ebb1ba" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#ffc5ce" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
</tr>
<tr>
<th bgcolor="#ebb1ba" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">118</font></th>
<td bgcolor="#ffc5ce" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="p">}</span> <span class="k">else</span> <span class="p">{</span></pre></td>
<th bgcolor="#ebb1ba" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#ffc5ce" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
</tr>
<tr>
<th bgcolor="#ebb1ba" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">119</font></th>
<td bgcolor="#ffc5ce" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">setIndentation</span><span class="p">(</span><span class="mi">0</span><span class="p">);</span></pre></td>
<th bgcolor="#ebb1ba" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#ffc5ce" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
</tr>
<tr>
<th bgcolor="#ebb1ba" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">120</font></th>
<td bgcolor="#ffc5ce" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="p">}</span></pre></td>
<th bgcolor="#ebb1ba" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#ffc5ce" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
</tr>
</tbody>
</table>
<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;">Any reason for this change?</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">We do this to have a space for the ">" metacontact expansion button</p></pre>
</blockquote>
<p>On August 4th, 2014, 4:40 p.m. CEST, <b>Dan Vrátil</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<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 had to move the indentation into delegates, because otherwise the top level groups ("Chat rooms" and "Contacts") would get indented too.</p></pre>
</blockquote>
</blockquote>
<pre style="margin-left: 1em; 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;">Actually that breaks merged contacts and I can unindent the top level groups easily, so I take the previous comment back.</p></pre>
<br />
<p>- Dan</p>
<br />
<p>On May 21st, 2014, 10:13 p.m. CEST, Dan Vrátil 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 Telepathy.</div>
<div>By Dan Vrátil.</div>
<p style="color: grey;"><i>Updated May 21, 2014, 10:13 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
ktp-contact-list
</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;">The long-awaited Dan-sized patch is here :-)
This patch merges the KTp::ContactsModel and RoomsModel (simple channel observer) into a single tree model via ContactsRoomsModel. The model now looks like
|
|- Chat rooms
| |- room1@conf.kdetalk.net
| |- room2@conf.kdetalk.net
|- Contacts
|- Group 1
| |- Contact 1
| |- Contact 2
|- Group 2
After a few beers, I was even able to make my model work with David's EmptyRowFilter, so the "Chat rooms" (or "Contacts") top-level nodes will be automatically hidden, when they have no children
The patch is so big, because I refactored the delegates a little, but other than that, it's just the two new models and small changes in context menu and contact overlays to support rooms.
Unfortunately this patch causes ktp-contact-list to crash when switching from "Do not show groups" to "Show contacts by groups". Interestingly, it does not crash when switching the other way around. I'm completely clueless, so if you guys can figure something out, it would me much appreciated. This patch cannot go in until the crash is fixed of course.</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;">Joined a room, room immediately appeared in the CL. Closed text-ui, room remained in CL. Clicked the room in CL, text-ui was started again. Left the room, it disappeared from CL.</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>CMakeLists.txt <span style="color: grey">(1ee112a)</span></li>
<li>abstract-contact-delegate.h <span style="color: grey">(2339833)</span></li>
<li>abstract-contact-delegate.cpp <span style="color: grey">(a92cc4e)</span></li>
<li>contact-delegate-compact.h <span style="color: grey">(736d2e5)</span></li>
<li>contact-delegate-compact.cpp <span style="color: grey">(c51a210)</span></li>
<li>contact-delegate.h <span style="color: grey">(9f0e5df)</span></li>
<li>contact-delegate.cpp <span style="color: grey">(537e204)</span></li>
<li>contact-list-widget.h <span style="color: grey">(8f39b81)</span></li>
<li>contact-list-widget.cpp <span style="color: grey">(3ffa1cc)</span></li>
<li>contact-list-widget_p.h <span style="color: grey">(e4a5eb3)</span></li>
<li>contact-overlays.h <span style="color: grey">(a998644)</span></li>
<li>contact-overlays.cpp <span style="color: grey">(ee14e8f)</span></li>
<li>contacts-rooms-model.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>contacts-rooms-model.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>context-menu.h <span style="color: grey">(bec4e55)</span></li>
<li>context-menu.cpp <span style="color: grey">(00795d7)</span></li>
<li>empty-row-filter.cpp <span style="color: grey">(01b2b48)</span></li>
<li>main-widget.cpp <span style="color: grey">(a07b534)</span></li>
<li>rooms-model.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>rooms-model.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>tooltips/tooltipmanager.cpp <span style="color: grey">(555d425)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/118237/diff/" style="margin-left: 3em;">View Diff</a></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">File Attachments </h1>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2014/05/21/09b64e1d-7c31-4fc1-a3ff-08996fcd930d__ktp-cl.png">Screenshot</a></li>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2014/05/21/b6bf32cb-3e65-47e3-af15-5859e2dbdda5__ktp-cl.png">Screenshot with contact groups enabled</a></li>
</ul>
</td>
</tr>
</table>
</div>
</body>
</html>