[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:04:15
Message-ID: 20061130150415.31432.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
jjm keelhaul me uk changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|UNCONFIRMED |RESOLVED
Resolution| |FIXED
------- Additional Comments From jjm keelhaul me uk 2006-11-30 16:04 \
------- SVN commit 609393 by marten:
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
BUG:106478
M +2 -6 kmail_part.rc
M +1 -2 kmfoldertree.cpp
M +1 -6 kmheaders.cpp
M +5 -1 kmmainwidget.cpp
M +2 -6 kmmainwin.rc
M +7 -1 kmreadermainwin.cpp
M +2 -2 kmreadermainwin.h
--- branches/KDE/3.5/kdepim/kmail/kmail_part.rc #609392:609393
@ -2,7 +2,7 @
the same menu entries at the same place in KMail and Kontact -->
<!DOCTYPE kpartgui>
-<kpartgui version="7" name="kmail_part" >
+<kpartgui version="8" name="kmail_part" >
<MenuBar>
<Menu noMerge="1" name="file" >
<text>&File</text>
@ -126,11 +126,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" >
--- branches/KDE/3.5/kdepim/kmail/kmfoldertree.cpp #609392:609393
@ -1020,11 +1020,10 @
mMainWidget->action("compact")->plug(folderMenu);
folderMenu->insertSeparator();
+ mMainWidget->action("empty")->plug(folderMenu);
if ( !fti->folder()->isSystemFolder() ) {
mMainWidget->action("delete_folder")->plug(folderMenu);
- folderMenu->insertSeparator();
}
- mMainWidget->action("empty")->plug(folderMenu);
folderMenu->insertSeparator();
}
}
--- branches/KDE/3.5/kdepim/kmail/kmheaders.cpp #609392:609393
@ -2325,11 +2325,6 @
mOwner->threadStatusMenu()->plug( menu ); // Mark Thread menu
}
- if (!out_folder && !mFolder->isSent() && \
mOwner->watchThreadAction()->isEnabled() ) {
- mOwner->watchThreadAction()->plug(menu);
- mOwner->ignoreThreadAction()->plug(menu);
- }
-
if ( !out_folder ) {
menu->insertSeparator();
mOwner->filterMenu()->plug( menu ); // Create Filter menu
@ -2337,9 +2332,9 @
}
menu->insertSeparator();
+ mOwner->printAction()->plug(menu);
mOwner->saveAsAction()->plug(menu);
mOwner->saveAttachmentsAction()->plug(menu);
- mOwner->printAction()->plug(menu);
menu->insertSeparator();
if ( mFolder->isTrash() ) {
mOwner->deleteAction()->plug(menu);
--- branches/KDE/3.5/kdepim/kmail/kmmainwidget.cpp #609392:609393
@ -2428,7 +2428,7 @
mModifyFolderAction = new KAction( i18n("&Properties"), "configure", 0, \
this, SLOT(slotModifyFolder()), actionCollection(), "modify" );
- mFolderMailingListPropertiesAction = new KAction( i18n("&Mailing List \
Management"), + mFolderMailingListPropertiesAction = new KAction( \
i18n("&Mailing List Management..."),
/*"folder_mailinglist_properties",*/ 0, this, SLOT( \
slotFolderMailingListProperties() ), actionCollection(), \
"folder_mailinglist_properties" );
@ -2655,6 +2655,10 @
0, this, \
SLOT(slotSetThreadStatusIgnored()),
actionCollection(), \
"thread_ignored");
+ mThreadStatusMenu->insert( new KActionSeparator( this ) );
+ mThreadStatusMenu->insert( mWatchThreadAction );
+ mThreadStatusMenu->insert( mIgnoreThreadAction );
+
mSaveAttachmentsAction = new KAction( i18n("Save A&ttachments..."), \
"attach", 0, this, SLOT(slotSaveAttachments()),
actionCollection(), \
"file_save_attachments" );
--- branches/KDE/3.5/kdepim/kmail/kmmainwin.rc #609392:609393
@ -2,7 +2,7 @
the same menu entries at the same place in KMail and Kontact -->
<!DOCTYPE kpartgui>
-<kpartgui version="89" name="kmmainwin" >
+<kpartgui version="90" name="kmmainwin" >
<MenuBar>
<Menu noMerge="1" name="file" >
<text>&File</text>
@ -129,11 +129,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" >
--- branches/KDE/3.5/kdepim/kmail/kmreadermainwin.cpp #609392:609393
@ -285,6 +285,9 @
// 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() );
@ -423,6 +426,9 @
if(mReaderWin && !mReaderWin->copyText().isEmpty()) {
if ( urlMenuAdded )
menu->insertSeparator();
+ mReplyActionMenu->plug( menu );
+ menu->insertSeparator();
+
mReaderWin->copyAction()->plug( menu );
mReaderWin->selectAllAction()->plug( menu );
} else if ( !urlMenuAdded )
@ -454,7 +460,7 @
mReaderWin->toggleFixFontAction()->plug( menu );
menu->insertSeparator();
mPrintAction->plug( menu );
- menu->insertItem( SmallIcon("filesaveas"), i18n( "Save &As..." ), \
mReaderWin, SLOT( slotSaveMsg() ) ); + mSaveAsAction->plug( menu );
menu->insertItem( i18n("Save Attachments..."), mReaderWin, \
SLOT(slotSaveAttachments()) ); }
menu->exec(aPoint, 0);
--- branches/KDE/3.5/kdepim/kmail/kmreadermainwin.h #609392:609393
@ -65,8 +65,8 @
KURL mUrl;
QMap<int,KMFolder*> mMenuToFolder;
// a few actions duplicated from kmmainwidget
- KAction *mTrashAction, *mPrintAction, *mReplyAction, *mReplyAllAction, \
*mReplyAuthorAction,
- *mReplyListAction, *mForwardInlineAction,
+ KAction *mTrashAction, *mPrintAction, *mSaveAsAction, *mReplyAction,
+ *mReplyAllAction, *mReplyAuthorAction, *mReplyListAction, \
*mForwardInlineAction,
*mForwardAttachedAction, *mForwardDigestAction, \
*mRedirectAction,
*mViewSourceAction;
KActionMenu *mReplyActionMenu;
_______________________________________________
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