[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/akonadi-ports/kdepim/kmail
From: Laurent Montel <montel () kde ! org>
Date: 2009-10-06 17:13:51
Message-ID: 1254849231.536827.22810.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1032025 by mlaurent:
Clean up
M +1 -6 kmmainwidget.cpp
M +0 -73 kmreaderwin.cpp
--- branches/work/akonadi-ports/kdepim/kmail/kmmainwidget.cpp #1032024:1032025
@@ -165,9 +165,8 @@
#include <akonadi/favoritecollectionsmodel.h>
#include <akonadi/itemfetchscope.h>
-#ifdef USE_AKONADI_VIEWER
#include <libmessageviewer/viewer.h>
-#endif
+
#ifdef USE_AKONADI_PANE
#include <messagelist/pane.h>
#include <akonadi/entitytreeview.h>
@@ -689,11 +688,7 @@
if ( mMsgView ) {
if ( !mReaderWindowBelow )
GlobalSettings::self()->setReaderWindowWidth( mMsgView->width() );
-#ifndef USE_AKONADI_VIEWER
- mMsgView->writeConfig();
-#else
mMsgView->viewer()->writeConfig();
-#endif
GlobalSettings::self()->setReaderWindowHeight( mMsgView->width() );
}
}
--- branches/work/akonadi-ports/kdepim/kmail/kmreaderwin.cpp #1032024:1032025
@@ -1020,70 +1020,7 @@
mAtmCurrentName = fileName;
}
-//-----------------------------------------------------------------------------
-void KMReaderWin::showAttachmentPopup( int id, const QString & name, const QPoint &p \
)
-{
- prepareHandleAttachment( id, name );
- KMenu *menu = new KMenu();
- QAction *action;
- QSignalMapper *attachmentMapper = new QSignalMapper( menu );
- connect( attachmentMapper, SIGNAL( mapped( int ) ),
- this, SLOT( slotHandleAttachment( int ) ) );
-
- action = menu->addAction(SmallIcon("document-open"),i18nc("to open", "Open"));
- connect( action, SIGNAL( triggered(bool) ), attachmentMapper, SLOT( map() ) );
- attachmentMapper->setMapping( action, KMHandleAttachmentCommand::Open );
-
- action = menu->addAction(i18n("Open With..."));
- connect( action, SIGNAL( triggered(bool) ), attachmentMapper, SLOT( map() ) );
- attachmentMapper->setMapping( action, KMHandleAttachmentCommand::OpenWith );
-
- action = menu->addAction(i18nc("to view something", "View") );
- connect( action, SIGNAL( triggered(bool) ), attachmentMapper, SLOT( map() ) );
- attachmentMapper->setMapping( action, KMHandleAttachmentCommand::View );
- const bool attachmentInHeader = hasParentDivWithId( mViewer->nodeUnderMouse(), \
"attachmentInjectionPoint" );
- const bool hasScrollbar = mViewer->view()->verticalScrollBar()->isVisible();
- if ( attachmentInHeader && hasScrollbar ) {
- action = menu->addAction( i18n( "Scroll To" ) );
- connect( action, SIGNAL( triggered(bool) ), attachmentMapper, SLOT( map() ) );
- attachmentMapper->setMapping( action, KMHandleAttachmentCommand::ScrollTo );
- }
- action = menu->addAction(SmallIcon("document-save-as"),i18n("Save As...") );
- connect( action, SIGNAL( triggered(bool) ), attachmentMapper, SLOT( map() ) );
- attachmentMapper->setMapping( action, KMHandleAttachmentCommand::Save );
-
- action = menu->addAction(SmallIcon("edit-copy"), i18n("Copy") );
- connect( action, SIGNAL( triggered(bool) ), attachmentMapper, SLOT( map() ) );
- attachmentMapper->setMapping( action, KMHandleAttachmentCommand::Copy );
-
- const bool canChange = message()->parent() ? !message()->parent()->isReadOnly() : \
false;
-
- if ( GlobalSettings::self()->allowAttachmentEditing() ) {
- action = menu->addAction(SmallIcon("document-properties"), i18n("Edit \
Attachment") );
- connect( action, SIGNAL(triggered()), attachmentMapper, SLOT(map()) );
- attachmentMapper->setMapping( action, KMHandleAttachmentCommand::Edit );
- action->setEnabled( canChange );
- }
- if ( GlobalSettings::self()->allowAttachmentDeletion() ) {
- action = menu->addAction(SmallIcon("edit-delete"), i18n("Delete Attachment") );
- connect( action, SIGNAL(triggered()), attachmentMapper, SLOT(map()) );
- attachmentMapper->setMapping( action, KMHandleAttachmentCommand::Delete );
- action->setEnabled( canChange );
- }
- if ( name.endsWith( QLatin1String(".xia"), Qt::CaseInsensitive ) &&
- Kleo::CryptoBackendFactory::instance()->protocol( "Chiasmus" ) ) {
- action = menu->addAction( i18n( "Decrypt With Chiasmus..." ) );
- connect( action, SIGNAL( triggered(bool) ), attachmentMapper, SLOT( map() ) );
- attachmentMapper->setMapping( action, KMHandleAttachmentCommand::ChiasmusEncrypt \
);
- }
- action = menu->addAction(i18n("Properties") );
- connect( action, SIGNAL( triggered(bool) ), attachmentMapper, SLOT( map() ) );
- attachmentMapper->setMapping( action, KMHandleAttachmentCommand::Properties );
- menu->exec( p );
- delete menu;
-}
-
//-----------------------------------------------------------------------------
void KMReaderWin::slotHandleAttachment( int choice )
{
@@ -1123,11 +1060,7 @@
//-----------------------------------------------------------------------------
void KMReaderWin::slotFind()
{
-#ifndef USE_AKONADI_VIEWER
- mViewer->findText();
-#else
mViewer->slotFind();
-#endif
}
//-----------------------------------------------------------------------------
void KMReaderWin::slotCopySelectedText()
@@ -1409,13 +1342,7 @@
return temp;
}
-#ifndef USE_AKONADI_VIEWER
//-----------------------------------------------------------------------------
-void KMReaderWin::slotDocumentDone()
-{
-}
-#endif
-//-----------------------------------------------------------------------------
void KMReaderWin::setHtmlOverride( bool override )
{
mViewer->setHtmlOverride( override );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic