From: Sergio Villar Senin Date: Wed, 21 Feb 2007 09:46:39 +0000 (+0000) Subject: Platform icon changes X-Git-Tag: git_migration_finished~4038 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=f09035e1dad15d43d7d6135db599813e40693384 Platform icon changes pmo-trunk-r843 --- diff --git a/src/gtk/modest-icon-names.h b/src/gtk/modest-icon-names.h index 0ec18d8..4b9c47d 100644 --- a/src/gtk/modest-icon-names.h +++ b/src/gtk/modest-icon-names.h @@ -66,14 +66,14 @@ /* toolbar */ #define MODEST_TOOLBAR_ICON_MAIL_SEND PIXMAP_PREFIX "qgn_list_messagin_sent.png" -#define MODEST_TOOLBAR_ICON_NEW_MAIL PIXMAP_PREFIX "qgn_list_messagin_editor.png" -#define MODEST_TOOLBAR_ICON_SEND_RECEIVE PIXMAP_PREFIX "gtk-refresh.png" +#define MODEST_TOOLBAR_ICON_NEW_MAIL PIXMAP_PREFIX "mail-message-new.png" +/* #define MODEST_TOOLBAR_ICON_SEND_RECEIVE PIXMAP_PREFIX "gtk-refresh.png" */ #define MODEST_TOOLBAR_ICON_REPLY PIXMAP_PREFIX "mail-reply-sender.png" #define MODEST_TOOLBAR_ICON_REPLY_ALL PIXMAP_PREFIX "mail-reply-all.png" #define MODEST_TOOLBAR_ICON_FORWARD PIXMAP_PREFIX "mail-forward.png" -#define MODEST_TOOLBAR_ICON_DELETE PIXMAP_PREFIX "mail-mark-junk.png" -#define MODEST_TOOLBAR_ICON_NEXT PIXMAP_PREFIX "forward.png" -#define MODEST_TOOLBAR_ICON_PREV PIXMAP_PREFIX "back.png" +/* #define MODEST_TOOLBAR_ICON_DELETE PIXMAP_PREFIX "mail-mark-junk.png" */ +/* #define MODEST_TOOLBAR_ICON_NEXT PIXMAP_PREFIX "forward.png" */ +/* #define MODEST_TOOLBAR_ICON_PREV PIXMAP_PREFIX "back.png" */ #define MODEST_TOOLBAR_ICON_STOP PIXMAP_PREFIX "stock-stop.png" /* Stock icon names */ diff --git a/src/gtk/modest-main-window-ui.h b/src/gtk/modest-main-window-ui.h index 83b16a4..b62b390 100644 --- a/src/gtk/modest-main-window-ui.h +++ b/src/gtk/modest-main-window-ui.h @@ -48,7 +48,7 @@ static const GtkActionEntry modest_action_entries [] = { { "Help", NULL, N_("_Help") }, /* FILE */ - { "FileNew", GTK_STOCK_NEW, N_("_New"), "N", N_("Compose new message"), G_CALLBACK (modest_ui_actions_on_new_msg) }, + { "FileNew", MODEST_STOCK_NEW_MAIL, N_("_New"), "N", N_("Compose new message"), G_CALLBACK (modest_ui_actions_on_new_msg) }, { "FileOpen", GTK_STOCK_OPEN, N_("_Open"), "O", N_("Open a message"), NULL }, { "FileSave", GTK_STOCK_SAVE, N_("_Save"), "S", N_("Save a message"), NULL }, { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("Save _As"), NULL, N_("Save a message as"), NULL }, @@ -67,7 +67,7 @@ static const GtkActionEntry modest_action_entries [] = { /* VIEW */ { "ToggleView", GTK_STOCK_CDROM, N_("_Toggle view"), NULL, N_("Toggle the list view"), G_CALLBACK(modest_ui_actions_toggle_view) }, /* ACTIONS */ - { "ActionsNew", GTK_STOCK_NEW, N_("_New Message"), NULL, N_("Compose a new message"), G_CALLBACK (modest_ui_actions_on_new_msg) }, + { "ActionsNew", MODEST_STOCK_NEW_MAIL, N_("_New Message"), NULL, N_("Compose a new message"), G_CALLBACK (modest_ui_actions_on_new_msg) }, { "ActionsReply", MODEST_STOCK_REPLY, N_("_Reply"), NULL, N_("Reply to a message"), G_CALLBACK (modest_ui_actions_on_reply) }, { "ActionsReplyAll", MODEST_STOCK_REPLY_ALL, N_("Reply to all"), NULL, N_("Reply to all"), G_CALLBACK (modest_ui_actions_on_reply_all) }, { "ActionsForward", MODEST_STOCK_FORWARD, N_("_Forward"), NULL, N_("Forward a message"), G_CALLBACK (modest_ui_actions_on_forward) }, diff --git a/src/gtk/pixmaps/back.png b/src/gtk/pixmaps/back.png deleted file mode 100644 index d699776..0000000 Binary files a/src/gtk/pixmaps/back.png and /dev/null differ diff --git a/src/gtk/pixmaps/forward.png b/src/gtk/pixmaps/forward.png deleted file mode 100644 index 3c28925..0000000 Binary files a/src/gtk/pixmaps/forward.png and /dev/null differ diff --git a/src/gtk/pixmaps/go-next.png b/src/gtk/pixmaps/go-next.png deleted file mode 100644 index 3c28925..0000000 Binary files a/src/gtk/pixmaps/go-next.png and /dev/null differ diff --git a/src/gtk/pixmaps/go-previous.png b/src/gtk/pixmaps/go-previous.png deleted file mode 100644 index d699776..0000000 Binary files a/src/gtk/pixmaps/go-previous.png and /dev/null differ diff --git a/src/gtk/pixmaps/gtk-refresh.png b/src/gtk/pixmaps/gtk-refresh.png deleted file mode 100644 index 7dcfb51..0000000 Binary files a/src/gtk/pixmaps/gtk-refresh.png and /dev/null differ diff --git a/src/gtk/pixmaps/view-refresh.png b/src/gtk/pixmaps/view-refresh.png deleted file mode 100644 index 42d0872..0000000 Binary files a/src/gtk/pixmaps/view-refresh.png and /dev/null differ diff --git a/src/modest-runtime.c b/src/modest-runtime.c index f4036ce..7663de3 100644 --- a/src/modest-runtime.c +++ b/src/modest-runtime.c @@ -571,8 +571,8 @@ init_stock_icons (void) static gchar *items_names [] = { MODEST_TOOLBAR_ICON_MAIL_SEND, -/* MODEST_TOOLBAR_ICON_NEW_MAIL, */ - MODEST_TOOLBAR_ICON_SEND_RECEIVE, + MODEST_TOOLBAR_ICON_NEW_MAIL, +/* MODEST_TOOLBAR_ICON_SEND_RECEIVE, */ MODEST_TOOLBAR_ICON_REPLY, MODEST_TOOLBAR_ICON_REPLY_ALL, MODEST_TOOLBAR_ICON_FORWARD, diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index a057685..273ef8b 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -405,11 +405,11 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, TnyDevice *device) tny_session_camel_set_ui_locker (priv->session, tny_gtk_lockable_new ()); /* FIXME: unref this in the end? */ - /* force a cache fill... ugly */ - list = TNY_LIST(tny_simple_list_new()); - tny_account_store_get_accounts (TNY_ACCOUNT_STORE(obj), list, - TNY_ACCOUNT_STORE_BOTH); - g_object_unref(list); +/* /\* force a cache fill... ugly *\/ */ +/* list = TNY_LIST(tny_simple_list_new()); */ +/* tny_account_store_get_accounts (TNY_ACCOUNT_STORE(obj), list, */ +/* TNY_ACCOUNT_STORE_BOTH); */ +/* g_object_unref(list); */ /* Connect signals */ g_signal_connect (G_OBJECT(account_mgr), "account_changed",