New and Updated patches (egaudet)
[webos-internals:djcin7s-modifications.git] / email / email-add-move-and-mark-unread-buttons.patch
1 diff --git a/usr/palm/applications/com.palm.app.email/app/controllers/message-assistant.js b/usr/palm/applications/com.palm.app.email/app/controllers/message-assistant.js
2 index 761069e..b961bfb 100644
3 --- a/usr/palm/applications/com.palm.app.email/app/controllers/message-assistant.js
4 +++ b/usr/palm/applications/com.palm.app.email/app/controllers/message-assistant.js
5 @@ -70,14 +70,14 @@ var MessageAssistant = Class.create({
6                 this.cmdMenuModel = {
7                                 visible:true,
8                                 items: [
9 +                                       {label:$L('Delete'),    icon:'delete',    command:'delete'},
10                                         {label:$L('Reply'),     icon:'reply',     command:'reply'},
11 -                                       {label:$L('Reply all'), icon:'reply-all', command:'replyAll'},
12 -                                       {label:$L('Forward'),   icon:'forward-email', command:'forward'},
13 -                                       {label:$L('Delete'),    icon:'delete',    command:'delete'}
14 +                                       {label:$L('Move'),      icon:'file', command:'move'},
15 +                                       {label:$L('MarkUnread'),   icon:'back', command:'mark-unread'}
16                                 ]};
17                 this.controller.setupWidget(Mojo.Menu.commandMenu, undefined, this.cmdMenuModel);
18                 
19 -               this.markUnreadMenuItem =     {label:MessageAssistant.kAppMenuMarkUnread, shortcut:'k', command:'mark-unread'};
20 +               this.markUnreadMenuItem =     {label:MessageAssistant.kAppMenuMarkUnread, shortcut:'u', command:'mark-unread'};
21                 this.markSetFlagMenuItem =    {label:MessageAssistant.kAppMenuSetFlag, shortcut:'g', command:'flag'};
22                 this.showRecipientsMenuItem = {label:MessageAssistant.kAppMenuShowRecipients, shortcut:'s', command:'show-recipients'};
23                 
24 @@ -104,7 +104,8 @@ var MessageAssistant = Class.create({
25                                 emailEditItems,
26                                 this.markUnreadMenuItem,
27                                 this.markSetFlagMenuItem,
28 -                               {label:$L('Move to Folder...'), shortcut:'m', command:'move'},
29 +                               {label:$L('Forward...'), shortcut:'f', command:'forward'},
30 +                               {label:$L('Reply to All...'), shortcut:'r', command:'replyAll'},
31                                 this.showRecipientsMenuItem,
32                                 Mojo.Menu.prefsItem,
33                                 Mojo.Menu.helpItem
34 @@ -1473,14 +1474,9 @@ var MessageAssistant = Class.create({
35                                                 var currentLabel = this.markUnreadMenuItem.label;
36                                                 var markRead = (currentLabel == MessageAssistant.kAppMenuMarkRead);
37                                                 Message.setRead(this.data.id, markRead);
38 -                                               if (markRead) {
39 -                                                       this.markUnreadMenuItem.label = MessageAssistant.kAppMenuMarkUnread;
40 -                                               } else {
41 -                                                       this.markUnreadMenuItem.label = MessageAssistant.kAppMenuMarkRead;
42 -                                               }
43 -                                               
44 +                                               this.markUnreadMenuItem.label = MessageAssistant.kAppMenuMarkUnread;
45                                                 this.updateMessageInParentScene();
46 -                                               
47 +                                               this.controller.stageController.popScene();
48                                                 break;
49  
50                                         case 'flag':