{ "EditDelete", NULL, N_("_Delete"), NULL, NULL, NULL },
{ "EditSelect", NULL, N_("Select..."), NULL, NULL, NULL }, /* submenu */
{ "EditMoveTo", NULL, N_("Move to..."), NULL, NULL, NULL },
-
/* View */
{ "ViewSort", NULL, N_("Sort..."), NULL, NULL, NULL },
{ "ViewDetails", NULL, N_("Details"), NULL, NULL, NULL },
{ "ViewThumbnails", NULL, N_("Thumbnails"), NULL, NULL, NULL },
{ "ViewShowToolbar", NULL, N_("Show toolbar"), NULL, NULL, NULL }, /* submenu */
-
/* Folders */
{ "FoldersNew", NULL, N_("New folder"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_new_folder) },
{ "FoldersRename", NULL, N_("Rename"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_rename_folder) },
{ "FoldersMoveToTrash", NULL, N_("Move to trash"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_move_folder_to_trash_folder) },
-
/* Accounts */
- { "AccountsNew", NULL, N_("_New account..."), NULL, NULL, NULL },
+ { "AccountsNew", NULL, N_("_New account..."), NULL, NULL, NULL },
{ "AccountsManage", NULL, N_("Manage..."), NULL, NULL, G_CALLBACK (modest_ui_actions_on_accounts) },
{ "AccountsConfigureSMTP", NULL, N_("Configure SMTP servers..."), NULL, NULL, NULL },
{ "ToolbarMessageReply", MODEST_STOCK_REPLY, N_("Reply a message"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_reply) },
{ "ToolbarMessageReplyAll", MODEST_STOCK_REPLY_ALL, N_("Reply to all"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_reply_all) },
{ "ToolbarMessageForward", MODEST_STOCK_FORWARD, N_("Forward a message"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_forward) },
- { "ToolbarSendReceive", MODEST_STOCK_SEND_RECEIVE, N_("Send & receive"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_forward) },
+ { "ToolbarSendReceive", MODEST_STOCK_SEND_RECEIVE, N_("Send & receive"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_send_receive) },
{ "ToolbarToggleView", GTK_STOCK_CDROM, N_("Toggle view"), NULL, NULL, G_CALLBACK (modest_ui_actions_toggle_view) },
{ "ToolbarDeleteMessage", GTK_STOCK_DELETE, N_("Delete message"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete) },
};
/* Toolbar */
toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
-
- gtk_progress_bar_set_text (GTK_PROGRESS_BAR(priv->progress_bar), "Connecting...");
-
progress_box = gtk_hbox_new (FALSE, HILDON_MARGIN_DEFAULT);
progress_alignment = gtk_alignment_new (0.5, 0.5, 1, 0);
gtk_toolbar_insert (GTK_TOOLBAR(toolbar), gtk_tool_button_new(stop_icon, NULL),
gtk_toolbar_get_n_items(GTK_TOOLBAR(toolbar)));
-
gtk_widget_show_all (toolbar);
return toolbar;
}
/* folder view */
g_signal_connect (G_OBJECT(priv->folder_view), "folder_selection_changed",
G_CALLBACK(modest_ui_actions_on_folder_selection_changed), self);
-// g_signal_connect (G_OBJECT(self->folder_view), "button-press-event",
-// G_CALLBACK (on_folder_view_button_press_event),self);
-// g_signal_connect (self->folder_view,"popup-menu",
-// G_CALLBACK (on_folder_view_button_press_event),self);
/* header view */
g_signal_connect (G_OBJECT(priv->header_view), "status_update",
G_CALLBACK(modest_ui_actions_on_header_activated), self);
g_signal_connect (G_OBJECT(priv->header_view), "item_not_found",
G_CALLBACK(modest_ui_actions_on_item_not_found), self);
-// g_signal_connect (G_OBJECT(self->header_view), "button-press-event",
-// G_CALLBACK (on_header_view_button_press_event), self);
-// g_signal_connect (G_OBJECT(self->header_view),"popup-menu",0
-// G_CALLBACK (on_header_view_button_press_event), self);
/* window */
g_signal_connect (G_OBJECT(self), "destroy", G_CALLBACK(on_destroy), NULL);
}
+gboolean
+sync_accounts_cb (ModestMainWindow *win)
+{
+ modest_ui_actions_on_send_receive (GTK_WIDGET(win), MODEST_WINDOW(win));
+ return FALSE;
+}
+
ModestWindow*
modest_main_window_new (void)
{
folder_win = wrapped_in_scrolled_window (GTK_WIDGET(priv->folder_view), FALSE);
header_win = wrapped_in_scrolled_window (GTK_WIDGET(priv->header_view), FALSE);
-
/* paned */
priv->main_paned = gtk_hpaned_new ();
gtk_paned_add1 (GTK_PANED(priv->main_paned), folder_win);
gtk_window_set_title (GTK_WINDOW(self), _("Modest"));
gtk_window_set_icon_from_file (GTK_WINDOW(self), MODEST_APP_ICON, NULL);
-
gtk_widget_show_all (main_vbox);
g_signal_connect (G_OBJECT(self), "delete-event",
G_CALLBACK(on_delete_event), self);
+ /* should we hide the toolbar? */
+ if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_TOOLBAR, NULL))
+ gtk_widget_hide (parent_priv->toolbar);
+
/* Connect signals */
connect_signals (self);
/* Set account store */
tny_account_store_view_set_account_store (TNY_ACCOUNT_STORE_VIEW (priv->folder_view),
TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()));
+ g_idle_add ((GSourceFunc)sync_accounts_cb, self);
+ /* do send & receive when we are idle */
- tny_device_force_online (modest_runtime_get_device());
return MODEST_WINDOW(self);
}
static void
restore_settings (ModestMsgEditWindow *self)
{
-
modest_widget_memory_restore (modest_runtime_get_conf(),
G_OBJECT(self), "modest-edit-msg-window");
}
GtkWidget *main_vbox;
ModestMsgEditWindowPrivate *priv;
ModestPairList *protos;
-
+
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj);
to_button = gtk_button_new_with_label (_("To..."));
cc_button = gtk_button_new_with_label (_("Cc..."));
bcc_button = gtk_button_new_with_label (_("Bcc..."));
-
protos = get_transports ();
priv->from_field = modest_combo_box_new (protos, g_str_equal);
gtk_box_pack_start (GTK_BOX(main_vbox), priv->msg_body, TRUE, TRUE, 6);
gtk_widget_show_all (GTK_WIDGET(main_vbox));
+
+ if (!modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_CC, NULL))
+ gtk_widget_hide (priv->cc_field);
+ if (!modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_BCC, NULL))
+ gtk_widget_hide (priv->bcc_field);
+
gtk_container_add (GTK_CONTAINER(obj), main_vbox);
}
}
+
+
ModestWindow*
modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name)
{
parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
hildon_window_add_toolbar (HILDON_WINDOW (obj), GTK_TOOLBAR (parent_priv->toolbar));
+ /* should we hide the toolbar? */
+ if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_TOOLBAR, NULL))
+ gtk_widget_hide (parent_priv->toolbar);
+
+
/* Menubar */
parent_priv->menubar = menubar_to_menu (parent_priv->ui_manager);
hildon_window_set_menu (HILDON_WINDOW (obj), GTK_MENU (parent_priv->menubar));
/* Init window */
init_window (MODEST_MSG_EDIT_WINDOW(obj));
-
- restore_settings (MODEST_MSG_EDIT_WINDOW(obj));
+ restore_settings (MODEST_MSG_EDIT_WINDOW(obj));
+
gtk_window_set_title (GTK_WINDOW(obj), "Modest");
gtk_window_set_icon_from_file (GTK_WINDOW(obj), MODEST_APP_ICON, NULL);
modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
{
MsgData *data;
- ModestAccountData *account_data;
+ const gchar *account_name;
GtkTextBuffer *buf;
GtkTextIter b, e;
ModestMsgEditWindowPrivate *priv;
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (edit_window);
- account_data = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->from_field));
+ account_name = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->from_field));
+ g_return_val_if_fail (account_name, NULL);
+
buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body));
gtk_text_buffer_get_bounds (buf, &b, &e);
-
+
/* don't free these (except from) */
data = g_slice_new0 (MsgData);
- data->from = g_strdup_printf ("%s <%s>", account_data->fullname, account_data->email) ;
+ data->from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(),
+ account_name);
data->to = (gchar*) gtk_entry_get_text (GTK_ENTRY(priv->to_field));
data->cc = (gchar*) gtk_entry_get_text (GTK_ENTRY(priv->cc_field));
data->bcc = (gchar*) gtk_entry_get_text (GTK_ENTRY(priv->bcc_field));
projects / modest / commitdiff