[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-bugs-dist
Subject: [Bug 92905] Folder Menu and Context Menu of a Folder should be the
From: Jonathan Marten <jjm () keelhaul ! me ! uk>
Date: 2006-11-22 18:16:32
Message-ID: 20061122181632.23527.qmail () ktown ! kde ! org
[Download RAW message or body]
------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
http://bugs.kde.org/show_bug.cgi?id=92905
------- Additional Comments From jjm keelhaul me uk 2006-11-22 19:16 -------
SVN commit 606990 by marten:
Apparently no objections, so...
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
CCBUG: 92905
CCMAIL:kmail-devel kde org
GUI:
M +2 -6 branches/work/kdepim-3.5.5+/kmail/kmail_part.rc
M +1 -2 branches/work/kdepim-3.5.5+/kmail/kmfoldertree.cpp
M +1 -7 branches/work/kdepim-3.5.5+/kmail/kmheaders.cpp
M +5 -1 branches/work/kdepim-3.5.5+/kmail/kmmainwidget.cpp
M +2 -6 branches/work/kdepim-3.5.5+/kmail/kmmainwin.rc
M +11 -3 branches/work/kdepim-3.5.5+/kmail/kmreadermainwin.cpp
--- branches/work/kdepim-3.5.5+/kmail/kmail_part.rc #606989:606990
@ -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/work/kdepim-3.5.5+/kmail/kmfoldertree.cpp #606989:606990
@ -1025,11 +1025,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/work/kdepim-3.5.5+/kmail/kmheaders.cpp #606989:606990
@ -2360,12 +2360,6 @
mOwner->threadStatusMenu()->plug( menu ); // Mark Thread menu
}
- if ( !out_folder && !tem_folder && !mFolder->isSent() &&
- mOwner->watchThreadAction()->isEnabled() ) {
- mOwner->watchThreadAction()->plug( menu );
- mOwner->ignoreThreadAction()->plug( menu );
- }
-
if ( !out_folder && !tem_folder ) {
menu->insertSeparator();
mOwner->filterMenu()->plug( menu ); // Create Filter menu
@ -2373,9 +2367,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/work/kdepim-3.5.5+/kmail/kmmainwidget.cpp #606989:606990
@ -2705,7 +2705,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" );
@ -2946,6 +2946,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/work/kdepim-3.5.5+/kmail/kmmainwin.rc #606989:606990
@ -2,7 +2,7 @
the same menu entries at the same place in KMail and Kontact -->
<!DOCTYPE kpartgui>
-<kpartgui version="90" name="kmmainwin" >
+<kpartgui version="91" name="kmmainwin" >
<MenuBar>
<Menu noMerge="1" name="file" >
<text>&File</text>
@ -130,11 +130,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/work/kdepim-3.5.5+/kmail/kmreadermainwin.cpp #606989:606990
@ -423,6 +423,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 )
@ -435,9 +438,14 @
return;
}
- if ( ! ( aMsg.parent() && ( aMsg.parent()->isSent() || aMsg.parent()->isDrafts() ) ) ) {
- // add the reply and forward actions only if we are not in a sent-mail or drafts
- // folder
+ if ( ! ( aMsg.parent() && ( aMsg.parent()->isSent() ||
+ aMsg.parent()->isDrafts() ||
+ aMsg.parent()->isTemplates() ) ) ) {
+ // add the reply and forward actions only if we are not in a sent-mail,
+ // templates or drafts folder
+ //
+ // FIXME: needs custom templates added to menu
+ // (see KMMainWidget::updateCustomTemplateMenus)
mReplyActionMenu->plug( menu );
mForwardActionMenu->plug( menu );
menu->insertSeparator();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic