* src/modest-defs.h:

        * Change the default icon size for gnome platform.
* src/gnome/modest-platform.c:
        * Use icon theme factory lookup to fetch icons.
        * Use the new sort dialog framework.
* src/gnome/modest-icon-names.h:
        * Use gnome icon theme icons for most of icons that should be
          available, and avoid using non-theme modest custom icons if
          not needed.
* src/gnome/Makefile.am:
	* Add new gnome sort dialog.
* src/gnome/ui/modest-main-window-ui.xml:
        * Remove old options menu.
* src/widgets/modest-header-view.c:
        * Better header view row sizes in gnome (more compact).
* src/modest-ui-actions.c:
        * Make gnome move-to dialog be HIG compliant.
* src/modest-utils.c:
        * Don't crash if we request the sort dialog and it's not
          implemented.

pmo-trunk-r4707

diff --git a/src/gnome/Makefile.am b/src/gnome/Makefile.am
index d4f1651..fe15b23 100644 (file)
--- a/src/gnome/Makefile.am
+++ b/src/gnome/Makefile.am
@@ -31,6 +31,8 @@ libmodest_ui_la_SOURCES=              \
        modest-icon-names.h           \
        modest-gnome-global-settings-dialog.c \
        modest-gnome-global-settings-dialog.h \
+       modest-gnome-sort-dialog.c \
+       modest-gnome-sort-dialog.h \
        modest-main-window.c          \
        modest-main-window-ui.h       \
        modest-msg-view-window.c      \

diff --git a/src/gnome/modest-icon-names.h b/src/gnome/modest-icon-names.h
index 6742f16..fc3530e 100644 (file)
--- a/src/gnome/modest-icon-names.h
+++ b/src/gnome/modest-icon-names.h
@@ -46,7 +46,8 @@
 #define MODEST_HEADER_ICON_READ                        PIXMAP_PREFIX "qgn_list_messagin_mail.png"
 #define MODEST_HEADER_ICON_UNREAD              PIXMAP_PREFIX "qgn_list_messagin_mail_unread.png"
 #define MODEST_HEADER_ICON_DELETED             PIXMAP_PREFIX "qgn_list_messagin_mail_deleted.png"
-#define MODEST_HEADER_ICON_ATTACH              PIXMAP_PREFIX "qgn_list_gene_attacpap.png"
+/* #define MODEST_HEADER_ICON_ATTACH           PIXMAP_PREFIX "qgn_list_gene_attacpap.png" */
+#define MODEST_HEADER_ICON_ATTACH              "stock_attach"
 
 
 /*
@@ -59,25 +60,26 @@
 #define MODEST_HEADER_ICON_HIGH_PRIORITY        PIXMAP_PREFIX"modest_high_no_attachment.png"
 #define MODEST_HEADER_ICON_LOW_PRIORITY         PIXMAP_PREFIX"modest_low_no_attachment.png"
 #define MODEST_HEADER_ICON_NORM_PRIORITY        PIXMAP_PREFIX"modest_normal_no_attachment.png"
-#define MODEST_HEADER_ICON_HIGH        PIXMAP_PREFIX"modest_high_no_attachment.png"
-#define MODEST_HEADER_ICON_LOW         PIXMAP_PREFIX"modest_low_no_attachment.png"
+#define MODEST_HEADER_ICON_HIGH        "stock_mail-priority-high"
+#define MODEST_HEADER_ICON_LOW         "stock_mail-priority-low"
 /*
  *
  */
 
-#define MODEST_FOLDER_ICON_OPEN                        PIXMAP_PREFIX "qgn_list_gene_fldr_opn.png"
-#define MODEST_FOLDER_ICON_CLOSED              PIXMAP_PREFIX "qgn_list_gene_fldr_cls.png"
+#define MODEST_FOLDER_ICON_OPEN                        "folder_open"
+#define MODEST_FOLDER_ICON_CLOSED              "folder"
 
-#define MODEST_FOLDER_ICON_ACCOUNT             PIXMAP_PREFIX "qgn_addr_icon_user_group.png"
-#define MODEST_FOLDER_ICON_INBOX               PIXMAP_PREFIX "qgn_list_messagin_inbox.png"
-#define MODEST_FOLDER_ICON_OUTBOX              PIXMAP_PREFIX "qgn_list_messagin_outbox.png"
-#define MODEST_FOLDER_ICON_SENT                        PIXMAP_PREFIX "qgn_list_messagin_sent.png"
-#define MODEST_FOLDER_ICON_TRASH               PIXMAP_PREFIX "qgn_list_messagin_mail_deleted.png"
-#define MODEST_FOLDER_ICON_JUNK                        PIXMAP_PREFIX "qgn_list_messagin_mail_deleted.png"
-#define MODEST_FOLDER_ICON_DRAFTS              PIXMAP_PREFIX "qgn_list_messagin_drafts.png"
-#define MODEST_FOLDER_ICON_NORMAL              PIXMAP_PREFIX "qgn_list_gene_fldr_cls.png"
-#define MODEST_FOLDER_ICON_LOCAL_FOLDERS       PIXMAP_PREFIX "qgn_list_gene_fldr_cls.png"
-#define MODEST_FOLDER_ICON_MMC                  PIXMAP_PREFIX "qgn_list_gene_mmc.png"
+#define MODEST_FOLDER_ICON_ACCOUNT             "network-server"
+#define MODEST_FOLDER_ICON_INBOX               "stock_inbox"
+#define MODEST_FOLDER_ICON_OUTBOX              "stock_outbox"
+#define MODEST_FOLDER_ICON_SENT                        "stock_sent-mail"
+#define MODEST_FOLDER_ICON_TRASH               "user-trash"
+#define MODEST_FOLDER_ICON_JUNK                        "stock_spam"
+#define MODEST_FOLDER_ICON_DRAFTS              "stock_new-text"
+#define MODEST_FOLDER_ICON_NORMAL              "folder"
+/* #define MODEST_FOLDER_ICON_LOCAL_FOLDERS    PIXMAP_PREFIX "qgn_list_gene_fldr_cls.png" */
+#define MODEST_FOLDER_ICON_LOCAL_FOLDERS       "computer"
+#define MODEST_FOLDER_ICON_MMC                  "media-flash"
 
 
 /* toolbar */
@@ -87,7 +89,7 @@
 #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_DELETE            GTK_STOCK_DELETE
 /* #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"

diff --git a/src/gnome/modest-platform.c b/src/gnome/modest-platform.c
index d7b4b8c..3d77dcb 100644 (file)
--- a/src/gnome/modest-platform.c
+++ b/src/gnome/modest-platform.c
@@ -40,6 +40,7 @@
 #include "gnome/modest-gnome-global-settings-dialog.h"
 #include "widgets/modest-account-settings-dialog.h"
 #include "gnome/modest-account-assistant.h"
+#include "gnome/modest-gnome-sort-dialog.h"
 
 gboolean
 modest_platform_init (int argc, char *argv[])
@@ -128,6 +129,12 @@ modest_platform_get_icon (const gchar *name, guint icon_size)
 /*             g_printerr ("modest: error while loading icon '%s': %s\n", */
 /*                         name, err->message); */
                g_error_free (err);
+               err = NULL;
+
+               pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), name, icon_size, 0, &err);
+               if (!pixbuf) {
+                       g_error_free (err);
+               }
        }
        
        return pixbuf;
@@ -311,11 +318,10 @@ gboolean modest_platform_set_update_interval (guint minutes)
        return FALSE;
 }
 
-void
-modest_platform_run_sort_dialog (GtkWindow *parent_window,
-                                ModestSortDialogType type)
+GtkWidget *
+modest_platform_create_sort_dialog (GtkWindow *parent_window)
 {
-       /* TODO */
+       return modest_gnome_sort_dialog_new (parent_window);
 }
 
 GtkWidget *

diff --git a/src/gnome/ui/modest-main-window-ui.xml b/src/gnome/ui/modest-main-window-ui.xml
index 234430d..817caba 100644 (file)
--- a/src/gnome/ui/modest-main-window-ui.xml
+++ b/src/gnome/ui/modest-main-window-ui.xml
@@ -90,15 +90,6 @@
     </menu>
 
 
-    <menu name="OptionsMenu" action="Options">
-      <menuitem name="OptionsAddToContactsMenu" action="OptionsAddToContacts"/>
-      <menuitem name="OptionsAccountsMenu" action="OptionsAccounts"/>
-      <separator/>
-      <menuitem name="OptionsContactsMenu" action="OptionsContacts"/>
-      <separator/>
-      <menuitem name="OptionsSettingsMenu" action="OptionsSettings"/>
-    </menu>
-
     <menu name="HelpMenu" action="Help">
       <menuitem name="HelpAboutMenu" action="HelpAbout"/>
     </menu>

diff --git a/src/modest-defs.h b/src/modest-defs.h
index e514775..69154cd 100644 (file)
--- a/src/modest-defs.h
+++ b/src/modest-defs.h
@@ -78,8 +78,13 @@
 #define MODEST_MAEMO_PROVIDER_DATA_FILE          PREFIX "/share/modest/provider-data/maemo-provider-data.keyfile"  
 
 
+#ifdef MAEMO_PLATFORM
 #define MODEST_ICON_SIZE_SMALL            26
 #define MODEST_ICON_SIZE_BIG             64
+#else
+#define MODEST_ICON_SIZE_SMALL            16
+#define MODEST_ICON_SIZE_BIG             32
+#endif
 
 /* configuration key definitions for modest */
 #define MODEST_ACCOUNT_NAMESPACE         MODEST_CONF_NAMESPACE "/accounts"

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 49f7d9d..bfcf39d 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -4401,8 +4401,13 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self,
                return;
 
        children = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area));
+#ifdef MAEMO_PLATFORM
        ok_button = GTK_WIDGET (children->next->next->data);
        new_button = GTK_WIDGET (children->next->data);
+#else
+       ok_button = GTK_WIDGET (children->data);
+       new_button = GTK_WIDGET (children->next->next->data);
+#endif
        g_list_free (children);
 
        /* check if folder_store is an remote account */
@@ -4533,18 +4538,33 @@ create_move_to_dialog (GtkWindow *win,
 {
        GtkWidget *dialog, *scroll;
        GtkWidget *new_button;
+#ifndef MAEMO_PLATFORM
+       GtkWidget *folder_view_label;
+#endif
 
        dialog = gtk_dialog_new_with_buttons (_("mcen_ti_moveto_folders_title"),
                                              GTK_WINDOW (win),
                                              GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT,
                                              NULL);
 
+#ifdef MAEMO_PLATFORM
        gtk_dialog_add_button (GTK_DIALOG (dialog), _("mcen_bd_dialog_ok"), GTK_RESPONSE_ACCEPT);
        /* We do this manually so GTK+ does not associate a response ID for
         * the button. */
        new_button = gtk_button_new_from_stock (_("mcen_bd_new"));
        gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), new_button, FALSE, FALSE, 0);
        gtk_dialog_add_button (GTK_DIALOG (dialog), _("mcen_bd_dialog_cancel"), GTK_RESPONSE_REJECT);
+#else
+       /* We do this manually so GTK+ does not associate a response ID for
+        * the button. */
+       new_button = gtk_button_new_with_label (_("mcen_ti_new_folder"));
+       gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), new_button, FALSE, FALSE, 0);
+       gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (GTK_DIALOG (dialog)->action_area), new_button, TRUE);
+       gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT);
+       gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_ACCEPT);
+       gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
+       gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 24);
+#endif
 
        /* Create scrolled window */
        scroll = gtk_scrolled_window_new (NULL, NULL);
@@ -4552,6 +4572,10 @@ create_move_to_dialog (GtkWindow *win,
                                         GTK_POLICY_AUTOMATIC,
                                         GTK_POLICY_AUTOMATIC);
 
+#ifndef MAEMO_PLATFORM
+       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll), GTK_SHADOW_IN);
+#endif
+
        /* Create folder view */
        *tree_view = modest_platform_create_folder_view (NULL);
 
@@ -4631,7 +4655,11 @@ create_move_to_dialog (GtkWindow *win,
                            scroll, TRUE, TRUE, 0);
 
        gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
+#ifdef MAEMO_PLATFORM
        gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 300);
+#else
+       gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 400);
+#endif
 
        return dialog;
 }

diff --git a/src/modest-utils.c b/src/modest-utils.c
index cd9f950..c2a1e6e 100644 (file)
--- a/src/modest-utils.c
+++ b/src/modest-utils.c
@@ -702,6 +702,8 @@ modest_utils_run_sort_dialog (GtkWindow *parent_window,
 
        /* Build dialog */
        dialog = modest_platform_create_sort_dialog (parent_window);
+       if (dialog == NULL)
+               return;
        modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
                                     GTK_WINDOW (dialog));
 

diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c
index 7284672..f84845e 100644 (file)
--- a/src/widgets/modest-header-view.c
+++ b/src/widgets/modest-header-view.c
@@ -410,8 +410,8 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
        gtk_cell_renderer_set_fixed_size (renderer_priority, 32, 26);
        gtk_cell_renderer_set_fixed_size (renderer_compact_header, -1, 64);
 #else
-       gtk_cell_renderer_set_fixed_size (renderer_attach, 26, 26);
-       gtk_cell_renderer_set_fixed_size (renderer_priority, 26, 26);
+       gtk_cell_renderer_set_fixed_size (renderer_attach, 16, 16);
+       gtk_cell_renderer_set_fixed_size (renderer_priority, 16, 16);
        /* gtk_cell_renderer_set_fixed_size (renderer_compact_header, -1, 64); */
 #endif