<table><tr><td style="">mwolff requested changes to this revision.<br />mwolff added a comment.<br />This revision now requires changes to proceed.
</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/D4123" rel="noreferrer">View Revision</a></tr></table><br /><div><div><p>still not good to go</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/D4123#inline-17596" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">mainwindow.cpp:319</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 class="n">KTextEditor</span><span style="color: #aa2211">::</span><span class="n">View</span> <span style="color: #aa2211">*</span><span class="n">activeClient</span> <span style="color: #aa2211">=</span> <span class="n">Core</span><span style="color: #aa2211">::</span><span class="n">self</span><span class="p">()</span><span style="color: #aa2211">-></span><span class="n">documentController</span><span class="p">()</span><span style="color: #aa2211">-></span><span class="n">activeTextDocumentView</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: #ffd0d0;"> <span style="color: #aa4000">if</span><span class="p">(</span><span style="color: #aa2211">!</span><span class="n">activeClient</span><span class="p">)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: #ffd0d0;"> <span style="color: #aa4000">return</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">this should guard the loops below now, otherwise you do useless work here</p>
<p style="padding: 0; margin: 8px;">or could you simply move the updateActionTooltips up and then keep the old code as-is?</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/D4123#inline-17597" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">mainwindow.cpp:390</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="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> <span class="n">QByteArray</span> <span class="n">original_tooltip</span> <span style="color: #aa2211">=</span> <span style="color: #766510">"__kdev_original_tooltip"</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> <span class="n">foreach</span><span class="p">(</span><span class="n">QAction</span> <span style="color: #aa2211">*</span><span class="n">action</span><span class="p">,</span> <span class="n">actionCollection</span><span class="p">()</span><span style="color: #aa2211">-></span><span class="n">actions</span><span class="p">())</span> <span class="p">{</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><div class="remarkup-code-block" style="margin: 12px 0;" data-code-lang="text" data-sigil="remarkup-code-block"><pre class="remarkup-code" style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; padding: 12px; margin: 0; background: rgba(71, 87, 120, 0.08);">const auto ORIGINAL_TOOLTIP = QByteArrayLiteral("__kdev_original_tooltip");</pre></div></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/D4123#inline-17598" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">mainwindow.cpp:392</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">foreach</span><span class="p">(</span><span class="n">QAction</span> <span style="color: #aa2211">*</span><span class="n">action</span><span class="p">,</span> <span class="n">actionCollection</span><span class="p">()</span><span style="color: #aa2211">-></span><span class="n">actions</span><span class="p">())</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> <span style="color: #aa4000">if</span> <span class="p">(</span><span class="n">action</span><span style="color: #aa2211">-></span><span class="n">dynamicPropertyNames</span><span class="p">().</span><span class="n">indexOf</span><span class="p">(</span><span class="n">original_tooltip</span><span class="p">)</span> <span style="color: #aa2211">==</span> <span style="color: #aa2211">-</span><span style="color: #601200">1</span><span class="p">)</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> <span class="n">action</span><span style="color: #aa2211">-></span><span class="n">setProperty</span><span class="p">(</span><span class="n">original_tooltip</span><span class="p">,</span> <span class="n">action</span><span style="color: #aa2211">-></span><span class="n">toolTip</span><span class="p">());</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">simplify and fix some bugs:</p>
<div class="remarkup-code-block" style="margin: 12px 0;" data-code-lang="text" data-sigil="remarkup-code-block"><pre class="remarkup-code" style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; padding: 12px; margin: 0; background: rgba(71, 87, 120, 0.08);">QString tooltip = action->property(ORIGINAL_TOOLTIP).toString();
if (tooltip.isEmpty()) {
tooltip = action->toolTip();
}
auto shortcut = action->sohrtcut();
if (shortcut.isEmpty()) { // NOTE: your patch uses !isEmpty - that sounds wrong?
shortcut = actionCollection()->defaultShortcut(action);
}
// make sure to always set the tooltip, e.g. when the shortcut gets unset
if (!shortcut.isEmpty()) {
tooltip = i18nc("%1: original tooltip, %2: shortcut", "%1 <i>(%2)</i>", shortcut.toString()); // NOTE: use i18n to make this localizable
}
action->setToolTip(tooltip);</pre></div></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/D4123#inline-17599" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">mainwindow.cpp:397</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">auto</span> <span class="n">shortcut</span> <span style="color: #aa2211">=</span> <span class="n">action</span><span style="color: #aa2211">-></span><span class="n">shortcut</span><span class="p">();</span>
</div><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">shortcut</span><span class="p">.</span><span class="n">isEmpty</span><span class="p">())</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> <span class="n">shortcut</span> <span style="color: #aa2211">=</span> <span class="n">actionCollection</span><span class="p">()</span><span style="color: #aa2211">-></span><span class="n">defaultShortcut</span><span class="p">(</span><span class="n">action</span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">this is the wrong way around, no?</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/D4123#inline-17600" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">mainwindow.cpp:401</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">shortcut</span><span class="p">.</span><span class="n">isEmpty</span><span class="p">())</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> <span style="color: #aa4000">continue</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;">you have to reset the tooltip if the shortcut was unset</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/D4123#inline-17601" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">mainwindow.cpp:403</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="p">}</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> <span class="n">action</span><span style="color: #aa2211">-></span><span class="n">setToolTip</span><span class="p">(</span><span class="n">action</span><span style="color: #aa2211">-></span><span class="n">property</span><span class="p">(</span><span class="n">original_tooltip</span><span class="p">).</span><span class="n">toString</span><span class="p">()</span> <span style="color: #aa2211">+</span> <span style="color: #766510">" <i>("</span> <span style="color: #aa2211">+</span> <span class="n">shortcut</span><span class="p">.</span><span class="n">toString</span><span class="p">()</span> <span style="color: #aa2211">+</span> <span style="color: #766510">")</i>"</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;">this is not localization aware, use i18nc (imagine RTL languages)</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R33 KDevPlatform</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D4123" rel="noreferrer">https://phabricator.kde.org/D4123</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>tcanabrava, apol, antonanikin, kfunk, KDevelop, mwolff<br /><strong>Cc: </strong>mwolff, antonanikin, kdevelop-devel<br /></div>