[prev in list] [next in list] [prev in thread] [next in thread]
List: kmail-devel
Subject: [Bug 106478] No "save" or "save as" option in the separate reader
From: Jonathan Marten <jjm () keelhaul ! me ! uk>
Date: 2006-11-30 15:02:19
Message-ID: 20061130150219.30006.qmail () ktown ! kde ! org
[Download RAW message or body]
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
http://bugs.kde.org/show_bug.cgi?id=106478
------- Additional Comments From jjm keelhaul me uk 2006-11-30 16:02 -------
SVN commit 609392 by marten:
Forward port 606990,607024 from work/kdepim-3.5.5+ feature branch:
Some changes to make menubar and popup menus more consistent (but still some way to \
go): Menubar - Message has same "Mark Thread" submenu as popup
All popups with "Print", "Save" and "Save Attachments" in consistent order
Message window popup (when selected text) has same "Reply" menu as preview popup
Menubar - Folder - Mailing List Management has "..."
Folder list popup has "Empty" and "Delete" in consistent order
Add keyboard shortcut Ctrl+S for "Save As" action in reader window
GUI:
CCBUG:92905
CCBUG:106478
M +2 -6 kmail_part.rc
M +2 -4 kmfoldertree.cpp
M +1 -6 kmheaders.cpp
M +5 -1 kmmainwidget.cpp
M +2 -6 kmmainwin.rc
M +9 -4 kmreadermainwin.cpp
M +3 -3 kmreadermainwin.h
--- trunk/KDE/kdepim/kmail/kmail_part.rc #609391:609392
@ -2,7 +2,7 @
the same menu entries at the same place in KMail and Kontact -->
<!DOCTYPE kpartgui>
-<kpartgui version="6" name="kmail_part" >
+<kpartgui version="7" name="kmail_part" >
<MenuBar>
<Menu noMerge="1" name="file" >
<text>&File</text>
@ -125,11 +125,7 @
<Action name="move_to" />
<Separator/>
<Action name="set_status" />
- <Menu name="menubar_message_mark_thread_as">
- <text>Mark Thread as</text>
- <Action name="thread_watched" />
- <Action name="thread_ignored" />
- </Menu>
+ <Action name="thread_status" />
<Separator/>
<Action name="create_filter"/>
<Menu name="apply_filter_actions" >
--- trunk/KDE/kdepim/kmail/kmfoldertree.cpp #609391:609392
@ -1034,11 +1034,9 @
folderMenu->addAction( mMainWidget->action("compact") );
folderMenu->addSeparator();
- if ( !fti->folder()->isSystemFolder() ) {
- folderMenu->addAction( mMainWidget->action("delete_folder") );
- folderMenu->addSeparator();
- }
folderMenu->addAction( mMainWidget->action("empty") );
+ if ( !fti->folder()->isSystemFolder() )
+ folderMenu->addAction( mMainWidget->action("delete_folder") );
folderMenu->addSeparator();
}
}
--- trunk/KDE/kdepim/kmail/kmheaders.cpp #609391:609392
@ -2363,11 +2363,6 @
menu->addAction( mOwner->threadStatusMenu() ); // Mark Thread menu
}
- if (!out_folder && !mFolder->isSent() && mOwner->watchThreadAction()->isEnabled() \
) {
- menu->addAction( mOwner->watchThreadAction() );
- menu->addAction( mOwner->ignoreThreadAction() );
- }
-
if ( !out_folder ) {
menu->addSeparator();
menu->addAction( mOwner->filterMenu() ); // Create Filter menu
@ -2375,9 +2370,9 @
}
menu->addSeparator();
+ menu->addAction( mOwner->printAction() );
menu->addAction( mOwner->saveAsAction() );
menu->addAction( mOwner->saveAttachmentsAction() );
- menu->addAction( mOwner->printAction() );
menu->addSeparator();
if ( mFolder->isTrash() ) {
menu->addAction( mOwner->deleteAction() );
--- trunk/KDE/kdepim/kmail/kmmainwidget.cpp #609391:609392
@ -2465,7 +2465,7 @
mModifyFolderAction = new KAction(KIcon("configure"), i18n("&Properties"), \
actionCollection(), "modify" ); connect(mModifyFolderAction, \
SIGNAL(triggered(bool)), SLOT(slotModifyFolder()));
- mFolderMailingListPropertiesAction = new KAction( i18n("&Mailing List \
Management"), + mFolderMailingListPropertiesAction = new KAction( i18n("&Mailing \
List Management..."),
actionCollection(), \
"folder_mailinglist_properties" ); connect(mFolderMailingListPropertiesAction, \
SIGNAL(triggered(bool)), SLOT( slotFolderMailingListProperties())); // \
mFolderMailingListPropertiesAction->setIcon(KIcon("folder_mailinglist_properties")); \
@ -2674,6 +2674,10 @ mIgnoreThreadAction = new KToggleAction(KIcon("mail_ignore"), \
i18n("&Ignore Thread"), actionCollection(), "thread_ignored"); \
connect(mIgnoreThreadAction, SIGNAL(triggered(bool) ), \
SLOT(slotSetThreadStatusIgnored()));
+ mThreadStatusMenu->addAction( new KSeparatorAction( actionCollection() ) );
+ mThreadStatusMenu->addAction( mWatchThreadAction );
+ mThreadStatusMenu->addAction( mIgnoreThreadAction );
+
mSaveAttachmentsAction = new KAction(KIcon("attach"), i18n("Save \
A&ttachments..."), actionCollection(), "file_save_attachments" ); \
connect(mSaveAttachmentsAction, SIGNAL(triggered(bool) ), \
SLOT(slotSaveAttachments()));
--- trunk/KDE/kdepim/kmail/kmmainwin.rc #609391:609392
@ -2,7 +2,7 @
the same menu entries at the same place in KMail and Kontact -->
<!DOCTYPE kpartgui>
-<kpartgui version="88" name="kmmainwin" >
+<kpartgui version="89" name="kmmainwin" >
<MenuBar>
<Menu noMerge="1" name="file" >
<text>&File</text>
@ -128,11 +128,7 @
<Action name="move_to" />
<Separator/>
<Action name="set_status" />
- <Menu name="menubar_message_mark_thread_as">
- <text>Mark Thread as</text>
- <Action name="thread_watched" />
- <Action name="thread_ignored" />
- </Menu>
+ <Action name="thread_status" />
<Separator/>
<Action name="create_filter"/>
<Menu name="apply_filter_actions" >
--- trunk/KDE/kdepim/kmail/kmreadermainwin.cpp #609391:609392
@ -234,6 +234,10 @
// this, SLOT( slotSaveMsg() ),
// actionCollection(), "file_save_as" );
+ mSaveAsAction = KStdAction::saveAs( mReaderWin, SLOT( slotSaveMsg() ),
+ actionCollection() );
+ mSaveAsAction->setShortcut( KStdAccel::shortcut( KStdAccel::Save ) );
+
mPrintAction = KStdAction::print( this, SLOT( slotPrintMsg() ),
actionCollection() );
@ -350,6 +354,9 @
if(!mReaderWin->copyText().isEmpty()) {
if ( urlMenuAdded )
menu->addSeparator();
+ menu->addAction( mReplyActionMenu );
+ menu->insertSeparator();
+
menu->addAction( mReaderWin->copyAction() );
menu->addAction( mReaderWin->selectAllAction() );
} else if ( !urlMenuAdded )
@ -381,11 +388,9 @
menu->addAction( mReaderWin->toggleFixFontAction() );
menu->addSeparator();
menu->addAction( mPrintAction );
- QAction* act = menu->addAction( SmallIcon("filesaveas"), i18n( "Save &As..." ) \
); + menu->addAction( mSaveAsAction );
+ QAction* act = menu->addAction( i18n("Save Attachments...") );
connect(act, SIGNAL(triggered(QAction*)),
- mReaderWin, SLOT( slotSaveMsg() ) );
- act = menu->addAction( i18n("Save Attachments...") );
- connect(act, SIGNAL(triggered(QAction*)),
mReaderWin, SLOT(slotSaveAttachments()) );
}
menu->exec(aPoint, 0);
--- trunk/KDE/kdepim/kmail/kmreadermainwin.h #609391:609392
@ -59,9 +59,9 @
KUrl mUrl;
QMap<QAction*,KMFolder*> mMenuToFolder;
// a few actions duplicated from kmmainwidget
- KAction *mPrintAction, *mReplyAction, *mReplyAllAction, *mReplyAuthorAction,
- *mReplyListAction, *mForwardAction,
- *mForwardAttachedAction, *mRedirectAction,
+ KAction *mPrintAction, *mSaveAsAction,
+ *mReplyAction, *mReplyAllAction, *mReplyAuthorAction, *mReplyListAction,
+ *mForwardAction, *mForwardAttachedAction, *mRedirectAction,
*mViewSourceAction;
KActionMenu *mReplyActionMenu;
KActionMenu *mForwardActionMenu;
_______________________________________________
KMail developers mailing list
KMail-devel@kde.org
https://mail.kde.org/mailman/listinfo/kmail-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic