[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-panel-devel
Subject: D6673: [Notifications] Manually remove remote images
From: David Edmundson <noreply () phabricator ! kde ! org>
Date: 2017-07-14 10:02:02
Message-ID: 20170714100202.49757.4505FF9E6C4D6DED () phabricator ! kde ! org
[Download RAW message or body]
davidedmundson added a comment.
hypothetically (and this would still require a Qt change) if we could override \
loadResource would that be enough for doing what this is doing?
INLINE COMMENTS
> textsanitizer.cpp:41
> +
> + QScopedPointer<QTextDocument> newDocument(new QTextDocument());
> + newDocument->setHtml(text);
just make it on the stack?
> textsanitizer.cpp:59
> + // all of this trouble already we might as well look at everything.
> + QUrl backgroundUrl = \
> format.property(QTextFormat::BackgroundImageUrl).toUrl(); + if \
> (!backgroundUrl.isLocalFile()) {
format might not be valid here, does that cause a problem?
> textsanitizer.cpp:60
> + QUrl backgroundUrl = \
> format.property(QTextFormat::BackgroundImageUrl).toUrl(); + if \
> (!backgroundUrl.isLocalFile()) { + \
> format.setProperty(QTextFormat::BackgroundImageUrl, QVariant());
probably better to do do:
!backgroundUrl.isEmpty() && !isLocalFile..
QTextFormat was still doing some processing at least.
> textsanitizer.cpp:86
> +
> + // FIXME is there a better way?
> + // we cannot just setHtml on the TextEdit's textDocument at the beginning
(untested)
Make a QTextCursor on qqdoc->textDocument() and then you can insertFragment.
This way you can do it with only shallow copies, and all in a single pass over the \
original document.
Removing images becomes a lot easier then, as you just skip that fragment rather than \
trying to remove text.
REPOSITORY
R120 Plasma Workspace
REVISION DETAIL
https://phabricator.kde.org/D6673
To: broulik, #plasma, fvogt
Cc: davidedmundson, plasma-devel, ZrenBot, progwolff, lesliezhai, ali-mohamed, \
jensreuterberg, abetts, sebas, apol, mart, lukas
[Attachment #3 (unknown)]
<table><tr><td style="">davidedmundson 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/D6673" rel="noreferrer">View \
Revision</a></tr></table><br /><div><div><p>hypothetically (and this would still \
require a Qt change) if we could override loadResource would that be enough for doing \
what this is doing?</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/D6673#inline-27632" rel="noreferrer">View \
Inline</a><span style="color: #4b4d51; font-weight: \
bold;">textsanitizer.cpp:41</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">QScopedPointer</span><span style="color: #aa2211"><</span><span \
class="n">QTextDocument</span><span style="color: #aa2211">></span> <span \
class="n">newDocument</span><span class="p">(</span><span style="color: \
#aa4000">new</span> <span class="n">QTextDocument</span><span class="p">());</span> \
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, \
.6);"> <span class="n">newDocument</span><span style="color: \
#aa2211">-></span><span class="n">setHtml</span><span class="p">(</span><span \
class="n">text</span><span class="p">);</span> </div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">just \
make it on the stack?</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/D6673#inline-27634" \
rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: \
bold;">textsanitizer.cpp:59</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 style="color: \
#74777d">// all of this trouble already we might as well look at everything.</span> \
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, \
.6);"> <span class="n">QUrl</span> <span class="n">backgroundUrl</span> \
<span style="color: #aa2211">=</span> <span class="n">format</span><span \
class="p">.</span><span class="n">property</span><span class="p">(</span><span \
class="n">QTextFormat</span><span style="color: #aa2211">::</span><span \
class="n">BackgroundImageUrl</span><span class="p">).</span><span \
class="n">toUrl</span><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 style="color: #aa2211">!</span><span \
class="n">backgroundUrl</span><span class="p">.</span><span \
class="n">isLocalFile</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;">format might not be valid here, does that cause a \
problem?</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/D6673#inline-27635" \
rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: \
bold;">textsanitizer.cpp:60</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">QUrl</span> <span class="n">backgroundUrl</span> <span style="color: \
#aa2211">=</span> <span class="n">format</span><span class="p">.</span><span \
class="n">property</span><span class="p">(</span><span \
class="n">QTextFormat</span><span style="color: #aa2211">::</span><span \
class="n">BackgroundImageUrl</span><span class="p">).</span><span \
class="n">toUrl</span><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 style="color: #aa2211">!</span><span \
class="n">backgroundUrl</span><span class="p">.</span><span \
class="n">isLocalFile</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">format</span><span class="p">.</span><span \
class="n">setProperty</span><span class="p">(</span><span \
class="n">QTextFormat</span><span style="color: #aa2211">::</span><span \
class="n">BackgroundImageUrl</span><span class="p">,</span> <span \
class="n">QVariant</span><span class="p">());</span> </div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: \
8px;">probably better to do do:</p>
<p style="padding: 0; margin: 8px;">!backgroundUrl.isEmpty() && \
!isLocalFile..</p>
<p style="padding: 0; margin: 8px;">QTextFormat was still doing some processing at \
least.</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/D6673#inline-27633" \
rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: \
bold;">textsanitizer.cpp: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: rgba(151, 234, 151, .6);"> <span style="color: \
#74777d">// FIXME is there a better way?</span> </div><div style="padding: 0 8px; \
margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: \
#74777d">// we cannot just setHtml on the TextEdit's textDocument at the \
beginning</span> </div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: \
8px;">(untested)</p>
<p style="padding: 0; margin: 8px;">Make a QTextCursor on qqdoc->textDocument() \
and then you can insertFragment.<br /> This way you can do it with only shallow \
copies, and all in a single pass over the original document.</p>
<p style="padding: 0; margin: 8px;">Removing images becomes a lot easier then, as you \
just skip that fragment rather than trying to remove \
text.</p></div></div></div></div></div><br \
/><div><strong>REPOSITORY</strong><div><div>R120 Plasma \
Workspace</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a \
href="https://phabricator.kde.org/D6673" \
rel="noreferrer">https://phabricator.kde.org/D6673</a></div></div><br \
/><div><strong>To: </strong>broulik, Plasma, fvogt<br /><strong>Cc: \
</strong>davidedmundson, plasma-devel, ZrenBot, progwolff, lesliezhai, ali-mohamed, \
jensreuterberg, abetts, sebas, apol, mart, lukas<br /></div>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic