};
static const GtkToggleActionEntry modest_main_window_toggle_action_entries [] = {
- { "ToolbarToggleView", MODEST_STOCK_SPLIT_VIEW, N_("gqn_toolb_rss_fldonoff"), "<CTRL>t", NULL, G_CALLBACK (modest_ui_actions_toggle_folders_view), FALSE },
+ { "ToggleFolders", MODEST_STOCK_SPLIT_VIEW, N_("mcen_me_inbox_hidefolders"), "<CTRL>t", NULL, G_CALLBACK (modest_ui_actions_toggle_folders_view), TRUE },
};
/************************************************************************/
static void
restore_settings (ModestMainWindow *self, gboolean do_folder_view_too)
{
+ printf ("DEBUGDEBUG: %s\n", __FUNCTION__);
+
ModestConf *conf;
ModestMainWindowPrivate *priv;
{
if (err) {
printf ("DEBUG: %s: err->code=%d, err->message=%s\n", __FUNCTION__, err->code, err->message);
+
+ if (err->code == TNY_ACCOUNT_ERROR_TRY_CONNECT_USER_CANCEL)
+ /* Don't show waste the user's time by showing him a dialog telling him
+ * that he has just cancelled something: */
+ return;
}
- /* Get the account name: */
+ /* Get the server name: */
const gchar* server_name = NULL;
TnyCamelTransportAccount* server_account = tny_camel_send_queue_get_transport_account (
message = g_strdup_printf (_("eemev_ni_ui_smtp_authentication_fail_error"), server_name);
break;
case TNY_TRANSPORT_ACCOUNT_ERROR_SEND:
+ /* TODO: Tinymail is still sending this sometimes when it should
+ * send TNY_ACCOUNT_ERROR_TRY_CONNECT_USER_CANCEL. */
default:
message = g_strdup (_("emev_ib_ui_smtp_send_error"));
break;
restore_settings (MODEST_MAIN_WINDOW(self), TRUE);
+ /* The UI spec wants us to show a connection dialog when the application is
+ * started by the user, if there is no connection.
+ * Do this before showing the account wizard,
+ * because wizard needs a connection to discover capabilities. */
+ modest_platform_connect_and_wait (GTK_WINDOW (self), NULL);
+
/* Check if accounts exist and show the account wizard if not */
gboolean accounts_exist =
modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE);
gtk_action_set_visible (send_receive_all, g_slist_length (accounts));
modest_account_mgr_free_account_names (accounts);
}
-
-
}
ModestWindow *
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
modest_conf_get_bool (conf, MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN, NULL));
hildon_window_set_menu (HILDON_WINDOW (self), GTK_MENU (parent_priv->menubar));
+ gtk_widget_show (parent_priv->menubar);
/* Get device name */
modest_maemo_utils_get_device_name ();
g_object_set (G_OBJECT (priv->header_view),
"rules-hint", FALSE,
NULL);
+ /* gtk_widget_show (priv->header_view); */
/* Empty view */
priv->empty_view = create_empty_view ();
+ gtk_widget_show (priv->empty_view);
/* Create scrolled windows */
folder_win = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->contents_widget),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
+ /* gtk_widget_show (priv->contents_widget); */
/* paned */
priv->main_paned = gtk_hpaned_new ();
/* putting it all together... */
priv->main_vbox = gtk_vbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX(priv->main_vbox), priv->main_paned, TRUE, TRUE,0);
-
+ gtk_widget_show (priv->main_vbox);
+
gtk_container_add (GTK_CONTAINER(self), priv->main_vbox);
HildonProgram *app = hildon_program_get_instance ();
g_object_unref (window_icon);
}
- restore_settings (MODEST_MAIN_WINDOW(self), FALSE);
+ /* Dont't restore settings here,
+ * because it requires a gtk_widget_show(),
+ * and we don't want to do that until later,
+ * so that the UI is not visible for non-menu D-Bus activation.
+ */
+ /* restore_settings (MODEST_MAIN_WINDOW(self), FALSE); */
return MODEST_WINDOW(self);
}
ModestMainWindowPrivate *priv;
ModestWindowPrivate *parent_priv;
GtkAction *action;
+ gboolean active;
g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
if (priv->style == style)
return;
- /* Get toggle button */
- action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarToggleView");
+ /* Get toggle button and update the state if needed. This will
+ happen only when the set_style is not invoked from the UI,
+ for example when it's called from widget memory */
+ action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToggleFolders");
+ active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+ if ((active && style == MODEST_MAIN_WINDOW_STYLE_SIMPLE) ||
+ (!active && style == MODEST_MAIN_WINDOW_STYLE_SPLIT)) {
+ g_signal_handlers_block_by_func (action, modest_ui_actions_toggle_folders_view, self);
+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), !active);
+ g_signal_handlers_unblock_by_func (action, modest_ui_actions_toggle_folders_view, self);
+ }
priv->style = style;
switch (style) {
/* Reparent the contents widget to the main vbox */
gtk_widget_reparent (priv->contents_widget, priv->main_vbox);
- g_signal_handlers_block_by_func (action, modest_ui_actions_toggle_folders_view, self);
- gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
- g_signal_handlers_unblock_by_func (action, modest_ui_actions_toggle_folders_view, self);
-
if (modest_header_view_has_selected_headers (MODEST_HEADER_VIEW (priv->header_view))) {
TnyList *selection = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (priv->header_view));
TnyIterator *iterator = tny_list_create_iterator (selection);
gtk_window_set_title (GTK_WINDOW(self), tny_header_get_subject (header));
else
gtk_window_set_title (GTK_WINDOW (self), _("mail_va_no_subject"));
- g_object_unref (header);
+
+ if (header)
+ g_object_unref (header);
+
g_object_unref (iterator);
g_object_unref (selection);
}
gtk_paned_add2 (GTK_PANED (priv->main_paned), priv->contents_widget);
gtk_container_add (GTK_CONTAINER (priv->main_vbox), priv->main_paned);
- g_signal_handlers_block_by_func (action, modest_ui_actions_toggle_folders_view, self);
- gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), FALSE);
- g_signal_handlers_unblock_by_func (action, modest_ui_actions_toggle_folders_view, self);
-
break;
default:
g_return_if_reached ();
account_data->account_name,
GTK_UI_MANAGER_MENUITEM,
FALSE);
-
+
/* Connect the action signal "activate" */
g_signal_connect (G_OBJECT (view_account_action),
"activate",
CSM. If there is only one account then
it'll be no menu */
if (priv->accounts_popup) {
- item = gtk_menu_item_new_with_label (display_name);
+ GtkWidget *label = gtk_label_new(NULL);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ if (default_account && (strcmp(account_data->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
+ {
+ gtk_label_set_text (GTK_LABEL (label), display_name);
+ }
+
+ item = gtk_menu_item_new ();
+ gtk_container_add (GTK_CONTAINER (item), label);
+
gtk_menu_shell_prepend (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
g_signal_connect_data (G_OBJECT (item),
"activate",
/* Frees */
g_free (display_name);
- modest_account_mgr_free_account_data (mgr, account_data);
}
+
gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 1);
+ /* We cannot do this in the loop above because this relies on the action
+ * 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++) {
+ ModestAccountData *account_data = (ModestAccountData *) g_slist_nth_data (accounts, i);
+
+ if(account_data->account_name &&
+ strcmp (account_data->account_name, default_account) == 0) {
+ gchar *item_name = g_strconcat (account_data->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));
+ 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);
+ }
+ }
+
+ 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));
+ 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);
+ }
+ }
+
+ g_free(item_name);
+ }
+
+ modest_account_mgr_free_account_data (mgr, account_data);
+ }
+
if (priv->accounts_popup) {
/* Mandatory in order to view the menu contents */
gtk_widget_show_all (priv->accounts_popup);
}
}
+
void
modest_main_window_set_contents_style (ModestMainWindow *self,
ModestMainWindowContentsStyle style)
switch (priv->contents_style) {
case MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS:
wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET (priv->header_view));
+ modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->contents_widget),
+ TRUE);
break;
case MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS:
{
priv->details_widget);
}
g_object_unref (selected_folderstore);
+ modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->contents_widget),
+ FALSE);
+
+
break;
}
case MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY:
wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET (priv->empty_view));
+ modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->contents_widget),
+ FALSE);
break;
default:
g_return_if_reached ();
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
- /* Get operation observers and cancel its current operation */
+ /* Get operation observers and cancel all the operations */
tmp = priv->progress_widgets;
while (tmp) {
- modest_progress_object_cancel_current_operation (MODEST_PROGRESS_OBJECT(tmp->data));
+ modest_progress_object_cancel_all_operations (MODEST_PROGRESS_OBJECT(tmp->data));
tmp=g_slist_next(tmp);
}
}
acc_data->store_account->account_name);
modest_window_set_active_account (MODEST_WINDOW (self), acc_data->account_name);
}
+
+ modest_folder_view_select_first_inbox_or_local (priv->folder_view);
/* Free */
modest_account_mgr_free_account_data (mgr, acc_data);
else
gtk_window_set_title (GTK_WINDOW (main_window), _("mail_va_no_subject"));
- g_object_unref (header);
+ if (header)
+ g_object_unref (header);
+
g_object_unref (iterator);
g_object_unref (selection);
}
show_reply = show_forward = show_cancel_send = show_clipboard = show_delete = FALSE;
} else if (TNY_IS_FOLDER (folder_store)) {
if (modest_tny_folder_is_local_folder (TNY_FOLDER (folder_store))) {
- TnyFolderType folder_type = modest_tny_folder_get_local_folder_type (
+ TnyFolderType folder_type = modest_tny_folder_get_local_or_mmc_folder_type (
TNY_FOLDER (folder_store));
switch (folder_type) {
case TNY_FOLDER_TYPE_DRAFTS:
/* Select the message in the header view */
path = gtk_tree_row_reference_get_path (row_reference);
- _modest_header_view_select_from_path (MODEST_HEADER_VIEW (priv->header_view), path);
+ gtk_tree_view_set_cursor (GTK_TREE_VIEW (priv->header_view),
+ path, NULL, FALSE);
gtk_tree_path_free (path);
return TRUE;
projects / modest / blobdiff