<table><tr><td style="">apol added a comment.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D22974">View Revision</a></tr></table><br /><div><div><p>WRT the two icons, maybe it would make sense to populate only the bits we want instead of using the action property? i.e. we can keep a kirigamiAction property for now. This patch is far too big as is already. I would even suggest doing the Kirigami.Action rebase first and then do the other one in different commits.</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/D22974#inline-129607">View Inline</a><span style="color: #4b4d51; font-weight: bold;">Action.qml:76</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; "><span style="color: #74777d"> */</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #004012">property</span> <span style="color: #004012">ActionIconGroup</span> <span style="color: #aa4000">icon:</span> <span style="color: #004012">ActionIconGroup</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #aa4000">id: iconGroup</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span class="bright"></span><span style="color: #74777d"><span class="bright">// </span> property ActionIconGroup icon: ActionIconGroup {</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span class="bright"></span><span style="color: #74777d"><span class="bright">// </span> id: iconGroup</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Can you check that we're not missing some API? is ActionIconGroup a subset of what Qt offers?</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/D22974#inline-129605">View Inline</a><span style="color: #4b4d51; font-weight: bold;">ActionToolBar.qml:184</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; "> <span style="color: #aa4000">itemDelegate:</span> <span style="color: #004012">ActionMenuItem</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"><span class="bright"> </span><span style="color: #aa4000"><span class="bright">visible:</span></span><span class="bright"> </span><span style="color: #004012"><span class="bright">actionsLayout</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span style="color: #004012"><span class="bright">findIndex</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span style="color: #004012"><span class="bright">actionsLayout</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span style="color: #004012"><span class="bright">overflowSet</span></span><span class="bright"></span><span class="p"><span class="bright">,</span></span><span class="bright"> </span><span style="color: #aa4000"><span class="bright">function</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span style="color: #004012"><span class="bright">act</span></span><span class="bright"></span><span class="p"><span class="bright">)</span></span><span class="bright"> </span><span class="p"><span class="bright">{</span></span><span class="bright"></span><span style="color: #aa4000"><span class="bright">return</span></span><span class="bright"> </span><span style="color: #004012"><span class="bright">act</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">===</span></span><span class="bright"> </span><span style="color: #004012"><span class="bright">ourAction</span></span><span class="bright"></span><span class="p"><span class="bright">})</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">></span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">-</span></span><span class="bright"></span><span style="color: #601200"><span class="bright">1</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">&&</span></span><span class="bright"> </span><span class="p"><span class="bright">(</span></span><span style="color: #004012">ourAction</span><span class="p">.</span><span style="color: #004012">visible</span> <span style="color: #aa2211">===</span> <span style="color: #000a65">undefined</span> <span style="color: #aa2211">||</span> <span style="color: #004012">ourAction</span><span class="p">.</span><span style="color: #004012">visible</span><span class="p">)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span class="bright"> </span><span style="color: #aa4000"><span class="bright">visible:</span></span><span class="bright"> </span><span style="color: #004012"><span class="bright">actionsLayout</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span style="color: #004012"><span class="bright">findIndex</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span style="color: #004012"><span class="bright">actionsLayout</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span style="color: #004012"><span class="bright">overflowSet</span></span><span class="bright"></span><span class="p"><span class="bright">,</span></span><span class="bright"> </span><span style="color: #aa4000"><span class="bright">function</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span style="color: #004012"><span class="bright">act</span></span><span class="bright"></span><span class="p"><span class="bright">)</span></span><span class="bright"> </span><span class="p"><span class="bright">{</span></span><span class="bright"></span><span style="color: #aa4000"><span class="bright">return</span></span><span class="bright"> </span><span style="color: #004012"><span class="bright">act</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">===</span></span><span class="bright"> </span><span style="color: #004012"><span class="bright">ourAction</span></span><span class="bright"></span><span class="p"><span class="bright">})</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">></span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">-</span></span><span class="bright"></span><span style="color: #601200"><span class="bright">1</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">&&</span></span><span class="bright"> </span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">!</span></span><span class="bright"></span><span style="color: #004012"><span class="bright">ourAction</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span style="color: #004012"><span class="bright">hasOwnProperty</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span style="color: #766510"><span class="bright">"visible"</span></span><span class="bright"></span><span class="p"><span class="bright">)</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">||</span></span><span class="bright"> </span><span style="color: #004012">ourAction</span><span class="p">.</span><span style="color: #004012">visible</span> <span style="color: #aa2211">===</span> <span style="color: #000a65">undefined</span> <span style="color: #aa2211">||</span> <span style="color: #004012">ourAction</span><span class="p">.</span><span style="color: #004012">visible</span><span class="p">)</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span class="p">}</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">If <tt style="background: #ebebeb; font-size: 13px;">ourAction</tt> doesn't have a visible property, won't <tt style="background: #ebebeb; font-size: 13px;">ourAction.visible</tt> be undefined?</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/D22974#inline-129606">View Inline</a><span style="color: #4b4d51; font-weight: bold;">PrivateActionToolButton.qml: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: rgba(251, 175, 175, .7);"> <span style="color: #aa4000">flat:</span> <span style="color: #aa2211">!</span><span style="color: #004012">control</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span style="color: #004012"><span class="bright">kirigamiA</span>ction</span> <span style="color: #aa2211">||</span> <span style="color: #aa2211">!</span><span style="color: #004012">control</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span style="color: #004012"><span class="bright">kirigamiA</span>ction</span><span class="p">.</span><span style="color: #004012">icon</span><span class="p">.</span><span style="color: #004012">color</span><span class="p">.</span><span style="color: #004012">a</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">flat:</span> <span style="color: #aa2211">!</span><span style="color: #004012">control</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span style="color: #004012"><span class="bright">a</span>ction</span> <span style="color: #aa2211">||</span> <span style="color: #aa2211">!</span><span style="color: #004012">control</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span style="color: #004012"><span class="bright">a</span>ction</span><span class="p">.</span><span style="color: #004012">icon</span><span class="p">.</span><span style="color: #004012">color</span><span class="p">.</span><span style="color: #004012">a</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #74777d">//TODO: replace with upstream action when we depend on Qt 5.10</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #004012">property</span> <span style="color: #004012">Action</span> <span class="bright"></span><span style="color: #004012"><span class="bright">kirigamiA</span>ction</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span class="bright"></span><span style="color: #74777d"><span class="bright">// </span> property Action <span class="bright">a</span>ction</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Remove TODO?</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/D22974#inline-129608">View Inline</a><span style="color: #4b4d51; font-weight: bold;">PrivateActionToolButton.qml:89</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: rgba(251, 175, 175, .7);"> <span style="color: #aa4000">source:</span> <span style="color: #004012">control</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span style="color: #004012"><span class="bright">kirigamiA</span>ction</span> <span style="color: #aa2211">?</span> <span class="p">(</span><span style="color: #004012">control</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span style="color: #004012"><span class="bright">kirigamiA</span>ction</span><span class="p">.</span><span style="color: #004012">icon</span> <span style="color: #aa2211">?</span> <span style="color: #aa4000">control.<span class="bright">kirigamiA</span>ction.icon.name :</span> <span style="color: #004012">control</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span style="color: #004012"><span class="bright">kirigamiA</span>ction</span><span class="p">.</span><span style="color: #004012">iconName</span><span class="p">)</span> <span style="color: #aa2211">:</span> <span style="color: #766510">""</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #aa4000">visible:</span> <span style="color: #004012">control</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span style="color: #004012"><span class="bright">kirigamiA</span>ction</span> <span style="color: #aa2211">&&</span> <span style="color: #004012">control</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span style="color: #004012"><span class="bright">kirigamiA</span>ction</span><span class="p">.</span><span style="color: #004012">iconName</span> <span style="color: #aa2211">!=</span> <span style="color: #766510">""</span> <span style="color: #aa2211">&&</span> <span style="color: #004012">control</span><span class="p">.</span><span style="color: #004012">display</span> <span style="color: #aa2211">!=</span> <span style="color: #004012">Controls</span><span class="p">.</span><span style="color: #004012">ToolButton</span><span class="p">.</span><span style="color: #004012">TextOnly</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #aa4000">color:</span> <span style="color: #004012">control</span><span class="p">.</span><span style="color: #004012">flat</span> <span style="color: #aa2211">&&</span> <span style="color: #004012">control</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span style="color: #004012"><span class="bright">kirigamiAction</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">&&</span></span><span class="bright"> </span><span style="color: #004012"><span class="bright">control</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span style="color: #004012"><span class="bright">kirigamiAction</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span style="color: #004012"><span class="bright">icon</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">&&</span></span><span class="bright"> </span><span style="color: #004012"><span class="bright">control</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span style="color: #004012"><span class="bright">kirigamiAction</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span style="color: #004012"><span class="bright">icon</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span style="color: #004012"><span class="bright">color</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span style="color: #004012"><span class="bright">a</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">></span></span><span class="bright"> </span><span style="color: #601200"><span class="bright">0</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">?</span></span><span class="bright"> </span><span style="color: #aa4000"><span class="bright">control.kirigamiA</span>ction.icon.color :</span> <span style="color: #004012">label</span><span class="p">.</span><span style="color: #004012">color</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">source:</span> <span style="color: #004012">control</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span style="color: #004012"><span class="bright">a</span>ction</span> <span style="color: #aa2211">?</span> <span class="p">(</span><span style="color: #004012">control</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span style="color: #004012"><span class="bright">a</span>ction</span><span class="p">.</span><span style="color: #004012">icon</span> <span style="color: #aa2211">?</span> <span style="color: #aa4000">control.<span class="bright">a</span>ction.icon.name :</span> <span style="color: #004012">control</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span style="color: #004012"><span class="bright">a</span>ction</span><span class="p">.</span><span style="color: #004012">iconName</span><span class="p">)</span> <span style="color: #aa2211">:</span> <span style="color: #766510">""</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">visible:</span> <span style="color: #004012">control</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span style="color: #004012"><span class="bright">a</span>ction</span> <span style="color: #aa2211">&&</span> <span style="color: #004012">control</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span style="color: #004012"><span class="bright">a</span>ction</span><span class="p">.</span><span style="color: #004012">iconName</span> <span style="color: #aa2211">!=</span> <span style="color: #766510">""</span> <span style="color: #aa2211">&&</span> <span style="color: #004012">control</span><span class="p">.</span><span style="color: #004012">display</span> <span style="color: #aa2211">!=</span> <span style="color: #004012">Controls</span><span class="p">.</span><span style="color: #004012">ToolButton</span><span class="p">.</span><span style="color: #004012">TextOnly</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">color:</span> <span style="color: #004012">control</span><span class="p">.</span><span style="color: #004012">flat</span> <span style="color: #aa2211">&&</span> <span style="color: #004012">control</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span style="color: #004012"><span class="bright">action</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">&&</span></span><span class="bright"> </span><span style="color: #004012"><span class="bright">control</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span style="color: #004012"><span class="bright">action</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span style="color: #004012"><span class="bright">icon</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">&&</span></span><span class="bright"> </span><span style="color: #004012"><span class="bright">control</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span style="color: #004012"><span class="bright">action</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span style="color: #004012"><span class="bright">icon</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span style="color: #004012"><span class="bright">color</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span style="color: #004012"><span class="bright">a</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">></span></span><span class="bright"> </span><span style="color: #601200"><span class="bright">0</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">?</span></span><span class="bright"> </span><span style="color: #aa4000"><span class="bright">control.a</span>ction.icon.color :</span> <span style="color: #004012">label</span><span class="p">.</span><span style="color: #004012">color</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Wouldn't it be control.action.icon.name?</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R169 Kirigami</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D22974">https://phabricator.kde.org/D22974</a></div></div><br /><div><strong>To: </strong>camiloh, Kirigami, mart<br /><strong>Cc: </strong>apol, plasma-devel, fbampaloukas, domson, dkardarakos, davidedmundson, mart, hein<br /></div>