* Moved hildon2 icon names to the new names in specs.

pmo-trunk-r6256

diff --git a/src/hildon2/modest-icon-names.h b/src/hildon2/modest-icon-names.h
index 5ab97e1..a792f01 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_ICON                                "general_mail_64"
 #define MODEST_APP_MSG_VIEW_ICON               "qgn_list_messagin_viewer"
-#define MODEST_APP_MSG_EDIT_ICON               "qgn_list_messagin_editor"
+#define MODEST_APP_MSG_EDIT_ICON               "email_message_editor_48"
 
-#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_16"
+#define MODEST_HEADER_ICON_HIGH                        "email_message_high_priority_16"
+#define MODEST_HEADER_ICON_LOW                 "email_message_low_priority_16"
 
 /*
  * 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_64"
+#define MODEST_FOLDER_ICON_INBOX               "general_received_48"
+#define MODEST_FOLDER_ICON_OUTBOX              "general_sent_48"
+#define MODEST_FOLDER_ICON_SENT                        "email_message_sent_48"
+#define MODEST_FOLDER_ICON_TRASH               "general_folder_48"
+#define MODEST_FOLDER_ICON_JUNK                        "general_folder_48"
+#define MODEST_FOLDER_ICON_DRAFTS              "email_message_drafts_48"
+#define MODEST_FOLDER_ICON_NORMAL              "general_folder_48"
+#define MODEST_FOLDER_ICON_LOCAL_FOLDERS       "general_device_root_folder_48"
+#define MODEST_FOLDER_ICON_MMC                  "general_removable_memory_card_48"
 
 
 /* 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_48"
+#define  MODEST_TOOLBAR_ICON_NEW_MAIL          "email_message_editor_48"
+#define  MODEST_TOOLBAR_ICON_SEND_RECEIVE      "general_refresh_48"
+#define  MODEST_TOOLBAR_ICON_REPLY             "email_message_reply_48"
+#define  MODEST_TOOLBAR_ICON_REPLY_ALL         ""
+#define  MODEST_TOOLBAR_ICON_FORWARD           ""
+#define  MODEST_TOOLBAR_ICON_DELETE            "general_delete_48"
+#define  MODEST_TOOLBAR_ICON_FORMAT_BULLETS     ""
+#define  MODEST_TOOLBAR_ICON_SPLIT_VIEW         "general_foldertree_48"
+#define  MODEST_TOOLBAR_ICON_SORT               "general_sort_48"
+#define  MODEST_TOOLBAR_ICON_REFRESH            "general_refresh_48"
+#define  MODEST_TOOLBAR_ICON_MOVE_TO_FOLDER     "filemanager_move_to_folder_48"
+#define  MODEST_TOOLBAR_ICON_BOLD               "general_bold_48"
+#define  MODEST_TOOLBAR_ICON_ITALIC             "general_italic_48"
+#define  MODEST_TOOLBAR_ICON_NEXT               "general_forward_48"
+#define  MODEST_TOOLBAR_ICON_PREV               "general_back_48"
+#define  MODEST_TOOLBAR_ICON_FIND               "general_search_48"
 
 /* Stock icon names */
 #define  MODEST_STOCK_MAIL_SEND    "modest-stock-mail-send"

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index 6ea289d..9efc9c9 100644 (file)
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -2776,13 +2776,13 @@ modest_msg_edit_window_set_priority_flags (ModestMsgEditWindow *window,
 
                switch (priority_flags) {
                case TNY_HEADER_FLAG_HIGH_PRIORITY:
-                       gtk_image_set_from_icon_name (GTK_IMAGE (priv->priority_icon), "qgn_list_messaging_high", GTK_ICON_SIZE_MENU);
+                       gtk_image_set_from_icon_name (GTK_IMAGE (priv->priority_icon), MODEST_HEADER_ICON_HIGH, GTK_ICON_SIZE_MENU);
                        gtk_widget_show (priv->priority_icon);
                        priority_action = gtk_ui_manager_get_action (parent_priv->ui_manager, 
                                                                     "/MenuBar/ToolsMenu/MessagePriorityMenu/MessagePriorityHighMenu");
                        break;
                case TNY_HEADER_FLAG_LOW_PRIORITY:
-                       gtk_image_set_from_icon_name (GTK_IMAGE (priv->priority_icon), "qgn_list_messaging_low", GTK_ICON_SIZE_MENU);
+                       gtk_image_set_from_icon_name (GTK_IMAGE (priv->priority_icon), "MODEST_HEADER_ICON_LOW", GTK_ICON_SIZE_MENU);
                        gtk_widget_show (priv->priority_icon);
                        priority_action = gtk_ui_manager_get_action (parent_priv->ui_manager, 
                                                                     "/MenuBar/ToolsMenu/MessagePriorityMenu/MessagePriorityLowMenu");

diff --git a/src/widgets/modest-attachment-view.c b/src/widgets/modest-attachment-view.c
index 7c7cae4..bcdadf2 100644 (file)
--- a/src/widgets/modest-attachment-view.c
+++ b/src/widgets/modest-attachment-view.c
@@ -66,7 +66,11 @@ struct _ModestAttachmentViewPrivate
 
 };
 
+#ifdef MODEST_TOOLKIT_HILDON2
+#define UNKNOWN_FILE_ICON "filemanager_unknown_file_48"
+#else
 #define UNKNOWN_FILE_ICON "qgn_list_gene_unknown_file"
+#endif
 
 #define MODEST_ATTACHMENT_VIEW_GET_PRIVATE(o)  \
        (G_TYPE_INSTANCE_GET_PRIVATE ((o), MODEST_TYPE_ATTACHMENT_VIEW, ModestAttachmentViewPrivate))

diff --git a/src/widgets/modest-recpt-editor.c b/src/widgets/modest-recpt-editor.c
index 4ef9fc9..c145a19 100644 (file)
--- a/src/widgets/modest-recpt-editor.c
+++ b/src/widgets/modest-recpt-editor.c
@@ -336,7 +336,11 @@ modest_recpt_editor_instance_init (GTypeInstance *instance, gpointer g_class)
        gtk_button_set_focus_on_click (GTK_BUTTON (priv->abook_button), FALSE);
        GTK_WIDGET_UNSET_FLAGS (priv->abook_button, GTK_CAN_FOCUS);
        gtk_button_set_alignment (GTK_BUTTON (priv->abook_button), 1.0, 1.0);
+#ifdef MODEST_TOOLKIT_HILDON2
+       abook_icon = gtk_image_new_from_icon_name ("tasklaunch_contact_64", GTK_ICON_SIZE_BUTTON);
+#else
        abook_icon = gtk_image_new_from_icon_name ("qgn_list_addressbook", GTK_ICON_SIZE_BUTTON);
+#endif
        gtk_container_add (GTK_CONTAINER (priv->abook_button), abook_icon);
 
        priv->text_view = gtk_text_view_new ();