FCL/sf/app/commonemail: comparison emailuis/emailui/data/FreestyleEmailUi.rss

equal deleted inserted replaced

-:4ce476e64c59
+:8592a65ad3fb
 #include "FreestyleEmailUi.hrh"
 #include <freestyleemailui.loc>
 #include <unieditor.loc>
 #include <fsccallplugin.loc>
 #include <freestyleemailui.mbg>
+#include <aknsconstants.hrh>
 #define EMAILUI_ICON_FILE BITMAP_DIR"\\FreestyleEmailUi.mif"
 #ifndef qtn_cmail_options_moveto_folder
 #define qtn_cmail_options_moveto_folder qtn_fse_action_menu_move_message
 #endif
 {
 AVKON_BUTTON_STATE
 {
 helptxt = qtn_msg_tb_tooltip_send;
 bmpfile = EMAILUI_ICON_FILE;
-bmpid=EMbmFreestyleemailuiQgn_indi_tb_msg_send;
+bmpid = EMbmFreestyleemailuiQgn_indi_tb_msg_send;
-bmpmask=EMbmFreestyleemailuiQgn_indi_tb_msg_send_mask;
+bmpmask = EMbmFreestyleemailuiQgn_indi_tb_msg_send_mask;
+extension = r_cmail_button_state_ext_tb_msg_send;
 }
 };
 };
 },
 TBAR_CTRL
 {
 helptxt = qtn_mail_tb_tooltip_actions;
 bmpFile = EMAILUI_ICON_FILE;
 bmpId = EMbmFreestyleemailuiQgn_indi_tb_extension;
 bmpMask = EMbmFreestyleemailuiQgn_indi_tb_extension_mask;
+bmpSkinIdMajor = EAknsMajorGeneric;
+bmpSkinIdMinor = EAknsMinorGenericQgnIndiTbExtension;
 items =
 {
 TBAR_CTRL
 {
 type = EAknCtButton;
 {
 txt = qtn_mail_tb_ext_priority_high;
 bmpfile = EMAILUI_ICON_FILE;
 bmpid = EMbmFreestyleemailuiQgn_indi_tb_high_priority;
 bmpmask = EMbmFreestyleemailuiQgn_indi_tb_high_priority_mask;
+extension = r_cmail_button_state_ext_tb_high_priority;
 },
 AVKON_BUTTON_STATE
 {
 txt = qtn_mail_tb_ext_priority_high;
 bmpfile = EMAILUI_ICON_FILE;
 bmpid = EMbmFreestyleemailuiQgn_indi_tb_high_priority_selected;
 bmpmask = EMbmFreestyleemailuiQgn_indi_tb_high_priority_selected_mask;
+extension = r_cmail_button_state_ext_tb_high_priority_selected;
 }
 };
 };
 },
 TBAR_CTRL
 {
 txt = qtn_mail_tb_ext_priority_low;
 bmpfile = EMAILUI_ICON_FILE;
 bmpid = EMbmFreestyleemailuiQgn_indi_tb_low_priority;
 bmpmask = EMbmFreestyleemailuiQgn_indi_tb_low_priority_mask;
+extension = r_cmail_button_state_ext_tb_low_priority;
 },
 AVKON_BUTTON_STATE
 {
 txt = qtn_mail_tb_ext_priority_low;
 bmpfile = EMAILUI_ICON_FILE;
 bmpid = EMbmFreestyleemailuiQgn_indi_tb_low_priority_selected;
 bmpmask = EMbmFreestyleemailuiQgn_indi_tb_low_priority_selected_mask;
+extension = r_cmail_button_state_ext_tb_low_priority_selected;
 }
 };
 };
 },
 TBAR_CTRL
 {
 txt = qtn_mail_tb_ext_follow_up;
 bmpfile = EMAILUI_ICON_FILE;
 bmpid = EMbmFreestyleemailuiQgn_indi_tb_follow_up;
 bmpmask = EMbmFreestyleemailuiQgn_indi_tb_follow_up_mask;
+extension = r_cmail_button_state_ext_follow_up;
 },
 AVKON_BUTTON_STATE
 {
 txt = qtn_mail_tb_ext_follow_up;
 bmpfile = EMAILUI_ICON_FILE;
 bmpid = EMbmFreestyleemailuiQgn_indi_tb_follow_up_selected;
 bmpmask = EMbmFreestyleemailuiQgn_indi_tb_follow_up_selected_mask;
+extension = r_cmail_button_state_ext_tb_follow_up_selected;
 }
 };
 };
 },
 TBAR_CTRL
 bmpfile = EMAILUI_ICON_FILE;
 //bmpid = EMbmFreestyleemailuiQgn_indi_tb_show_cc;
 //bmpmask = EMbmFreestyleemailuiQgn_indi_tb_show_cc_mask;
 bmpid = EMbmFreestyleemailuiQgn_indi_tb_hide_cc;
 bmpmask = EMbmFreestyleemailuiQgn_indi_tb_hide_cc_mask;
+extension = r_cmail_button_state_ext_tb_show_cc;
 },
 AVKON_BUTTON_STATE
 {
 txt = qtn_mail_tb_ext_hide_cc;
 bmpfile = EMAILUI_ICON_FILE;
 bmpid = EMbmFreestyleemailuiQgn_indi_tb_hide_cc;
 bmpmask = EMbmFreestyleemailuiQgn_indi_tb_hide_cc_mask;
+extension = r_cmail_button_state_ext_tb_hide_cc;
 }
 };
 };
 },
 TBAR_CTRL
 bmpfile = EMAILUI_ICON_FILE;
 //bmpid = EMbmFreestyleemailuiQgn_indi_tb_show_bcc;
 //bmpmask = EMbmFreestyleemailuiQgn_indi_tb_show_bcc_mask;
 bmpid = EMbmFreestyleemailuiQgn_indi_tb_hide_bcc;
 bmpmask = EMbmFreestyleemailuiQgn_indi_tb_hide_bcc_mask;
+extension = r_cmail_button_state_ext_tb_show_bcc;
 },
 AVKON_BUTTON_STATE
 {
 txt = qtn_mail_tb_ext_hide_bcc;
 bmpfile = EMAILUI_ICON_FILE;
 bmpid = EMbmFreestyleemailuiQgn_indi_tb_hide_bcc;
 bmpmask = EMbmFreestyleemailuiQgn_indi_tb_hide_bcc_mask;
+extension = r_cmail_button_state_ext_tb_hide_bcc;
 }
 };
 };
 }
 }; // end of extension items
 {
 helptxt = qtn_fse_tb_editor_add_attachment;
 bmpFile = EMAILUI_ICON_FILE;
 bmpId = EMbmFreestyleemailuiQgn_indi_tb_expand_insert;
 bmpMask = EMbmFreestyleemailuiQgn_indi_tb_expand_insert_mask;
+bmpSkinIdMajor = EAknsMajorGeneric;
+bmpSkinIdMinor = EAknsMinorGenericQgnIndiTbExpandInsert;
 items =
 {
 TBAR_CTRL
 {
 type = EAknCtButton;
 AVKON_BUTTON_STATE
 {
 txt = qtn_msg_insert_tb_image;
 helptxt = qtn_msg_insert_tb_tooltip_image;
 bmpfile = EMAILUI_ICON_FILE;
-bmpid=EMbmFreestyleemailuiQgn_indi_mce_tb_image;
+bmpid = EMbmFreestyleemailuiQgn_indi_mce_tb_image;
-bmpmask=EMbmFreestyleemailuiQgn_indi_mce_tb_image_mask;
+bmpmask = EMbmFreestyleemailuiQgn_indi_mce_tb_image_mask;
+extension = r_cmail_button_state_ext_mce_tb_image;
 }
 };
 };
 },
 TBAR_CTRL
 AVKON_BUTTON_STATE
 {
 txt = qtn_msg_insert_tb_video;
 helptxt = qtn_msg_insert_tb_tooltip_video;
 bmpfile = EMAILUI_ICON_FILE;
-bmpid=EMbmFreestyleemailuiQgn_indi_mce_tb_video;
+bmpid = EMbmFreestyleemailuiQgn_indi_mce_tb_video;
-bmpmask=EMbmFreestyleemailuiQgn_indi_mce_tb_video_mask;
+bmpmask = EMbmFreestyleemailuiQgn_indi_mce_tb_video_mask;
+extension = r_cmail_button_state_ext_mce_tb_video;
 }
 };
 };
 },
 TBAR_CTRL
 AVKON_BUTTON_STATE
 {
 txt = qtn_msg_insert_tb_sound;
 helptxt = qtn_msg_insert_tb_tooltip_sound;
 bmpfile = EMAILUI_ICON_FILE;
-bmpid=EMbmFreestyleemailuiQgn_indi_mce_tb_audio;
+bmpid = EMbmFreestyleemailuiQgn_indi_mce_tb_audio;
-bmpmask=EMbmFreestyleemailuiQgn_indi_mce_tb_audio_mask;
+bmpmask = EMbmFreestyleemailuiQgn_indi_mce_tb_audio_mask;
+extension = r_cmail_button_state_ext_mce_tb_audio;
 }
 };
 };
 },
 /*TBAR_CTRL
 AVKON_BUTTON_STATE
 {
 txt = qtn_msg_insert_tb_note;
 helptxt = qtn_fse_msg_insert_tb_tooltip_note_att;
 bmpfile = EMAILUI_ICON_FILE;
-bmpid=EMbmFreestyleemailuiQgn_indi_tb_note;
+bmpid = EMbmFreestyleemailuiQgn_indi_tb_note;
-bmpmask=EMbmFreestyleemailuiQgn_indi_tb_note_mask;
+bmpmask = EMbmFreestyleemailuiQgn_indi_tb_note_mask;
+extension = r_cmail_button_state_ext_tb_note;
 }
 };
 };
 },
 #ifdef EMAIL_PRESENTATION_SUPPORT
 AVKON_BUTTON_STATE
 {
 txt = qtn_msg_insert_tb_other;
 helptxt = qtn_msg_insert_tb_tooltip_other;
 bmpfile = EMAILUI_ICON_FILE;
-bmpid=EMbmFreestyleemailuiQgn_indi_mce_tb_other;
+bmpid = EMbmFreestyleemailuiQgn_indi_mce_tb_other;
-bmpmask=EMbmFreestyleemailuiQgn_indi_mce_tb_other_mask;
+bmpmask = EMbmFreestyleemailuiQgn_indi_mce_tb_other_mask;
+extension = r_cmail_button_state_ext_mce_tb_other;
 }
 };
 };
 }
 }; // eof extension items
 }
 };
 }
 //------------------------------------------------------------------------------
+// Button state extensions for mail editor toolbar
+//------------------------------------------------------------------------------
+//
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_tb_msg_send
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbMsgSend;
+}
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_tb_high_priority
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbHighPriority;
+}
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_tb_high_priority_selected
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbHighPrioritySelected;
+}
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_tb_low_priority
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbLowPriority;
+}
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_tb_low_priority_selected
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbLowPrioritySelected;
+}
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_follow_up
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbFollowUp;
+}
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_tb_follow_up_selected
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbFollowUpSelected;
+}
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_tb_show_cc
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbShowCc;
+}
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_tb_hide_cc
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbHideCc;
+}
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_tb_show_bcc
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbShowBcc;
+}
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_tb_hide_bcc
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbHideBcc;
+}
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_tb_add_recipient
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbAddRecipient;
+}
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_mce_tb_image
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnIndiMceTbImage;
+}
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_mce_tb_video
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnIndiMceTbVideo;
+}
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_mce_tb_audio
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnIndiMceTbAudio;
+}
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_tb_note
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbNote;
+}
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_mce_tb_other
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnIndiMceTbOther;
+}
+//------------------------------------------------------------------------------
 // Folder list toolbar
 //------------------------------------------------------------------------------
 //
 RESOURCE AVKON_TOOLBAR r_freestyle_email_ui_toolbar_folder_list
 {
 flags = KAknToolbarFixed;
 items =
 {
-TBAR_CTRL
-{
-type = EAknCtButton;
-id = EFsEmailUiTbCmdSelect;
-control = AVKON_BUTTON
-{
-flags = KAknButtonSizeFitText;
-states =
-{
-AVKON_BUTTON_STATE
-{
-helptxt = qtn_ncs_softkey_select_text;
-bmpfile = EMAILUI_ICON_FILE;
-bmpid=EMbmFreestyleemailuiQgn_indi_tb_mark;
-bmpmask=EMbmFreestyleemailuiQgn_indi_tb_mark_mask;
-}
-};
-};
-},
 TBAR_CTRL
 {
 type = EAknCtButton;
 id = EFsEmailUiTbCmdExpandAll;
 control = AVKON_BUTTON
 {
 AVKON_BUTTON_STATE
 {
 helptxt = qtn_fse_message_list_options_expand_all;
 bmpfile = EMAILUI_ICON_FILE;
-bmpid=EMbmFreestyleemailuiQgn_indi_tb_expand_all;
+bmpid = EMbmFreestyleemailuiQgn_indi_tb_expand_all;
-bmpmask=EMbmFreestyleemailuiQgn_indi_tb_expand_all_mask;
+bmpmask = EMbmFreestyleemailuiQgn_indi_tb_expand_all_mask;
+extension = r_cmail_button_state_ext_tb_expand_all;
 }
 };
+};
+},
+TBAR_CTRL
+{
+type = EAknCtButton;
+control = AVKON_BUTTON
+{
+flags = KAknButtonPressedDownFrame;
 };
 },
 TBAR_CTRL
 {
 type = EAknCtButton;
 {
 AVKON_BUTTON_STATE
 {
 helptxt = qtn_fse_message_list_options_collapse_all;
 bmpfile = EMAILUI_ICON_FILE;
-bmpid=EMbmFreestyleemailuiQgn_indi_tb_collapse_all;
+bmpid = EMbmFreestyleemailuiQgn_indi_tb_collapse_all;
-bmpmask=EMbmFreestyleemailuiQgn_indi_tb_collapse_all_mask;
+bmpmask = EMbmFreestyleemailuiQgn_indi_tb_collapse_all_mask;
+extension = r_cmail_button_state_ext_tb_collapse_all;
 }
 };
 };
 }
 };
+}
+//------------------------------------------------------------------------------
+// Button state extensions for folder list toolbar
+//------------------------------------------------------------------------------
+//
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_tb_expand_all
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbExpandAll;
+}
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_tb_collapse_all
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbCollapseAll;
 }
 //------------------------------------------------------------------------------
 // Html message viewer toolbar with Reply all
 //------------------------------------------------------------------------------
 {
 helptxt = qtn_fse_tb_actions;
 bmpFile = EMAILUI_ICON_FILE;
 bmpId = EMbmFreestyleemailuiQgn_indi_tb_email_extend;
 bmpMask = EMbmFreestyleemailuiQgn_indi_tb_email_extend_mask;
+bmpSkinIdMajor = EAknsMajorGeneric;
+bmpSkinIdMinor = EAknsMinorGenericQgnIndiTbEmailExtend;
 items =
 {
 TBAR_CTRL
 {
 type = EAknCtButton;
 {
 AVKON_BUTTON_STATE
 {
 txt = qtn_fse_tb_ext_reply;
 bmpfile = EMAILUI_ICON_FILE;
-bmpid=EMbmFreestyleemailuiQgn_indi_tb_email_reply;
+bmpid = EMbmFreestyleemailuiQgn_indi_tb_email_reply;
-bmpmask=EMbmFreestyleemailuiQgn_indi_tb_email_reply_mask;
+bmpmask = EMbmFreestyleemailuiQgn_indi_tb_email_reply_mask;
-}
+extension = r_cmail_button_state_ext_tb_email_reply;
-};
+}
+};
 };
 },
 TBAR_CTRL
 {
 type = EAknCtButton;
 {
 AVKON_BUTTON_STATE
 {
 txt = qtn_fse_tb_ext_reply_all;
 bmpfile = EMAILUI_ICON_FILE;
-bmpid=EMbmFreestyleemailuiQgn_indi_tb_email_reply_all;
+bmpid = EMbmFreestyleemailuiQgn_indi_tb_email_reply_all;
-bmpmask=EMbmFreestyleemailuiQgn_indi_tb_email_reply_all_mask;
+bmpmask = EMbmFreestyleemailuiQgn_indi_tb_email_reply_all_mask;
-}
+extension = r_cmail_button_state_ext_tb_email_reply_all;
-};
+}
+};
 };
 }
 }; // eof extension items
 }; // eof AVKON_TOOLBAR_EXTENSION control
 },
 {
 AVKON_BUTTON_STATE
 {
 helptxt = qtn_fse_tb_forward;
 bmpfile = EMAILUI_ICON_FILE;
-bmpid=EMbmFreestyleemailuiQgn_indi_tb_email_forward;
+bmpid = EMbmFreestyleemailuiQgn_indi_tb_email_forward;
-bmpmask=EMbmFreestyleemailuiQgn_indi_tb_email_forward_mask;
+bmpmask = EMbmFreestyleemailuiQgn_indi_tb_email_forward_mask;
-}
+extension = r_cmail_button_state_ext_tb_email_forward;
-};
+}
+};
 };
 },
 TBAR_CTRL
 {
 type = EAknCtButton;
 {
 AVKON_BUTTON_STATE
 {
 helptxt = qtn_fse_tb_delete;
 bmpfile = EMAILUI_ICON_FILE;
-bmpid=EMbmFreestyleemailuiQgn_indi_tb_delete;
+bmpid = EMbmFreestyleemailuiQgn_indi_tb_delete;
-bmpmask=EMbmFreestyleemailuiQgn_indi_tb_delete_mask;
+bmpmask = EMbmFreestyleemailuiQgn_indi_tb_delete_mask;
-}
+extension = r_cmail_button_state_ext_tb_delete;
-};
+}
+};
 };
 }
 };
 }
 //------------------------------------------------------------------------------
 // Html message viewer toolbar without Reply all
 //------------------------------------------------------------------------------
 //
 {
 AVKON_BUTTON_STATE
 {
 helptxt = qtn_fse_tb_reply;
 bmpfile = EMAILUI_ICON_FILE;
-bmpid=EMbmFreestyleemailuiQgn_indi_tb_email_reply;
+bmpid = EMbmFreestyleemailuiQgn_indi_tb_email_reply;
-bmpmask=EMbmFreestyleemailuiQgn_indi_tb_email_reply_mask;
+bmpmask = EMbmFreestyleemailuiQgn_indi_tb_email_reply_mask;
-}
+extension = r_cmail_button_state_ext_tb_email_reply;
-};
+}
+};
 };
 },
 TBAR_CTRL
 {
 type = EAknCtButton;
 id = EFsEmailUiTbCmdForward;
 control = AVKON_BUTTON
 {
 AVKON_BUTTON_STATE
 {
 helptxt = qtn_fse_tb_forward;
 bmpfile = EMAILUI_ICON_FILE;
-bmpid=EMbmFreestyleemailuiQgn_indi_tb_email_forward;
+bmpid = EMbmFreestyleemailuiQgn_indi_tb_email_forward;
-bmpmask=EMbmFreestyleemailuiQgn_indi_tb_email_forward_mask;
+bmpmask = EMbmFreestyleemailuiQgn_indi_tb_email_forward_mask;
-}
+extension = r_cmail_button_state_ext_tb_email_forward;
-};
+}
+};
 };
 },
 TBAR_CTRL
 {
 type = EAknCtButton;
 {
 AVKON_BUTTON_STATE
 {
 helptxt = qtn_fse_tb_delete;
 bmpfile = EMAILUI_ICON_FILE;
-bmpid=EMbmFreestyleemailuiQgn_indi_tb_delete;
+bmpid = EMbmFreestyleemailuiQgn_indi_tb_delete;
-bmpmask=EMbmFreestyleemailuiQgn_indi_tb_delete_mask;
+bmpmask = EMbmFreestyleemailuiQgn_indi_tb_delete_mask;
-}
+extension = r_cmail_button_state_ext_tb_delete;
-};
+}
+};
 };
 }
 };
+}
+//------------------------------------------------------------------------------
+// Button state extensions for HTML message viewer toolbar
+//------------------------------------------------------------------------------
+//
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_tb_email_reply
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbEmailReply;
+}
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_tb_email_reply_all
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbEmailReplyAll;
+}
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_tb_email_forward
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbEmailForward;
+}
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_tb_delete
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbDelete;
 }
 //------------------------------------------------------------------------------
 // Attachment list toolbar
 //------------------------------------------------------------------------------
 {
 AVKON_BUTTON_STATE
 {
 helptxt = qtn_fse_tb_attachment_list_download_all;
 bmpfile = EMAILUI_ICON_FILE;
-bmpid=EMbmFreestyleemailuiQgn_prop_cmail_action_attachment_download_all;
+bmpid = EMbmFreestyleemailuiQgn_prop_cmail_action_attachment_download_all;
-bmpmask=EMbmFreestyleemailuiQgn_prop_cmail_action_attachment_download_all_mask;
+bmpmask = EMbmFreestyleemailuiQgn_prop_cmail_action_attachment_download_all_mask;
-}
+extension = r_cmail_button_state_ext_attachment_download_all;
-};
+}
+};
 };
 },
 TBAR_CTRL
 {
 type = EAknCtButton;
 {
 AVKON_BUTTON_STATE
 {
 helptxt = qtn_fse_tb_attachment_list_cancel_download;
 bmpfile = EMAILUI_ICON_FILE;
-bmpid=EMbmFreestyleemailuiQgn_prop_cmail_action_attachment_cancel_download;
+bmpid = EMbmFreestyleemailuiQgn_prop_cmail_action_attachment_cancel_download;
-bmpmask=EMbmFreestyleemailuiQgn_prop_cmail_action_attachment_cancel_download_mask;
+bmpmask = EMbmFreestyleemailuiQgn_prop_cmail_action_attachment_cancel_download_mask;
-}
+extension = r_cmail_button_state_ext_attachment_cancel_download;
-};
+}
+};
 };
 },
 TBAR_CTRL
 {
 type = EAknCtButton;
 id = EFsEmailUiTbCmdSaveAll;
 control = AVKON_BUTTON
 {
 {
 AVKON_BUTTON_STATE
 {
 helptxt = qtn_fse_tb_attachment_list_save_all;
 bmpfile = EMAILUI_ICON_FILE;
-bmpid=EMbmFreestyleemailuiQgn_prop_cmail_action_attachment_save_all;
+bmpid = EMbmFreestyleemailuiQgn_prop_cmail_action_attachment_save_all;
-bmpmask=EMbmFreestyleemailuiQgn_prop_cmail_action_attachment_save_all_mask;
+bmpmask = EMbmFreestyleemailuiQgn_prop_cmail_action_attachment_save_all_mask;
-}
+extension = r_cmail_button_state_ext_attachment_save_all;
-};
+}
+};
 };
 }
 };
 }
+//------------------------------------------------------------------------------
+// Button state extensions for message list toolbar
+//------------------------------------------------------------------------------
+//
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_attachment_download_all
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnPropCmailActionAttachmentDownloadAll;
+}
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_attachment_cancel_download
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnPropCmailActionAttachmentCancelDownload;
+}
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_cmail_button_state_ext_attachment_save_all
+{
+bmbSkinIdMajor = EAknsMajorGeneric;
+bmbSkinIdMinor = EAknsMinorGenericQgnPropCmailActionAttachmentSaveAll;
+}
+//------------------------------------------------------------------------------
+// Localisable registration information
+//------------------------------------------------------------------------------
+//
 RESOURCE LOCALISABLE_APP_INFO r_freestyle_email_ui_loc_app_info
 {
 short_caption = qtn_fse_short_app_name;
 caption_and_icon =
 {
 // wait note texts
 RESOURCE TBUF r_fse_wait_opening_text   { buf=qtn_gen_note_opening; }
 RESOURCE TBUF r_fse_wait_fetching_text          { buf=qtn_gen_note_fetching; }
 RESOURCE TBUF r_fse_wait_removing_text          { buf=qtn_gen_note_removing; }
+RESOURCE TBUF r_fse_wait_inserting_text         { buf=qtn_gen_note_inserting;}
 RESOURCE TBUF r_fse_wait_deleting_text          { buf=qtn_fse_wait_note_deleting; }
 RESOURCE TBUF r_fse_wait_cancelling_sync_text   { buf=qtn_fse_wait_note_canceling_synch; }
 RESOURCE TBUF r_fse_wait_sorting_text           { buf=qtn_fse_wait_note_sorting; }
 // generic wait dialogs
 {
 listtype = EAknCtSinglePopupMenuListBox;
 listbox = AVKON_LIST_QUERY_LIST
 {
 };
-heading = qtn_fse_editor_close_message_query_prompt;
 };
 }
 };
 }
 RESOURCE TBUF r_ncs_quick_text_title_text { buf=qtn_fse_editor_options_insert_template; }
 RESOURCE TBUF r_ncs_flag_follow_up { buf=qtn_fse_editor_list_flag_follow_up; }
 RESOURCE TBUF r_ncs_flag_clear { buf=qtn_fse_editor_list_flag_clear; }
 RESOURCE TBUF r_ncs_draft_save { buf=qtn_fse_editor_close_message_quey_save_to_drafts; }
 RESOURCE TBUF r_ncs_draft_delete { buf=qtn_fse_editor_close_message_query_delete_message; }
+RESOURCE TBUF r_ncs_draft_discard { buf=qtn_fse_editor_close_message_query_discard_message; }
 RESOURCE TBUF r_fse_editor_address_list_remote_lookup_search { buf=qtn_fse_editor_address_list_remote_lookup_search; }
 RESOURCE TBUF r_fse_editor_confirm_attachment_download { buf=qtn_fse_editor_confirm_attachment_download; }
 RESOURCE TBUF r_fse_editor_smart_tag { buf=qtn_fse_editor_smart_tag; }
 RESOURCE TBUF r_fse_editor_local_attachments { buf=qtn_fse_editor_local_attachments; }
 RESOURCE TBUF r_fse_editor_remote_attachments { buf=qtn_fse_editor_remote_attachments; }

branch	RCL_3
changeset 17	8592a65ad3fb
parent 16	4ce476e64c59
child 24	b5fbb9b25d57