This is a manual merge of branch drop split view intro trunk.

[modest] / src / hildon2 / modest-icon-names.h

diff --git a/src/hildon2/modest-icon-names.h b/src/hildon2/modest-icon-names.h
index 5ab97e1..e0b33af 100644 (file)
--- a/src/hildon2/modest-icon-names.h
+++ b/src/hildon2/modest-icon-names.h
@@ -36,16 +36,16 @@
 
 /* icons */
 
-#define MODEST_APP_ICON                                "qgn_list_messagin"
-#define MODEST_APP_MSG_VIEW_ICON               "qgn_list_messagin_viewer"
-#define MODEST_APP_MSG_EDIT_ICON               "qgn_list_messagin_editor"
+#define MODEST_APP_ICON                                "general_email"
+#define MODEST_APP_MSG_VIEW_ICON               "email_message_viewer"
+#define MODEST_APP_MSG_EDIT_ICON               "email_message_editor"
 
-#define MODEST_HEADER_ICON_READ                        "qgn_list_messagin_mail"
+#define MODEST_HEADER_ICON_READ                        ""
 #define MODEST_HEADER_ICON_UNREAD              ""
-#define MODEST_HEADER_ICON_DELETED             "qgn_list_messagin_mail_deleted"
-#define MODEST_HEADER_ICON_ATTACH              "qgn_list_gene_attacpap"
-#define MODEST_HEADER_ICON_HIGH                        "qgn_list_messaging_high"
-#define MODEST_HEADER_ICON_LOW                 "qgn_list_messaging_low"
+#define MODEST_HEADER_ICON_DELETED             ""
+#define MODEST_HEADER_ICON_ATTACH              "email_attachment"
+#define MODEST_HEADER_ICON_HIGH                        "email_message_high_priority"
+#define MODEST_HEADER_ICON_LOW                 "email_message_low_priority"
 
 /*
  * until we have the custom cell renderer, we use the hacked icons below;
@@ -64,36 +64,36 @@
 #define MODEST_FOLDER_ICON_OPEN                        "qgn_list_gene_fldr_opn"
 #define MODEST_FOLDER_ICON_CLOSED              "qgn_list_gene_fldr_cls"
 
-#define MODEST_FOLDER_ICON_ACCOUNT             "qgn_list_browser"
-#define MODEST_FOLDER_ICON_INBOX               "qgn_list_messagin_inbox"
-#define MODEST_FOLDER_ICON_OUTBOX              "qgn_list_messagin_outbox"
-#define MODEST_FOLDER_ICON_SENT                        "qgn_list_messagin_sent"
-#define MODEST_FOLDER_ICON_TRASH               "qgn_toolb_gene_deletebutton"
-#define MODEST_FOLDER_ICON_JUNK                        "qgn_toolb_gene_deletebutton"
-#define MODEST_FOLDER_ICON_DRAFTS              "qgn_list_messagin_drafts"
-#define MODEST_FOLDER_ICON_NORMAL              "qgn_list_gene_fldr_cls"
-#define MODEST_FOLDER_ICON_LOCAL_FOLDERS       "qgn_list_shell_mydevice"
-#define MODEST_FOLDER_ICON_MMC                  "qgn_list_gene_mmc"
+#define MODEST_FOLDER_ICON_ACCOUNT             "general_web"
+#define MODEST_FOLDER_ICON_INBOX               "general_received"
+#define MODEST_FOLDER_ICON_OUTBOX              "general_outbox"
+#define MODEST_FOLDER_ICON_SENT                        "general_sent"
+#define MODEST_FOLDER_ICON_TRASH               "general_folder"
+#define MODEST_FOLDER_ICON_JUNK                        "general_folder"
+#define MODEST_FOLDER_ICON_DRAFTS              "email_message_drafts"
+#define MODEST_FOLDER_ICON_NORMAL              "general_folder"
+#define MODEST_FOLDER_ICON_LOCAL_FOLDERS       "general_device_root_folder"
+#define MODEST_FOLDER_ICON_MMC                  "general_removable_memory_card"
 
 
 /* toolbar */
-#define  MODEST_TOOLBAR_ICON_MAIL_SEND         "qgn_toolb_messagin_send"
-#define  MODEST_TOOLBAR_ICON_NEW_MAIL          "qgn_list_messagin_editor"
-#define  MODEST_TOOLBAR_ICON_SEND_RECEIVE      "qgn_toolb_messagin_sendreceive"
-#define  MODEST_TOOLBAR_ICON_REPLY             "qgn_toolb_messagin_reply"
-#define  MODEST_TOOLBAR_ICON_REPLY_ALL         "qgn_toolb_messagin_replytoall"
-#define  MODEST_TOOLBAR_ICON_FORWARD           "qgn_toolb_messagin_forward"
-#define  MODEST_TOOLBAR_ICON_DELETE            "qgn_toolb_gene_deletebutton"
-#define  MODEST_TOOLBAR_ICON_FORMAT_BULLETS     "qgn_list_gene_bullets"
-#define  MODEST_TOOLBAR_ICON_SPLIT_VIEW         "qgn_toolb_rss_fldonoff"
-#define  MODEST_TOOLBAR_ICON_SORT               "qgn_list_sort"
-#define  MODEST_TOOLBAR_ICON_REFRESH            "qgn_toolb_gene_refresh"
-#define  MODEST_TOOLBAR_ICON_MOVE_TO_FOLDER     "qgn_toolb_gene_movetofldr"
-#define  MODEST_TOOLBAR_ICON_BOLD               "qgn_list_gene_bold"
-#define  MODEST_TOOLBAR_ICON_ITALIC             "qgn_list_gene_italic"
-#define  MODEST_TOOLBAR_ICON_NEXT               "qgn_toolb_gene_forward"
-#define  MODEST_TOOLBAR_ICON_PREV               "qgn_toolb_gene_back"
-#define  MODEST_TOOLBAR_ICON_FIND               "qgn_toolb_gene_find"
+#define  MODEST_TOOLBAR_ICON_MAIL_SEND         "email_message_send"
+#define  MODEST_TOOLBAR_ICON_NEW_MAIL          "email_message_editor"
+#define  MODEST_TOOLBAR_ICON_SEND_RECEIVE      "general_refresh"
+#define  MODEST_TOOLBAR_ICON_REPLY             "email_message_reply"
+#define  MODEST_TOOLBAR_ICON_REPLY_ALL         ""
+#define  MODEST_TOOLBAR_ICON_FORWARD           ""
+#define  MODEST_TOOLBAR_ICON_DELETE            "general_delete"
+#define  MODEST_TOOLBAR_ICON_FORMAT_BULLETS     ""
+#define  MODEST_TOOLBAR_ICON_SPLIT_VIEW         "general_foldertree"
+#define  MODEST_TOOLBAR_ICON_SORT               "general_sort"
+#define  MODEST_TOOLBAR_ICON_REFRESH            "general_refresh"
+#define  MODEST_TOOLBAR_ICON_MOVE_TO_FOLDER     "general_move_to_folder"
+#define  MODEST_TOOLBAR_ICON_BOLD               "general_bold"
+#define  MODEST_TOOLBAR_ICON_ITALIC             "general_italic"
+#define  MODEST_TOOLBAR_ICON_NEXT               "general_forward"
+#define  MODEST_TOOLBAR_ICON_PREV               "general_back"
+#define  MODEST_TOOLBAR_ICON_FIND               "general_search"
 
 /* Stock icon names */
 #define  MODEST_STOCK_MAIL_SEND    "modest-stock-mail-send"