ModestMainWindowStyle style;
ModestMainWindowContentsStyle contents_style;
+ gboolean wait_for_settings;
guint progress_bar_timeout;
guint restore_paned_timeout;
priv->progress_bar = NULL;
priv->current_toolbar_mode = TOOLBAR_MODE_NORMAL;
priv->style = MODEST_MAIN_WINDOW_STYLE_SPLIT;
+ priv->wait_for_settings = TRUE;
priv->contents_style = -1; /* invalid contents style. We need this to select it for the first time */
priv->merge_ids = NULL;
priv->optimized_view = FALSE;
modest_widget_memory_restore (conf, G_OBJECT(priv->folder_view),
MODEST_CONF_FOLDER_VIEW_KEY);
- modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned),
- MODEST_CONF_MAIN_PANED_KEY);
+/* modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned), */
+/* MODEST_CONF_MAIN_PANED_KEY); */
- g_timeout_add (500, (GSourceFunc) restore_paned_timeout_handler, self);
+ g_timeout_add (250, (GSourceFunc) restore_paned_timeout_handler, self);
/* We need to force a redraw here in order to get the right
position of the horizontal paned separator */
modest_widget_memory_save (conf,G_OBJECT(self),
MODEST_CONF_MAIN_WINDOW_KEY);
- modest_widget_memory_save (conf, G_OBJECT(priv->main_paned),
- MODEST_CONF_MAIN_PANED_KEY);
- // modest_widget_memory_save (conf, G_OBJECT(priv->header_view),
- // MODEST_CONF_HEADER_VIEW_KEY);
+ /* Only save main paned position if we're in split mode */
+ if (priv->style == MODEST_MAIN_WINDOW_STYLE_SPLIT)
+ modest_widget_memory_save (conf, G_OBJECT(priv->main_paned),
+ MODEST_CONF_MAIN_PANED_KEY);
modest_widget_memory_save (conf, G_OBJECT(priv->folder_view),
MODEST_CONF_FOLDER_VIEW_KEY);
}
modest_account_settings_get_display_name (b));
}
+/* We use this function to prevent the send&receive CSM to be shown
+ when there are less than two account */
+static gboolean
+tap_and_hold_query_cb (GtkWidget *widget, GdkEvent *event)
+{
+ return TRUE;
+}
+
static void
update_menus (ModestMainWindow* self)
{
/* Create item and add it to the send&receive
CSM. If there is only one account then
it'll be no menu */
- if (priv->accounts_popup) {
+ if (num_accounts > 1) {
GtkWidget *label = gtk_label_new(NULL);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- if (default_account && (strcmp(account_name, default_account) == 0))
- {
+ if (default_account && (strcmp(account_name, default_account) == 0)) {
gchar *escaped = g_markup_printf_escaped ("<b>%s</b>", display_name);
gtk_label_set_markup (GTK_LABEL (label), escaped);
g_free (escaped);
- }
- else
- {
+ } else {
gtk_label_set_text (GTK_LABEL (label), display_name);
}
* group being inserted. This makes the default account appear in bold.
* I agree it is a rather ugly way, but I don't see another possibility. armin. */
for (i = 0; i < num_accounts; i++) {
- ModestAccountSettings *settings = (ModestAccountSettings *) g_slist_nth_data (accounts, i);
+ gchar *item_name, *path;
+ GtkWidget *item;
+ ModestAccountSettings *settings;
const gchar *account_name;
+ gboolean is_default;
+ settings = (ModestAccountSettings *) g_slist_nth_data (accounts, i);
account_name = modest_account_settings_get_account_name (settings);
+ is_default = (account_name && default_account && !strcmp (account_name, default_account));
- if(account_name && default_account &&
- strcmp (account_name, default_account) == 0) {
- gchar *item_name = g_strconcat (account_name, "Menu", NULL);
-
- gchar *path = g_strconcat ("/MenuBar/ViewMenu/ViewMenuAdditions/", item_name, NULL);
- GtkWidget *item = gtk_ui_manager_get_widget (parent_priv->ui_manager, path);
- g_free(path);
-
- if (item) {
- GtkWidget *child = gtk_bin_get_child (GTK_BIN (item));
- if (GTK_IS_LABEL (child)) {
- const gchar *cur_name = gtk_label_get_text (GTK_LABEL (child));
+ /* Get the item of the view menu */
+ item_name = g_strconcat (account_name, "Menu", NULL);
+ path = g_strconcat ("/MenuBar/ViewMenu/ViewMenuAdditions/", item_name, NULL);
+ item = gtk_ui_manager_get_widget (parent_priv->ui_manager, path);
+ g_free(path);
+
+ if (item) {
+ GtkWidget *child = gtk_bin_get_child (GTK_BIN (item));
+ if (GTK_IS_LABEL (child)) {
+ const gchar *cur_name = gtk_label_get_text (GTK_LABEL (child));
+ if (is_default) {
gchar *bold_name = g_markup_printf_escaped("<b>%s</b>", cur_name);
gtk_label_set_markup (GTK_LABEL (child), bold_name);
g_free (bold_name);
}
+ gtk_label_set_ellipsize (GTK_LABEL (child), PANGO_ELLIPSIZE_END);
}
+ }
- path = g_strconcat("/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions/", item_name, NULL);
- item = gtk_ui_manager_get_widget (parent_priv->ui_manager, path);
- g_free (path);
-
- if (item) {
- GtkWidget *child = gtk_bin_get_child (GTK_BIN (item));
- if (GTK_IS_LABEL (child)) {
- const gchar *cur_name = gtk_label_get_text (GTK_LABEL (child));
+ /* Get the item of the tools menu */
+ path = g_strconcat("/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions/", item_name, NULL);
+ item = gtk_ui_manager_get_widget (parent_priv->ui_manager, path);
+ g_free (path);
+
+ if (item) {
+ GtkWidget *child = gtk_bin_get_child (GTK_BIN (item));
+ if (GTK_IS_LABEL (child)) {
+ const gchar *cur_name = gtk_label_get_text (GTK_LABEL (child));
+ if (is_default) {
gchar *bold_name = g_markup_printf_escaped("<b>%s</b>", cur_name);
gtk_label_set_markup (GTK_LABEL (child), bold_name);
g_free (bold_name);
}
+ gtk_label_set_ellipsize (GTK_LABEL (child), PANGO_ELLIPSIZE_END);
}
-
- g_free(item_name);
}
+ g_free(item_name);
g_object_unref (settings);
}
- if (priv->accounts_popup) {
+ if (num_accounts > 1) {
+ /* Disconnect the tap-and-hold-query if it's connected */
+ if (modest_signal_mgr_is_connected (priv->sighandlers,
+ G_OBJECT (send_receive_button),
+ "tap-and-hold-query"))
+ priv->sighandlers = modest_signal_mgr_disconnect (priv->sighandlers,
+ G_OBJECT (send_receive_button),
+ "tap-and-hold-query");
+
/* Mandatory in order to view the menu contents */
gtk_widget_show_all (priv->accounts_popup);
/* Setup tap_and_hold just if was not done before*/
if (!gtk_menu_get_attach_widget (GTK_MENU (priv->accounts_popup)))
gtk_widget_tap_and_hold_setup (send_receive_button, priv->accounts_popup, NULL, 0);
+ } else {
+ /* Connect the tap-and-hold-query in order not to show the CSM */
+ if (!modest_signal_mgr_is_connected (priv->sighandlers,
+ G_OBJECT (send_receive_button),
+ "tap-and-hold-query"))
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT (send_receive_button),
+ "tap-and-hold-query",
+ G_CALLBACK (tap_and_hold_query_cb),
+ NULL);
}
/* Frees */
modest_osso_load_state ();
/* Restore window & widget settings */
+ priv->wait_for_settings = TRUE;
restore_settings (MODEST_MAIN_WINDOW(self), TRUE);
+ priv->wait_for_settings = FALSE;
/* Check if accounts exist and show the account wizard if not */
gboolean accounts_exist =
priv->style = style;
switch (style) {
case MODEST_MAIN_WINDOW_STYLE_SIMPLE:
+
+ if (!priv->wait_for_settings)
+ modest_widget_memory_save (modest_runtime_get_conf (), G_OBJECT (priv->main_paned),
+ MODEST_CONF_MAIN_PANED_KEY);
/* Remove main paned */
g_object_ref (priv->main_paned);
gtk_container_remove (GTK_CONTAINER (priv->main_vbox), priv->main_paned);
gtk_paned_add2 (GTK_PANED (priv->main_paned), priv->contents_widget);
gtk_container_add (GTK_CONTAINER (priv->main_vbox), priv->main_paned);
+ g_timeout_add (500, (GSourceFunc) restore_paned_timeout_handler, self);
+
break;
default:
g_return_if_reached ();
gboolean folder_empty = FALSE;
gboolean all_marked_as_deleted = FALSE;
ModestMainWindowPrivate *priv;
-
+
g_return_if_fail (MODEST_IS_MAIN_WINDOW (main_window));
g_return_if_fail (TNY_IS_FOLDER(folder));
priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window);
changed = tny_folder_change_get_changed (change);
/* If something changes */
if ((changed) & TNY_FOLDER_CHANGE_CHANGED_ALL_COUNT)
- folder_empty = (tny_folder_change_get_new_all_count (change) == 0);
+ folder_empty = (((guint) tny_folder_change_get_new_all_count (change)) == 0);
else
- folder_empty = (tny_folder_get_all_count (TNY_FOLDER (folder)) == 0);
-
+ folder_empty = (((guint) tny_folder_get_all_count (TNY_FOLDER (folder))) == 0);
+
/* Play a sound (if configured) and make the LED blink */
if (changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) {
- modest_platform_on_new_headers_received (NULL, FALSE);
- }
-
- /* Checks header removed (hide marked as DELETED headers) */
- if (changed & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS) {
- modest_header_view_refilter (MODEST_HEADER_VIEW(priv->header_view));
+ modest_platform_push_email_notification ();
}
}
/* Check if all messages are marked to be deleted */
all_marked_as_deleted = modest_header_view_is_empty (header_view);
- folder_empty = folder_empty || all_marked_as_deleted ;
-
+ folder_empty = folder_empty || all_marked_as_deleted;
+
/* Set contents style of headers view */
if (folder_empty) {
modest_main_window_set_contents_style (main_window,
/* Get toolbar mode from operation id*/
switch (modest_mail_operation_get_type_operation (mail_op)) {
+ case MODEST_MAIL_OPERATION_TYPE_SEND_AND_RECEIVE:
case MODEST_MAIL_OPERATION_TYPE_RECEIVE:
case MODEST_MAIL_OPERATION_TYPE_OPEN:
mode = TOOLBAR_MODE_TRANSFER;
{
ModestMainWindowPrivate *priv = NULL;
+ g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(self), FALSE);
+
priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self);
return (priv->display_state == OSSO_DISPLAY_ON) ? TRUE : FALSE;
projects / modest / blobdiff