[prev in list] [next in list] [prev in thread] [next in thread]
List: kmail-devel
Subject: Menu ordering/consistency fixes
From: Jonathan Marten <jjm () keelhaul ! demon ! co ! uk>
Date: 2006-11-19 16:22:21
Message-ID: 200611191622.21679.jjm () keelhaul ! demon ! co ! uk
[Download RAW message or body]
I'd like to commit the attached changes (to the kdepim-3.5.5+ branch) to fix
some inconsistencies in the menus which have been noted (bugs 125674, part of
115611, 84248 and other duplicates). The user-visible changes are:
Menubar - Message - Mark Thread : same detailed status menu as message popup
Message list popup - Mark Thread : "Watch" and "Ignore" moved to here
Message list popup : Print/Save/Save Atm. in consistent order
Message reader window popup : if there is selected text, same "Reply"
actions as message preview window
Menubar - Folder - Mailing List Management
missing "..." added
Folder list popup : Move All To Trash/Delete Folder in
consistent order
There are no I18N string changes (but one that could be done when release
criteria permit).
Are there any objections? All of the changes are minor - reordering or making
consistent. There are no major changes, such as the contentious dialogue
reorganisation suggested in 115611 (although IMHO that would be a very good
idea).
--
Jonathan Marten http://www.keelhaul.demon.co.uk
Twickenham, UK jjm@keelhaul.demon.co.uk
["menufix.diff" (text/x-diff)]
Index: kmmainwin.rc
===================================================================
--- kmmainwin.rc (revision 606154)
+++ kmmainwin.rc (working copy)
@@ -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" >
Index: kmheaders.cpp
===================================================================
--- kmheaders.cpp (revision 606154)
+++ kmheaders.cpp (working copy)
@@ -2360,12 +2360,6 @@ void KMHeaders::slotRMB()
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 @@ void KMHeaders::slotRMB()
}
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);
Index: kmreadermainwin.cpp
===================================================================
--- kmreadermainwin.cpp (revision 606154)
+++ kmreadermainwin.cpp (working copy)
@@ -423,6 +423,9 @@ void KMReaderMainWin::slotMsgPopup(KMMes
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 @@ void KMReaderMainWin::slotMsgPopup(KMMes
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();
Index: kmail_part.rc
===================================================================
--- kmail_part.rc (revision 606154)
+++ kmail_part.rc (working copy)
@@ -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" >
Index: kmmainwidget.cpp
===================================================================
--- kmmainwidget.cpp (revision 606154)
+++ kmmainwidget.cpp (working copy)
@@ -2705,7 +2705,8 @@ void KMMainWidget::setupActions()
mModifyFolderAction = new KAction( i18n("&Properties"), "configure", 0, this,
SLOT(slotModifyFolder()), actionCollection(), "modify" );
- mFolderMailingListPropertiesAction = new KAction( i18n("&Mailing List Management"),
+ // FIXME when allowed: change message
+ mFolderMailingListPropertiesAction = new KAction( i18n("&Mailing List Management")+"...",
/*"folder_mailinglist_properties",*/ 0, this, SLOT( slotFolderMailingListProperties() ),
actionCollection(), "folder_mailinglist_properties" );
@@ -2946,6 +2947,10 @@ void KMMainWidget::setupActions()
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" );
Index: kmfoldertree.cpp
===================================================================
--- kmfoldertree.cpp (revision 606154)
+++ kmfoldertree.cpp (working copy)
@@ -1025,11 +1025,10 @@ void KMFolderTree::slotContextMenuReques
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();
}
}
_______________________________________________
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