[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-panel-devel
Subject: [Differential] [Commented On] D1722: Import next-gen libtaskmanager.
From: "davidedmundson (David Edmundson)" <noreply () phabricator ! kde ! org>
Date: 2016-05-31 9:35:40
Message-ID: 20160531093539.18924.71276.4B1CE365 () phabricator ! kde ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
davidedmundson added a comment.
Reviewed up to "libtaskmanager/taskfilterproxymodel.h"
Will submit this now, in case phabricator doesn't save it.
INLINE COMMENTS
> CMakeLists.txt:86
> +endif()
> +
> +write_basic_config_version_file(${CMAKE_CURRENT_BINARY_DIR}/LibTaskManagerConfigVersion.cmake \
> VERSION "${PROJECT_VERSION}" COMPATIBILITY AnyNewerVersion)
add_definitions(-DTRANSLATION_DOMAIN=...)
somewhere in this file
> Messages.sh:3
> +$EXTRACTRC *.ui >> rc.cpp || exit 11
> +$XGETTEXT *.cpp */*.cpp *.h -o $podir/libtaskmanager.pot
> +rm -f rc.cpp
The legacy version is also called this.
That will cause a breakage on the i18n side.
Either:
two .pot files
OR
one Messages.sh
> abstracttasksmodel.cpp:41-42
> +
> + roles.insert(Qt::DisplayRole, "DisplayRole");
> + roles.insert(Qt::DecorationRole, "DecorationRole");
> +
traditionally these are called "display" and "decoration"
lowercase and without the word "Role"
Also you should be able to do
roles = QAbstractItemModel::roles() to get them.
> activityinfo.cpp:55
> + if (!instanceCount) {
> + delete activityConsumer;
> + }
..and set pointer to null
Otherwise you have a crash if you delete them all and then then create a new one.
(or use QWeak and QShared pointer )
> activityinfo.cpp:69
> + connect(d->activityConsumer, &KActivities::Consumer::activitiesChanged,
> + this, &ActivityInfo::numberOfActivitiesChanged);
> +}
If I have 4 activities. 2 running, 2 not.
numberOfActivities returns 2
I set one to running:
the property changes
this signal is not emitted.
> concatenatetasksproxymodel.cpp:61
> + if (m) {
> + // NOTE: KConcatenateRowsProxyModel offers no way to get a non-const \
> pointer + // to one of the source models, so we have to go through a mapped \
> index.
we could add one?
sourceModelForIndex() would make sense for a few cases.
> startuptasksmodel.cpp:146
> + launcherUrls.insert(id.id(), launcherUrl(data));
> + QModelIndex idx = q->index(startups.indexOf(id));
> + emit q->dataChanged(idx, idx);
q->index(row)
REPOSITORY
rPLASMAWORKSPACE Plasma Workspace
REVISION DETAIL
https://phabricator.kde.org/D1722
EMAIL PREFERENCES
https://phabricator.kde.org/settings/panel/emailpreferences/
To: hein, Plasma
Cc: davidedmundson, plasma-devel, sebas
[Attachment #5 (text/html)]
<div>davidedmundson added a comment.</div><br /><div><div><p>Reviewed up to \
"libtaskmanager/taskfilterproxymodel.h"<br /> Will submit this now, in case \
phabricator doesn't save it.</p></div></div><br /><div><strong>INLINE \
COMMENTS</strong><div><div style="margin: 6px 0 12px 0;"><div style="border: 1px \
solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; \
border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div \
style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a \
style="float: right; text-decoration: none;" \
href="https://phabricator.kde.org/D1722#inline-6605" rel="noreferrer">View \
Inline</a><span style="color: #4b4d51; font-weight: \
bold;">CMakeLists.txt:86</span></div> <div style="font: 11px/15px "Menlo", \
"Consolas", "Monaco", monospace; white-space: pre-wrap; clear: \
both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; \
background: #d0ffd0;">endif() </div><div style="padding: 0 8px; margin: 0 4px; \
background: #d0ffd0;"> </div><div style="padding: 0 8px; margin: 0 4px; background: \
#d0ffd0;">write_basic_config_version_file(${CMAKE_CURRENT_BINARY_DIR}/LibTaskManagerConfigVersion.cmake \
VERSION "${PROJECT_VERSION}" COMPATIBILITY AnyNewerVersion) \
</div></div></div> <div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; \
margin: 8px;">add_definitions(-DTRANSLATION_DOMAIN=...)</p>
<p style="padding: 0; margin: 8px;">somewhere in this file</p></div></div><br /><div \
style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; \
background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 \
1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; \
overflow: hidden;"><a style="float: right; text-decoration: none;" \
href="https://phabricator.kde.org/D1722#inline-6597" rel="noreferrer">View \
Inline</a><span style="color: #4b4d51; font-weight: bold;">Messages.sh:3</span></div> \
<div style="font: 11px/15px "Menlo", "Consolas", \
"Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; \
margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"><span \
style="color: #001294">$EXTRACTRC</span> *.ui >> rc.cpp <span style="color: \
#aa2211">||</span> <span style="color: #304a96">exit </span>11 </div><div \
style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"><span style="color: \
#001294">$XGETTEXT</span> *.cpp */*.cpp *.h -o <span style="color: \
#001294">$podir</span>/libtaskmanager.pot </div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">The \
legacy version is also called this.</p>
<p style="padding: 0; margin: 8px;">That will cause a breakage on the i18n side.</p>
<p style="padding: 0; margin: 8px;">Either: <br />
two .pot files<br />
OR<br />
one Messages.sh</p></div></div><br /><div style="border: 1px solid #C7CCD9; \
border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: \
#e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: \
#74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: \
right; text-decoration: none;" href="https://phabricator.kde.org/D1722#inline-6598" \
rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: \
bold;">abstracttasksmodel.cpp:41-42</span></div> <div style="font: 11px/15px \
"Menlo", "Consolas", "Monaco", monospace; white-space: \
pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; \
margin: 0 4px; background: #d0ffd0;"> <span class="n">roles</span><span \
class="p">.</span><span class="n">insert</span><span class="p">(</span><span \
class="n">Qt</span><span style="color: #aa2211">::</span><span \
class="n">DisplayRole</span><span class="p">,</span> <span style="color: \
#766510">"DisplayRole"</span><span class="p">);</span> </div><div \
style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> <span \
class="n">roles</span><span class="p">.</span><span class="n">insert</span><span \
class="p">(</span><span class="n">Qt</span><span style="color: \
#aa2211">::</span><span class="n">DecorationRole</span><span class="p">,</span> <span \
style="color: #766510">"DecorationRole"</span><span class="p">);</span> \
</div></div></div> <div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; \
margin: 8px;">traditionally these are called "display" and \
"decoration" <br /> lowercase and without the word "Role"</p>
<p style="padding: 0; margin: 8px;">Also you should be able to do</p>
<p style="padding: 0; margin: 8px;">roles = QAbstractItemModel::roles() to get \
them.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: \
3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; \
border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; \
background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; \
text-decoration: none;" href="https://phabricator.kde.org/D1722#inline-6600" \
rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: \
bold;">activityinfo.cpp:55</span></div> <div style="font: 11px/15px \
"Menlo", "Consolas", "Monaco", monospace; white-space: \
pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; \
margin: 0 4px; background: #d0ffd0;"> <span style="color: #aa4000">if</span> <span \
class="p">(</span><span style="color: #aa2211">!</span><span \
class="n">instanceCount</span><span class="p">)</span> <span class="p">{</span> \
</div><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> <span \
style="color: #aa4000">delete</span> <span class="n">activityConsumer</span><span \
class="p">;</span> </div><div style="padding: 0 8px; margin: 0 4px; background: \
#d0ffd0;"> <span class="p">}</span> </div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: \
8px;">..and set pointer to null</p>
<p style="padding: 0; margin: 8px;">Otherwise you have a crash if you delete them all \
and then then create a new one.</p>
<p style="padding: 0; margin: 8px;">(or use QWeak and QShared pointer \
)</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: \
3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; \
border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; \
background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; \
text-decoration: none;" href="https://phabricator.kde.org/D1722#inline-6599" \
rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: \
bold;">activityinfo.cpp:69</span></div> <div style="font: 11px/15px \
"Menlo", "Consolas", "Monaco", monospace; white-space: \
pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; \
margin: 0 4px; background: #d0ffd0;"> <span class="n">connect</span><span \
class="p">(</span><span class="n">d</span><span style="color: \
#aa2211">-></span><span class="n">activityConsumer</span><span class="p">,</span> \
<span style="color: #aa2211">&</span><span class="n">KActivities</span><span \
style="color: #aa2211">::</span><span class="n">Consumer</span><span style="color: \
#aa2211">::</span><span class="n">activitiesChanged</span><span class="p">,</span> \
</div><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> <span \
style="color: #aa4000">this</span><span class="p">,</span> <span style="color: \
#aa2211">&</span><span class="n">ActivityInfo</span><span style="color: \
#aa2211">::</span><span class="n">numberOfActivitiesChanged</span><span \
class="p">);</span> </div><div style="padding: 0 8px; margin: 0 4px; background: \
#d0ffd0;"><span class="p">}</span> </div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">If I \
have 4 activities. 2 running, 2 not.</p>
<p style="padding: 0; margin: 8px;">numberOfActivities returns 2</p>
<p style="padding: 0; margin: 8px;">I set one to running:</p>
<p style="padding: 0; margin: 8px;">the property changes<br />
this signal is not emitted.</p></div></div><br /><div style="border: 1px solid \
#C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; \
border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div \
style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a \
style="float: right; text-decoration: none;" \
href="https://phabricator.kde.org/D1722#inline-6601" rel="noreferrer">View \
Inline</a><span style="color: #4b4d51; font-weight: \
bold;">concatenatetasksproxymodel.cpp:61</span></div> <div style="font: 11px/15px \
"Menlo", "Consolas", "Monaco", monospace; white-space: \
pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; \
margin: 0 4px; background: #d0ffd0;"> <span style="color: #aa4000">if</span> <span \
class="p">(</span><span class="n">m</span><span class="p">)</span> <span \
class="p">{</span> </div><div style="padding: 0 8px; margin: 0 4px; background: \
#d0ffd0;"> <span style="color: #74777d">// NOTE: KConcatenateRowsProxyModel \
offers no way to get a non-const pointer</span> </div><div style="padding: 0 8px; \
margin: 0 4px; background: #d0ffd0;"> <span style="color: #74777d">// to one \
of the source models, so we have to go through a mapped index.</span> \
</div></div></div> <div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; \
margin: 8px;">we could add one?</p>
<p style="padding: 0; margin: 8px;">sourceModelForIndex() would make sense for a few \
cases.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: \
3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; \
border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; \
background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; \
text-decoration: none;" href="https://phabricator.kde.org/D1722#inline-6602" \
rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: \
bold;">startuptasksmodel.cpp:146</span></div> <div style="font: 11px/15px \
"Menlo", "Consolas", "Monaco", monospace; white-space: \
pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; \
margin: 0 4px; background: #d0ffd0;"> <span \
class="n">launcherUrls</span><span class="p">.</span><span \
class="n">insert</span><span class="p">(</span><span class="n">id</span><span \
class="p">.</span><span class="n">id</span><span class="p">(),</span> <span \
class="n">launcherUrl</span><span class="p">(</span><span class="n">data</span><span \
class="p">));</span> </div><div style="padding: 0 8px; margin: 0 4px; background: \
#d0ffd0;"> <span class="n">QModelIndex</span> <span \
class="n">idx</span> <span style="color: #aa2211">=</span> <span \
class="n">q</span><span style="color: #aa2211">-></span><span \
class="n">index</span><span class="p">(</span><span class="n">startups</span><span \
class="p">.</span><span class="n">indexOf</span><span class="p">(</span><span \
class="n">id</span><span class="p">));</span> </div><div style="padding: 0 8px; \
margin: 0 4px; background: #d0ffd0;"> <span class="n">emit</span> \
<span class="n">q</span><span style="color: #aa2211">-></span><span \
class="n">dataChanged</span><span class="p">(</span><span class="n">idx</span><span \
class="p">,</span> <span class="n">idx</span><span class="p">);</span> \
</div></div></div> <div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; \
margin: 8px;">q->index(row)</p></div></div></div></div></div><br \
/><div><strong>REPOSITORY</strong><div><div>rPLASMAWORKSPACE Plasma \
Workspace</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a \
href="https://phabricator.kde.org/D1722" \
rel="noreferrer">https://phabricator.kde.org/D1722</a></div></div><br \
/><div><strong>EMAIL PREFERENCES</strong><div><a \
href="https://phabricator.kde.org/settings/panel/emailpreferences/" \
rel="noreferrer">https://phabricator.kde.org/settings/panel/emailpreferences/</a></div></div><br \
/><div><strong>To: </strong>hein, Plasma<br /><strong>Cc: </strong>davidedmundson, \
plasma-devel, sebas<br /></div>
[Attachment #6 (text/plain)]
_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic