Use "SaveAs" action from messaviewer => not necessary to duplicate

action
(reduce memory :) )
wilder-work
Montel Laurent 14 years ago
parent bafa72bacc
commit fb88b6b8f1
  1. 5
      kmreadermainwin.cpp
  2. 2
      kmreadermainwin.h
  3. 4
      kmreadermainwin.rc
  4. 5
      kmreaderwin.cpp
  5. 1
      kmreaderwin.h

@ -324,9 +324,6 @@ void KMReaderMainWin::setupAccel()
this, SLOT(slotReplyOrForwardFinished()) );
//----- File Menu
mSaveAsAction = KStandardAction::saveAs( mReaderWin->viewer(), SLOT(slotSaveMessage()),
actionCollection() );
mSaveAsAction->setShortcut( KStandardShortcut::shortcut( KStandardShortcut::Save ) );
mSaveAtmAction = new KAction(KIcon("mail-attachment"), i18n("Save A&ttachments..."), actionCollection() );
connect( mSaveAtmAction, SIGNAL(triggered(bool)), mReaderWin->viewer(), SLOT(slotAttachmentSaveAll()) );
@ -521,7 +518,7 @@ void KMReaderMainWin::slotDelayedMessagePopup( KJob *job )
menu->addAction( mReaderWin->toggleMimePartTreeAction() );
menu->addSeparator();
menu->addAction( mMsgActions->printAction() );
menu->addAction( mSaveAsAction );
menu->addAction( mReaderWin->saveAsAction() );
menu->addAction( mSaveAtmAction );
if ( mMsg.isValid() ) {
menu->addSeparator();

@ -84,7 +84,7 @@ private:
KMReaderWin *mReaderWin;
Akonadi::Item mMsg;
// a few actions duplicated from kmmainwidget
KAction *mTrashAction, *mSaveAsAction, *mSaveAtmAction;
KAction *mTrashAction, *mSaveAtmAction;
KFontAction *fontAction;
KFontSizeAction *fontSizeAction;
KMail::MessageActions *mMsgActions;

@ -1,10 +1,10 @@
<!DOCTYPE kpartgui>
<kpartgui version="419" name="kmreadermainwin" >
<kpartgui version="420" name="kmreadermainwin" >
<MenuBar>
<Menu noMerge="1" name="file" >
<text>&amp;File</text>
<Action name="file_open" />
<Action name="file_save_as" />
<Action name="save_message" />
<Action name="file_print_preview"/>
<Action name="file_print" />
<Separator/>

@ -599,6 +599,11 @@ KAction *KMReaderWin::viewSourceAction()
return mViewer->viewSourceAction();
}
KAction *KMReaderWin::saveAsAction()
{
return mViewer->saveAsAction();
}
KAction *KMReaderWin::findInMessageAction()
{
return mViewer->findInMessageAction();

@ -145,6 +145,7 @@ public:
KAction* downloadImageToDiskAction() const;
KAction *viewSourceAction();
KAction *findInMessageAction();
KAction *saveAsAction();
KAction* editContactAction() const { return mEditContactAction; }

Loading…
Cancel
Save