<table><tr><td style="">tobiasdeiminger added inline comments.
</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/D15204">View Revision</a></tr></table><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/D15204#inline-84490">View Inline</a><span style="color: #4b4d51; font-weight: bold;">editannottooldialog.cpp:274</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(151, 234, 151, .6);"> <span class="n">engineElement</span><span class="p">.</span><span class="n">setAttribute</span><span class="p">(</span> <span class="n">QStringLiteral</span><span class="p">(</span><span style="color: #766510">"type"</span><span class="p">),</span> <span class="n">QStringLiteral</span><span class="p">(</span><span style="color: #766510">"PickPoint"</span><span class="p">)</span> <span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">engineElement</span><span class="p">.</span><span class="n">setAttribute</span><span class="p">(</span> <span class="n">QStringLiteral</span><span class="p">(</span><span style="color: #766510">"color"</span><span class="p">),</span> <span class="n">QStringLiteral</span><span class="p">(</span><span style="color: #766510">"#000000"</span><span class="p">)</span> <span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">engineElement</span><span class="p">.</span><span class="n">setAttribute</span><span class="p">(</span> <span class="n">QStringLiteral</span><span class="p">(</span><span style="color: #766510">"block"</span><span class="p">),</span> <span class="n">QStringLiteral</span><span class="p">(</span><span style="color: #766510">"true"</span><span class="p">)</span> <span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Default the text input popup to some light yellow.</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/D15204#inline-84477">View Inline</a><span style="color: #4b4d51; font-weight: bold;">annotationwidgets.cpp:194</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="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">if</span> <span class="p">(</span> <span class="n">m_textAnn</span><span style="color: #aa2211">-></span><span class="n">inplaceIntent</span><span class="p">()</span> <span style="color: #aa2211">==</span> <span class="n">Okular</span><span style="color: #aa2211">::</span><span class="n">TextAnnotation</span><span style="color: #aa2211">::</span><span class="n">TypeWriter</span> <span class="p">)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <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;">Better handle this in an override in TextAnnotationWidget.</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/D15204#inline-84473">View Inline</a><span style="color: #4b4d51; font-weight: bold;">annotationwidgets.cpp:204</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">QGridLayout</span> <span style="color: #aa2211">*</span> <span class="n">gridlayout</span> <span style="color: #aa2211">=</span> <span style="color: #aa4000">new</span> <span class="n">QGridLayout</span><span class="p">(</span> <span class="n">widget</span> <span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);">
</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">if</span></span><span class="bright"> </span><span class="p"><span class="bright">(</span></span><span class="bright"> </span><span class="n"><span class="bright">m_textAnn</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">-></span></span><span class="bright"></span><span class="n"><span class="bright">inplaceIntent</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 class="n"><span class="bright">Okular</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">::</span></span><span class="bright"></span><span class="n"><span class="bright">TextAnnotation</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">::</span></span><span class="bright"></span><span class="n"><span class="bright">Unknown</span></span><span class="bright"> </span><span class="p"><span class="bright">)</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="p">{</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Really only if TextAnnotation::Unknown? What about TextAnnotation::Callout?</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/D15204#inline-84481">View Inline</a><span style="color: #4b4d51; font-weight: bold;">annotationwidgets.cpp:222-223</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(151, 234, 151, .6);"> <span class="n">connect</span><span class="p">(</span> <span class="n">m_colorBn</span><span class="p">,</span> <span style="color: #aa2211">&</span><span class="n">KColorButton</span><span style="color: #aa2211">::</span><span class="n">changed</span><span class="p">,</span> <span style="color: #aa4000">this</span><span class="p">,</span> <span style="color: #aa2211">&</span><span class="n">AnnotationWidget</span><span style="color: #aa2211">::</span><span class="n">dataChanged</span> <span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">connect</span><span class="p">(</span> <span class="n">m_opacity</span><span class="p">,</span> <span class="n">SIGNAL</span><span class="p">(</span><span class="n">valueChanged</span><span class="p">(</span><span style="color: #aa4000">int</span><span class="p">)),</span> <span style="color: #aa4000">this</span><span class="p">,</span> <span class="n">SIGNAL</span><span class="p">(</span><span class="n">dataChanged</span><span class="p">())</span> <span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="p">}</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Those generic signal slot connections must not be dependent on if it's a TextAnnotation.</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/D15204#inline-84482">View Inline</a><span style="color: #4b4d51; font-weight: bold;">annotationwidgets.cpp:289-292</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(151, 234, 151, .6);"> <span class="n">connect</span><span class="p">(</span> <span class="n">m_fontReq</span><span class="p">,</span> <span style="color: #aa2211">&</span><span class="n">KFontRequester</span><span style="color: #aa2211">::</span><span class="n">fontSelected</span><span class="p">,</span> <span style="color: #aa4000">this</span><span class="p">,</span> <span style="color: #aa2211">&</span><span class="n">AnnotationWidget</span><span style="color: #aa2211">::</span><span class="n">dataChanged</span> <span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">if</span> <span class="p">(</span> <span class="n">m_textAnn</span><span style="color: #aa2211">-></span><span class="n">inplaceIntent</span><span class="p">()</span> <span style="color: #aa2211">==</span> <span class="n">Okular</span><span style="color: #aa2211">::</span><span class="n">TextAnnotation</span><span style="color: #aa2211">::</span><span class="n">TypeWriter</span> <span class="p">)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">return</span> <span class="n">widget</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Leave connect where it was before, don't return early and delegate widget setup to private methods createPopupNoteStyleWidget, createInlineNoteStyleWidget, createTypeWriterStyleWidget.</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/D15204#inline-84472">View Inline</a><span style="color: #4b4d51; font-weight: bold;">annotationwidgets.h:95</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">Okular</span><span style="color: #aa2211">::</span><span class="n">Annotation</span> <span style="color: #aa2211">*</span> <span class="n">m_ann</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">Okular</span><span style="color: #aa2211">::</span><span class="n">TextAnnotation</span> <span style="color: #aa2211">*</span> <span class="n">m_textAnn</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span class="n">QWidget</span> <span style="color: #aa2211">*</span> <span class="n">m_appearanceWidget</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">It's not nice to have such a special type in the base class. Should better go to TextAnnotationWidget.</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/D15204#inline-84476">View Inline</a><span style="color: #4b4d51; font-weight: bold;">annotationwidgets.h:102</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">class</span> <span style="color: #a0a000">TextAnnotationWidget</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span class="p">:</span> <span class="n">public</span> <span class="n">AnnotationWidget</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">All pointer type members of TextAnnotationWidget should be default initialized to nullptr (unrelated cleanup).</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/D15204#inline-84488">View Inline</a><span style="color: #4b4d51; font-weight: bold;">pageviewannotator.cpp:153</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">bool</span> <span class="n">resok</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #aa4000">const</span> <span class="n">QString</span> <span class="n">note</span> <span style="color: #aa2211">=</span> <span class="n">QInputDialog</span><span style="color: #aa2211">::</span><span class="n">getMultiLineText</span><span class="p">(</span><span style="color: #aa4000">nullptr</span><span class="p">,</span> <span class="n">i18n</span><span class="p">(</span> <span style="color: #766510">"New Text Note"</span> <span class="p">),</span> <span class="n">prompt</span><span class="p">,</span> <span class="n">QString</span><span class="p">(),</span> <span style="color: #aa2211">&</span><span class="n">resok</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #aa4000">if</span><span class="p">(</span><span class="n">resok</span><span class="p">)</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Getting input from user by dialog and adding the annotation are two different things. Divide it into two methods (or just leave QInputDialog::getMultiLineText in PickPointEngine::end).</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R223 Okular</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D15204">https://phabricator.kde.org/D15204</a></div></div><br /><div><strong>To: </strong>tobiasdeiminger<br /><strong>Cc: </strong>sander, okular-devel, ngraham, aacid<br /></div>