This patch mostly concerns itself with the following two things:
1. Move code out from kmreaderwin (see new class CSSHelper, whose files
have already been committed).
Into this category fall the simplification and readability
enhancements of the HTML code (adding some newlines, simplifying the
HTML in favour of complicating the CSS a bit, using @media print)
2. Change the semantics of the mCodec member of KMMessage and
KMReaderWin.
To make it short: mCodec is not mOverrideCodec and only ever set to a
non-NULL value iff the codec is forced by the user selecting an
encoding from the Message menu. In all other cases, it's now
calculated from the message(parts). For that, the codec() and
setBodyFromUnicode() and bodyToUnicode() methods have been duplicated
in KMMessage from KMMsgPart (don't you just hate that?).
Walkthrough of the patch:
kmreaderwin.{h,cpp}
- Replace all c* and m*Font members by a single CSSHelper instance.
- readColorConfig(), parts of readConfg(), quoteFontTag() and htmlHead()
were moved from here to CSSHelper
- rename codec()/setCodec() to overrideCodec()/setOverrideCodec()
and provide an autoDetectEncoding() convenience method.
- Remove the QTextCodec parameter from setMsgPart. It now uses
overrideCodec() or the msgPart's own codec.
- s/isfixedFont/isFixedFont/
- split parseMsg( KMMessage*, bool ) into one for
onlyProcessHeaders=false (called again parseMsg(KMMessage*)) and one
for oPH=true (called parseMsgHeader()). The latter then reduces to
writeMsgHeader(), provided one accepts the minor regression that the
[vPart] link is not shown _for *nested*_ messages. This can be readded
later, once KMReaderWin is void of formatting code and OTP is
independent of a KMReaderWin parent. I've left the commented
parseMsgHeader in the momnt of it's death in commented out, so you can
see what I how I came to kill it off for an explicit writeMsgHeader().
- In the old new parseMsg(KMMessage*), there also happened significant
code simplification, mostly by realizing that the the colorbar and tmp
file handling belongs into parseMsg(void) and by removing the oPH=true
case. There's also an instance of simplifying code by using
bodyToUnicode(). At last, the <div id="header"></div> around
writeMsgHeader is superfluous (and wrong, since there is and never was
a div#header CSS selector), since the HeaderStyle's add that already.
- Apply "Inline Method" to writeHTMLStr()
- remove the QTextCodec param from showVCard(). This method is now a
nice one and uses bodyToUnicode()
- rename all fooCodec to fooOverrideCodec
- currently, mCSSHelper is destroyed and re-created whenever it the
config changes. I intend to make CSSHelper a fully functional
ConfigManager later.
- setOverrideCodec now calls update(true) only if the codec was actually
changed.
- In setMsgPart, there's code that "forgets" to strip off <head>, <body>
and <html> tags from HTML parts. I didn't do anything about that yet,
only added a triple-hash.
- Simplify slotAtmSave() by using more guard clauses and esp. by using
QString::section() and QString::replace(QChar,QChar) instead of
rolling our owns.
objecttreeparser.{h,cpp}:
- Use CSShelper
- Create a new CSS class "htmlWarn" for the HTML warning frame to get
rid of the embedded style information.
- simplify quotedHTML() by using new nonQuotedFontTag().
headerstyle.cpp:
- We begin by inserting some newlines to ease the reading of the
resultant HTML code.
- In the fancy header department, we remove almost all class attributes
from the HTML tags. Instead (see csshelper.cpp), we use CSS Selectors
to address the inner tags of the enclosing <div class="fancy header">
Note how that tag matches both the div.header (setting the margin) and
div.fancy.header selectors in csshelper.cpp
- We end with removing the workaround for the apparently long-standing
khtml bug that makes it ignore "padding" on <table>, viz. another
<div></div> pair around the table.
kmfldsearch.cpp:
- Reap fruits of (2).
kmmainwin.cpp:
- Consequence of setCodec -> setOverrideCodec() renaming
- move an #include up to the top
kmmessage.{h,cpp}:
- Copy setBodyFromUnicode(), bodyToUnicode() and rename fooCodec to
fooOverrideCodec.
- Note how the double housekeeping (mAutoDetectEncoding) goes away with
this.
- In html2source(), don't emit <br />, but <br> (we're using HTML 4.01,
not XHTML) and quote ' with ' (well, that's more XHTML-like)
kmreadermainwin.{h,cpp}:
- Since the QTextCodec* parameter was removed from
KMReaderWin::setMsgPart(), use now the explicit setOverrideCodec()
method to set the user-defined codec.
- Remove unused mCodec member
svn path=/trunk/kdepim/; revision=236540
- Fix FIXME added by me in the separate reader window when viewing
text/plain attachments.
- Comment out mShowCompleteMessage from reader win. The only usage of
it is in the ObjectTreeParser, and I don't see any regressions with
simply assuming it to always be true. It certainly doesn't break the
claimed usage of this hack.
- group fonts/color member variables together.
- Refactor HTML head composition from parseMsg() into htmlHead()
- Use new htmlHead() to fix#60688
CCMAIL:60688-done@bugs.kde.org
ObjectTreeParser:
- Moved mIsFirstTextPart member variable from readerwin to here
- Removed the hack that maps app/pgp to text/plain. Instead, just call
the t/p method from the app/pgp case.
- At the end of parseObjectTree(), change the last
htmlWriter()->write() to htmlWriter()->queue(), since everything
that is called in between uses queue(), too (see below)
KHtmlHtmlWriter:
- Keep state to be able to warn about incorrect usage patterns
- Move html view init/finish to begin() and end() from kmreaderwin
and objecttreeparser
svn path=/trunk/kdepim/; revision=235256
- Use HtmlStatusBar instead of home-brewn QLabel.
- Remove strToHtml (uses the equivalent LinkLocator method now).
object tree parser:
- Extract Method on processFooType to get processFooBarSubtype
methods.
- Use AttachmentStrategy::inlineNestedMessages()
- Created a new CryptPlugWrapperSaver that implements
reasource-allocation-is-initialization" for (re)setting the
cryptplug in some ObjectTreeParser methods.
both:
- Move writeBodyStr(), writePartIcon(), quotedHTML(),
sigStatusToString(), writeSigstat{Header,Footer}
from KMReaderWin to ObjectTreeParser.
There is one known regression (documented with a FIXME)
(see last hunk of kmreaderwin.cpp):
I had to #if 0 a call to writeBodyStr. This code needs to be ported to
use ObjectTreeParser first. The code is about the "view attachment"
feature.
Other than that, the changes should be behaviour-preserving (except
for the smart attachment mode now showing nested messages inline).
The patch is large, but consists almost purely of moving around code.
svn path=/trunk/kdepim/; revision=230897
and operate on the resulting addressee object
- share the vcard viewer with kaddressbook now
- implemented importing contact into current addressbook
Also fixes wishlist item #40800
CCMAIL:40800-done@bugs.kde.org
svn path=/trunk/kdepim/; revision=224433
- Draw a nice frame around text attachments. The frame header contains the attachments name and the description. The name is an active URL which can be used the same way as the URL next to attachment icons, e. g. to easily save the attachment.
Some details:
kmreaderwin.*:
- Move the code which saves a message part to a temporary file from KMReaderWin::writePartIcon to a separate function KMReaderWin::writeMessagePartToTempFile.
- Change the HTML code which is generated for attachment icons resp. embedded images.
- Add note about improved threading to the list of new features.
- Change style for frame around embedded RFC822 attachments (why was the right border hidden??) and add style for frame around embedded text attachments.
objecttreeparser.cpp:
- replace !curNode->isAttachment() with curNode->hasContentDispositionInline() where appropriate
- fix the logic for displaying text message parts; a text message part is displayed inline if
- it's the first text part
- the attachment strategy is "inlined"
- the attachment strategy is "smart" and the cont. disp. of the msg part is "inline"
- we show only one mime part (i.e. the user selected some msg part in the mime tree viewer)
- draw frame around embedded text (non html) attachments, I should probably do the same for embedded text/html attachments
Backport will follow later.
svn path=/trunk/kdepim/; revision=213729
- use TeeHtmlWriter( FileHtmlWriter, KHtmlPartHtmlWriter ) if
KMAIL_READER_HTML_DEBUG is defined
- remove unused method
svn path=/trunk/kdepim/; revision=202595
- Don't crash if writeConfig() is called before readConfig() completes
(triggered by this patch)
- Replace writeMsgHeader() with headerStyle()->format()
Disclaimer: I know that "view all headers" is currently no different from
"view long headers". See my other commit.
Disclaimer 2: I know that calling update(true) two times instead of one is
less efficient. That's temporary (in setHeaderStyle()).
svn path=/trunk/kdepim/; revision=201417
KHtmlPartHtmlWriter, which therefore becomes a QObject.
Add a new HtmlWriter::reset() method that KHtmlPartHtmlWriter
uses to stop it's timer and empty the html queue.
Don't delete mHtmlWriter in KMReaderWin dtor anymore, but rely on QObjects
destroying it's parents.
svn path=/trunk/kdepim/; revision=201105
- use ObjectTreeParser in MimeTreeViewer
- remove KMReaderWin wrappers around ObjectTreeParser functions.
svn path=/trunk/kdenetwork/kmail/; revision=198839
- moved PartMetaData from kmreaderwin.cpp to partmetadata.h
- moved static methods KMReaderWin::{insertAndParseNewChildNode,
parseObjectTree,writeOpaqueOrMultipartSignedData} to a new class
KMail::ObjectTreeParser. KMReaderWin still has those methods, but
they just call the ObjectTreeParser ones.
svn path=/trunk/kdenetwork/kmail/; revision=197869
This is a set of changes that is well test by myself and others.
The following bug fixes amongst others are included:
Compilation fix: the certificate dialog now compiles
Mjr bugfix: Prevent mail loss when kmail crashes while editing a
drafts message
Mjr bugfix: Fix erratic folder changing when clicking on the folder
tree
Mjr bugfix: Prevent mail loss when applying filters
The follow features have been implemented:
* KMail is now a KPart and can be embedded in the Kontact/Kaplan
container applications along with other KDE PIM applications.
* Remove duplicates function for removing duplicate messages in
a folder.
* Messages can be dragged and dropped on a composer window to
add those messages as attachments.
* Deletion in threaded mode is improved, child messages will no
longer be scattered when a parent is deleted.
* Multiple messages can now be selected in the search dialog.
* New context menu in the search dialog with Move, Copy, Reply
etc. actions for operating on selected messages.
* Search criteria in the search dialog now supports more types
of rules and a variable number of rules.
* Faster searching of large messsages.
* 'Search Folders' which are a KMail folder that stores a search
expression and is dynamically updated (also known as virtual
folders).
* The separate window for reading mail has a context menu with
Reply, Copy etc. actions for operating on the message
displayed.
* The separate window for reading mail has a tool bar.
* Startup of KMail is faster.
* Switching between folders is faster.
* The contents of all composer windows are saved to disk on
composer window creation and then periodically saved to
prevent mail loss in the result of a system crash.
* The state of KMail folders is saved to disk periodically to
prevent status information loss in the result of a system
crash.
Note after start KMail switching to folders for the first time will
slow as the format of the .sorted file has changed.
Enjoy!
svn path=/trunk/kdenetwork/kmail/; revision=195825
merged the Makefile.am and add all files that were added in make_it_cool
to get smaller diffs [most of them not yet compiled :]
svn path=/trunk/kdenetwork/kmail/; revision=191335
- replace KMKernel::self() with kernel
- introduce KMTextBrowser for viewing raw messages or text-attachments
to fix memory leaks
svn path=/trunk/kdenetwork/kmail/; revision=175027
Dirk Mueller
Zack Rusin
Bo Thorsen
Marc Mutz
Daniel Molkentin
Scott Wheeler
Laurent Montel
Ingo Klcker
Don Sanders
Stephan Kulow
Karl-Heinz Zimmer
Carsten Pfeiffer
Michael Haeckel