From 5005b6ea5c9c552cc50414c548515737acf314b8 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Tue, 27 Feb 2007 23:55:25 +0000 Subject: [PATCH] * main-window: - small updates, try to get device name * edit-window: - load correct xml file * maemo-utils: - small cleanups * ...ui.xml: - improve pmo-trunk-r864 --- src/maemo/modest-account-view-window.c | 74 ++++++++++---------------------- src/maemo/modest-maemo-utils.c | 2 - src/maemo/modest-main-window-ui.h | 12 +++--- src/maemo/modest-main-window.c | 2 +- src/maemo/modest-msg-edit-window.c | 4 +- src/maemo/ui/modest-main-window-ui.xml | 2 +- 6 files changed, 33 insertions(+), 63 deletions(-) diff --git a/src/maemo/modest-account-view-window.c b/src/maemo/modest-account-view-window.c index c499729..0a5b200 100644 --- a/src/maemo/modest-account-view-window.c +++ b/src/maemo/modest-account-view-window.c @@ -63,7 +63,7 @@ struct _ModestAccountViewWindowPrivate { MODEST_TYPE_ACCOUNT_VIEW_WINDOW, \ ModestAccountViewWindowPrivate)) /* globals */ -static GtkWindowClass *parent_class = NULL; +static GtkDialogClass *parent_class = NULL; /* uncomment the following if you have defined any signals */ /* static guint signals[LAST_SIGNAL] = {0}; */ @@ -85,7 +85,7 @@ modest_account_view_window_get_type (void) (GInstanceInitFunc) modest_account_view_window_init, NULL }; - my_type = g_type_register_static (GTK_TYPE_WINDOW, + my_type = g_type_register_static (GTK_TYPE_DIALOG, "ModestAccountViewWindow", &my_info, 0); } @@ -112,12 +112,6 @@ modest_account_view_window_class_init (ModestAccountViewWindowClass *klass) } static void -modest_account_view_window_init (ModestAccountViewWindow *obj) -{ - /* empty */ -} - -static void modest_account_view_window_finalize (GObject *obj) { G_OBJECT_CLASS(parent_class)->finalize (obj); @@ -203,7 +197,7 @@ on_remove_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) static void on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) { - g_message (__FUNCTION__); + modest_runtime_not_implemented (GTK_WINDOW(self)); } static void @@ -212,7 +206,7 @@ on_add_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) GtkWidget *notebook, *assistant; ModestAccountViewWindowPrivate *priv; - g_message (__FUNCTION__); + modest_runtime_not_implemented (GTK_WINDOW(self)); return; priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); @@ -222,6 +216,7 @@ on_add_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) GTK_NOTEBOOK(notebook)); gtk_dialog_run (GTK_DIALOG(assistant)); + gtk_widget_destroy (assistant); } @@ -244,24 +239,15 @@ on_default_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) -static void -on_close_button_clicked (GtkWidget *button, ModestAccountViewWindow *self) -{ - gtk_widget_destroy (GTK_WIDGET(self)); -} - - - static GtkWidget* button_box_new (ModestAccountViewWindow *self) { - GtkWidget *button_box; ModestAccountViewWindowPrivate *priv; priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); - button_box = gtk_vbutton_box_new (); + button_box = gtk_hbutton_box_new (); gtk_button_box_set_spacing (GTK_BUTTON_BOX (button_box), 6); gtk_button_box_set_layout (GTK_BUTTON_BOX (button_box), GTK_BUTTONBOX_START); @@ -292,7 +278,8 @@ button_box_new (ModestAccountViewWindow *self) gtk_widget_set_sensitive (priv->edit_button, FALSE); gtk_widget_set_sensitive (priv->remove_button, FALSE); gtk_widget_set_sensitive (priv->default_button, FALSE); - + + gtk_widget_show_all (button_box); return button_box; } @@ -302,9 +289,7 @@ window_vbox_new (ModestAccountViewWindow *self) { ModestAccountViewWindowPrivate *priv; GtkTreeSelection *sel; - GtkWidget *main_hbox, *main_vbox, *button_box; - GtkWidget *close_button; - GtkWidget *close_hbox; + GtkWidget *main_hbox, *main_vbox; priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self); @@ -318,45 +303,32 @@ window_vbox_new (ModestAccountViewWindow *self) g_signal_connect (G_OBJECT(sel), "changed", G_CALLBACK(on_selection_changed), self); - button_box = button_box_new (self); - gtk_box_pack_start (GTK_BOX(main_hbox), GTK_WIDGET(priv->account_view), TRUE, TRUE, 2); - gtk_box_pack_start (GTK_BOX(main_hbox), button_box, FALSE, FALSE,2); - gtk_box_pack_start (GTK_BOX(main_vbox), main_hbox, TRUE, TRUE, 2); - close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); - g_signal_connect (G_OBJECT(close_button), "clicked", - G_CALLBACK(on_close_button_clicked), - self); - - close_hbox = gtk_hbox_new (FALSE, 2); - gtk_box_pack_end (GTK_BOX(close_hbox), - close_button, FALSE, FALSE,2); - gtk_box_pack_end (GTK_BOX(main_vbox), close_hbox, FALSE, FALSE,2); - gtk_widget_show_all (main_vbox); return main_vbox; } +static void +modest_account_view_window_init (ModestAccountViewWindow *obj) +{ + ModestAccountViewWindowPrivate *priv; + priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(obj); + + //GTK_DIALOG(obj)->vbox = window_vbox_new (MODEST_ACCOUNT_VIEW_WINDOW(obj)); + GTK_DIALOG(obj)->action_area = window_vbox_new (MODEST_ACCOUNT_VIEW_WINDOW(obj)); +} + + GtkWidget* modest_account_view_window_new (void) { - GObject *obj; - ModestAccountViewWindowPrivate *priv; + GObject *obj = g_object_new(MODEST_TYPE_ACCOUNT_VIEW_WINDOW, NULL); - obj = g_object_new(MODEST_TYPE_ACCOUNT_VIEW_WINDOW, NULL); - priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(obj); - - gtk_window_set_resizable (GTK_WINDOW(obj), FALSE); - gtk_window_set_title (GTK_WINDOW(obj), _("Accounts")); - gtk_window_set_type_hint (GTK_WINDOW(obj), GDK_WINDOW_TYPE_HINT_DIALOG); + GTK_DIALOG(obj)->vbox = window_vbox_new (MODEST_ACCOUNT_VIEW_WINDOW(obj)); + GTK_DIALOG(obj)->action_area = button_box_new (MODEST_ACCOUNT_VIEW_WINDOW(obj)); - gtk_window_set_modal (GTK_WINDOW(obj), TRUE); - - gtk_container_add (GTK_CONTAINER(obj), - window_vbox_new (MODEST_ACCOUNT_VIEW_WINDOW(obj))); - return GTK_WIDGET(obj); } diff --git a/src/maemo/modest-maemo-utils.c b/src/maemo/modest-maemo-utils.c index 4a8af73..1fca24e 100644 --- a/src/maemo/modest-maemo-utils.c +++ b/src/maemo/modest-maemo-utils.c @@ -121,8 +121,6 @@ get_device_name_from_dbus () DBusMessage *request; DBusError error; DBusPendingCall *call = NULL; - - g_warning ("get device name from dbus"); dbus_error_init (&error); if (!conn) { diff --git a/src/maemo/modest-main-window-ui.h b/src/maemo/modest-main-window-ui.h index fbc6c03..8fd93cd 100644 --- a/src/maemo/modest-main-window-ui.h +++ b/src/maemo/modest-main-window-ui.h @@ -110,12 +110,12 @@ static const GtkActionEntry modest_action_entries [] = { */ /* Headers Toolbar */ { "ToolbarMessageNew", MODEST_STOCK_NEW_MAIL, N_("Compose a new message"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_new_msg) }, - { "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_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) }, + { "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_send_receive) }, + { "ToolbarToggleView", GTK_STOCK_CDROM, N_("Toggle view"), "t", NULL, G_CALLBACK (modest_ui_actions_toggle_view) }, + { "ToolbarDeleteMessage", GTK_STOCK_DELETE, N_("Delete message"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete) }, }; diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c index 18ccad5..bc4e78d 100644 --- a/src/maemo/modest-main-window.c +++ b/src/maemo/modest-main-window.c @@ -392,7 +392,7 @@ connect_signals (ModestMainWindow *self) gboolean sync_accounts_cb (ModestMainWindow *win) { - modest_ui_actions_on_send_receive (GTK_WIDGET(win), MODEST_WINDOW(win)); + modest_ui_actions_on_send_receive (NULL, MODEST_WINDOW(win)); return FALSE; } diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c index 8f5ef27..3ff45da 100644 --- a/src/maemo/modest-msg-edit-window.c +++ b/src/maemo/modest-msg-edit-window.c @@ -353,9 +353,9 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name) g_object_unref (action_group); /* Load the UI definition */ - gtk_ui_manager_add_ui_from_file (parent_priv->ui_manager, MODEST_UIDIR "modest-edit-msg-window-ui.xml", &error); + gtk_ui_manager_add_ui_from_file (parent_priv->ui_manager, MODEST_UIDIR "modest-msg-edit-window-ui.xml", &error); if (error != NULL) { - g_warning ("Could not merge modest-edit-msg-window-ui.xml: %s", error->message); + g_warning ("Could not merge modest-msg-edit-window-ui.xml: %s", error->message); g_error_free (error); error = NULL; } diff --git a/src/maemo/ui/modest-main-window-ui.xml b/src/maemo/ui/modest-main-window-ui.xml index 83fa0b9..9cb7b34 100644 --- a/src/maemo/ui/modest-main-window-ui.xml +++ b/src/maemo/ui/modest-main-window-ui.xml @@ -109,7 +109,7 @@ - + -- 1.7.9.5