Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Unmaintained
KDE Pim
Commits
7c0920ac
Commit
7c0920ac
authored
Dec 08, 2014
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove not necessary lines
parent
2dfa9e8d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
39 deletions
+39
-39
kmail/kmreadermainwin.cpp
kmail/kmreadermainwin.cpp
+14
-14
kmail/kmreaderwin.cpp
kmail/kmreaderwin.cpp
+25
-25
No files found.
kmail/kmreadermainwin.cpp
View file @
7c0920ac
...
...
@@ -81,7 +81,7 @@ KMReaderMainWin::KMReaderMainWin(MessageViewer::Viewer::DisplayFormatMessage for
}
//-----------------------------------------------------------------------------
KMReaderMainWin
::
KMReaderMainWin
(
char
*
name
)
:
KMail
::
SecondaryWindow
(
name
?
name
:
"readerwindow#"
)
{
...
...
@@ -90,7 +90,7 @@ KMReaderMainWin::KMReaderMainWin( char *name )
}
//-----------------------------------------------------------------------------
KMReaderMainWin
::
KMReaderMainWin
(
KMime
::
Content
*
aMsgPart
,
MessageViewer
::
Viewer
::
DisplayFormatMessage
format
,
const
QString
&
encoding
,
char
*
name
)
:
KMail
::
SecondaryWindow
(
name
?
name
:
"readerwindow#"
)
{
...
...
@@ -101,7 +101,7 @@ KMReaderMainWin::KMReaderMainWin(KMime::Content* aMsgPart, MessageViewer::Viewer
initKMReaderMainWin
();
}
//-----------------------------------------------------------------------------
void
KMReaderMainWin
::
initKMReaderMainWin
()
{
setCentralWidget
(
mReaderWin
);
...
...
@@ -119,13 +119,13 @@ void KMReaderMainWin::initKMReaderMainWin()
statusBar
(),
SLOT
(
showMessage
(
QString
))
);
}
//-----------------------------------------------------------------------------
KMReaderMainWin
::~
KMReaderMainWin
()
{
saveMainWindowSettings
(
KMKernel
::
self
()
->
config
()
->
group
(
"Separate Reader Window"
)
);
}
//-----------------------------------------------------------------------------
void
KMReaderMainWin
::
setUseFixedFont
(
bool
useFixedFont
)
{
mReaderWin
->
setUseFixedFont
(
useFixedFont
);
...
...
@@ -198,7 +198,7 @@ Akonadi::Collection KMReaderMainWin::parentCollection() const
return
mMsg
.
parentCollection
();
}
//-----------------------------------------------------------------------------
void
KMReaderMainWin
::
slotTrashMsg
()
{
if
(
!
mMsg
.
isValid
()
)
...
...
@@ -208,7 +208,7 @@ void KMReaderMainWin::slotTrashMsg()
close
();
}
//-----------------------------------------------------------------------------
void
KMReaderMainWin
::
slotForwardInlineMsg
()
{
if
(
!
mReaderWin
->
message
().
hasPayload
<
KMime
::
Message
::
Ptr
>
()
)
return
;
...
...
@@ -229,7 +229,7 @@ void KMReaderMainWin::slotForwardInlineMsg()
command
->
start
();
}
//-----------------------------------------------------------------------------
void
KMReaderMainWin
::
slotForwardAttachedMsg
()
{
if
(
!
mReaderWin
->
message
().
hasPayload
<
KMime
::
Message
::
Ptr
>
()
)
return
;
...
...
@@ -251,7 +251,7 @@ void KMReaderMainWin::slotForwardAttachedMsg()
command
->
start
();
}
//-----------------------------------------------------------------------------
void
KMReaderMainWin
::
slotRedirectMsg
()
{
if
(
!
mReaderWin
->
message
().
hasPayload
<
KMime
::
Message
::
Ptr
>
()
)
return
;
...
...
@@ -261,7 +261,7 @@ void KMReaderMainWin::slotRedirectMsg()
command
->
start
();
}
//-----------------------------------------------------------------------------
void
KMReaderMainWin
::
slotCustomReplyToMsg
(
const
QString
&
tmpl
)
{
if
(
!
mReaderWin
->
message
().
hasPayload
<
KMime
::
Message
::
Ptr
>
()
)
return
;
...
...
@@ -275,7 +275,7 @@ void KMReaderMainWin::slotCustomReplyToMsg( const QString &tmpl )
command
->
start
();
}
//-----------------------------------------------------------------------------
void
KMReaderMainWin
::
slotCustomReplyAllToMsg
(
const
QString
&
tmpl
)
{
if
(
!
mReaderWin
->
message
().
hasPayload
<
KMime
::
Message
::
Ptr
>
()
)
return
;
...
...
@@ -290,7 +290,7 @@ void KMReaderMainWin::slotCustomReplyAllToMsg( const QString &tmpl )
command
->
start
();
}
//-----------------------------------------------------------------------------
void
KMReaderMainWin
::
slotCustomForwardMsg
(
const
QString
&
tmpl
)
{
if
(
!
mReaderWin
->
message
().
hasPayload
<
KMime
::
Message
::
Ptr
>
()
)
return
;
...
...
@@ -303,7 +303,7 @@ void KMReaderMainWin::slotCustomForwardMsg( const QString &tmpl)
command
->
start
();
}
//-----------------------------------------------------------------------------
void
KMReaderMainWin
::
slotConfigChanged
()
{
//readConfig();
...
...
@@ -363,7 +363,7 @@ void KMReaderMainWin::setupAccel()
connect
(
mReaderWin
->
viewer
(),
SIGNAL
(
moveMessageToTrash
()),
this
,
SLOT
(
slotTrashMsg
())
);
}
//-----------------------------------------------------------------------------
KAction
*
KMReaderMainWin
::
copyActionMenu
(
QMenu
*
menu
)
{
KMMainWidget
*
mainwin
=
kmkernel
->
getKMMainWidget
();
...
...
kmail/kmreaderwin.cpp
View file @
7c0920ac
...
...
@@ -97,7 +97,7 @@ using MessageComposer::MessageFactory;
using
namespace
KMail
;
using
namespace
MailCommon
;
//-----------------------------------------------------------------------------
KMReaderWin
::
KMReaderWin
(
QWidget
*
aParent
,
QWidget
*
mainWindow
,
KActionCollection
*
actionCollection
,
...
...
@@ -263,13 +263,13 @@ bool KMReaderWin::isFixedFont() const
return
mViewer
->
isFixedFont
();
}
//-----------------------------------------------------------------------------
KMReaderWin
::~
KMReaderWin
()
{
}
//-----------------------------------------------------------------------------
void
KMReaderWin
::
readConfig
(
void
)
{
mViewer
->
readConfig
();
...
...
@@ -283,13 +283,13 @@ void KMReaderWin::setHeaderStyleAndStrategy( HeaderStyle * style,
HeaderStrategy
*
strategy
)
{
mViewer
->
setHeaderStyleAndStrategy
(
style
,
strategy
);
}
//-----------------------------------------------------------------------------
void
KMReaderWin
::
setOverrideEncoding
(
const
QString
&
encoding
)
{
mViewer
->
setOverrideEncoding
(
encoding
);
}
//-----------------------------------------------------------------------------
void
KMReaderWin
::
clearCache
()
{
clear
();
...
...
@@ -319,7 +319,7 @@ static const int numKMailNewFeatures =
sizeof
kmailNewFeatures
/
sizeof
*
kmailNewFeatures
;
//-----------------------------------------------------------------------------
//static
QString
KMReaderWin
::
newFeaturesMD5
()
{
...
...
@@ -332,7 +332,7 @@ QString KMReaderWin::newFeaturesMD5()
return
QLatin1String
(
md5
.
base64Digest
());
}
//-----------------------------------------------------------------------------
void
KMReaderWin
::
displaySplashPage
(
const
QString
&
info
)
{
mViewer
->
displaySplashPage
(
info
);
...
...
@@ -365,7 +365,7 @@ void KMReaderWin::displayResourceOfflinePage()
}
//-----------------------------------------------------------------------------
void
KMReaderWin
::
displayAboutPage
()
{
KLocalizedString
info
=
...
...
@@ -431,12 +431,12 @@ void KMReaderWin::displayAboutPage()
displaySplashPage
(
info
.
toString
()
);
}
//-----------------------------------------------------------------------------
void
KMReaderWin
::
slotFind
()
{
mViewer
->
slotFind
();
}
//-----------------------------------------------------------------------------
void
KMReaderWin
::
slotCopySelectedText
()
{
QString
selection
=
mViewer
->
selectedText
();
...
...
@@ -444,19 +444,19 @@ void KMReaderWin::slotCopySelectedText()
QApplication
::
clipboard
()
->
setText
(
selection
);
}
//-----------------------------------------------------------------------------
void
KMReaderWin
::
setMsgPart
(
KMime
::
Content
*
aMsgPart
)
{
mViewer
->
setMessagePart
(
aMsgPart
);
}
//-----------------------------------------------------------------------------
QString
KMReaderWin
::
copyText
()
const
{
return
mViewer
->
selectedText
();
}
//-----------------------------------------------------------------------------
MessageViewer
::
Viewer
::
DisplayFormatMessage
KMReaderWin
::
displayFormatMessageOverwrite
()
const
{
return
mViewer
->
displayFormatMessageOverwrite
();
...
...
@@ -468,38 +468,38 @@ void KMReaderWin::setDisplayFormatMessageOverwrite(MessageViewer::Viewer::Displa
}
//-----------------------------------------------------------------------------
void
KMReaderWin
::
setHtmlLoadExtOverride
(
bool
override
)
{
mViewer
->
setHtmlLoadExtOverride
(
override
);
}
//-----------------------------------------------------------------------------
bool
KMReaderWin
::
htmlMail
()
const
{
return
mViewer
->
htmlMail
();
}
//-----------------------------------------------------------------------------
bool
KMReaderWin
::
htmlLoadExternal
()
{
return
mViewer
->
htmlLoadExternal
();
}
//-----------------------------------------------------------------------------
Akonadi
::
Item
KMReaderWin
::
message
()
const
{
return
mViewer
->
messageItem
();
}
//-----------------------------------------------------------------------------
void
KMReaderWin
::
slotMailtoCompose
()
{
KMCommand
*
command
=
new
KMMailtoComposeCommand
(
urlClicked
(),
message
()
);
command
->
start
();
}
//-----------------------------------------------------------------------------
void
KMReaderWin
::
slotMailtoForward
()
{
KMCommand
*
command
=
new
KMMailtoForwardCommand
(
mMainWindow
,
urlClicked
(),
...
...
@@ -507,7 +507,7 @@ void KMReaderWin::slotMailtoForward()
command
->
start
();
}
//-----------------------------------------------------------------------------
void
KMReaderWin
::
slotMailtoAddAddrBook
()
{
const
KUrl
url
=
urlClicked
();
...
...
@@ -536,7 +536,7 @@ void KMReaderWin::slotMailToAddToExistingContact()
delete
dlg
;
}
//-----------------------------------------------------------------------------
void
KMReaderWin
::
slotMailtoOpenAddrBook
()
{
const
KUrl
url
=
urlClicked
();
...
...
@@ -548,7 +548,7 @@ void KMReaderWin::slotMailtoOpenAddrBook()
job
->
start
();
}
//-----------------------------------------------------------------------------
void
KMReaderWin
::
slotAddBookmarks
()
{
const
KUrl
url
=
urlClicked
();
...
...
@@ -558,7 +558,7 @@ void KMReaderWin::slotAddBookmarks()
command
->
start
();
}
//-----------------------------------------------------------------------------
void
KMReaderWin
::
slotUrlSave
()
{
const
KUrl
url
=
urlClicked
();
...
...
@@ -577,7 +577,7 @@ void KMReaderWin::slotSaveImageOnDisk()
command
->
start
();
}
//-----------------------------------------------------------------------------
void
KMReaderWin
::
slotMailtoReply
()
{
KMCommand
*
command
=
new
KMMailtoReplyCommand
(
mMainWindow
,
urlClicked
(),
...
...
@@ -900,7 +900,7 @@ KAction *KMReaderWin::openBlockableItems() const
return
mViewer
->
openBlockableItems
();
}
//-----------------------------------------------------------------------------
void
KMReaderWin
::
slotShareImage
()
{
KMCommand
*
command
=
new
KMShareImageCommand
(
imageUrlClicked
(),
this
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment