#include <modest-shell-window.h>
#include <modest-icon-names.h>
#include <modest-ui-actions.h>
+#include <modest-gtk-window-mgr.h>
+#include <modest-runtime.h>
/* 'private'/'protected' functions */
static void modest_shell_class_init (ModestShellClass *klass);
static void modest_shell_instance_init (ModestShell *obj);
+static void modest_shell_dispose (GObject *obj);
static void modest_shell_finalize (GObject *obj);
static void update_title (ModestShell *self);
static void on_title_button_clicked (GtkToolButton *button, ModestShell *self);
static void on_new_msg_button_clicked (GtkToolButton *button, ModestShell *self);
static void on_style_set (GtkWidget *widget, GtkStyle *old_style, ModestShell *shell);
+static gboolean on_delete_event (GtkWidget *widget,
+ GdkEvent *event,
+ gpointer user_data);
+static gboolean on_control_q (GtkAccelGroup *accel_group,
+ GObject *acceleratable,
+ guint keyval,
+ GdkModifierType modifier);
static gboolean on_key_pressed (GtkWidget *widget, GdkEventKey *event, ModestShell *shell);
gobject_class = (GObjectClass*) klass;
parent_class = g_type_class_peek_parent (klass);
+ gobject_class->dispose = modest_shell_dispose;
gobject_class->finalize = modest_shell_finalize;
g_type_class_add_private (gobject_class, sizeof(ModestShellPrivate));
gtk_widget_show (GTK_WIDGET (priv->new_message_button));
g_signal_connect (G_OBJECT (priv->new_message_button), "clicked", G_CALLBACK (on_new_msg_button_clicked), obj);
- priv->back_button = gtk_tool_button_new_from_stock (GTK_STOCK_GO_BACK);
- g_object_set (priv->back_button, "is-important", TRUE, NULL);
- gtk_toolbar_insert (GTK_TOOLBAR (priv->top_toolbar), priv->back_button, -1);
- gtk_widget_show (GTK_WIDGET (priv->back_button));
- g_signal_connect (G_OBJECT (priv->back_button), "clicked", G_CALLBACK (on_back_button_clicked), obj);
-
separator_toolitem = gtk_separator_tool_item_new ();
gtk_toolbar_insert (GTK_TOOLBAR (priv->top_toolbar), separator_toolitem, -1);
gtk_widget_show (GTK_WIDGET (separator_toolitem));
gtk_box_pack_start (GTK_BOX (title_vbox), priv->subtitle_label, FALSE, FALSE, 0);
gtk_widget_show (title_vbox);
- priv->title_button = gtk_tool_button_new (NULL, NULL);
+ priv->title_button = gtk_tool_button_new (NULL, "");
gtk_widget_show (GTK_WIDGET (priv->title_button));
title_arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
gtk_widget_show (title_arrow);
g_object_set (priv->title_button, "is-important", TRUE, NULL);
g_signal_connect (G_OBJECT (priv->title_button), "clicked", G_CALLBACK (on_title_button_clicked), obj);
+ priv->back_button = gtk_tool_button_new_from_stock (GTK_STOCK_GO_BACK);
+ g_object_set (priv->back_button, "is-important", TRUE, NULL);
+ gtk_toolbar_insert (GTK_TOOLBAR (priv->top_toolbar), priv->back_button, -1);
+ gtk_widget_show (GTK_WIDGET (priv->back_button));
+ g_signal_connect (G_OBJECT (priv->back_button), "clicked", G_CALLBACK (on_back_button_clicked), obj);
+
priv->notebook = gtk_notebook_new ();
gtk_notebook_set_show_tabs ((GtkNotebook *)priv->notebook, FALSE);
gtk_notebook_set_show_border ((GtkNotebook *)priv->notebook, FALSE);
gtk_container_add (GTK_CONTAINER (obj), priv->main_vbox);
g_signal_connect (G_OBJECT (obj), "style-set", G_CALLBACK (on_style_set), obj);
+ g_signal_connect (G_OBJECT (obj), "delete-event", G_CALLBACK (on_delete_event), obj);
guint accel_key;
GdkModifierType accel_mods;
gtk_accelerator_parse ("<Control>n", &accel_key, &accel_mods);
gtk_widget_add_accelerator (GTK_WIDGET (priv->new_message_button), "clicked", accel_group,
accel_key, accel_mods, 0);
- gtk_accelerator_parse ("Esc", &accel_key, &accel_mods);
+ gtk_accelerator_parse ("Escape", &accel_key, &accel_mods);
+ gtk_widget_add_accelerator (GTK_WIDGET (priv->back_button), "clicked", accel_group,
+ accel_key, accel_mods, 0);
+ gtk_accelerator_parse ("<Control>w", &accel_key, &accel_mods);
gtk_widget_add_accelerator (GTK_WIDGET (priv->back_button), "clicked", accel_group,
accel_key, accel_mods, 0);
+ gtk_accelerator_parse ("<Control>q", &accel_key, &accel_mods);
+ gtk_accel_group_connect (accel_group, accel_key, accel_mods, 0, g_cclosure_new (G_CALLBACK (on_control_q), NULL, NULL));
gtk_accelerator_parse ("F10", &accel_key, &accel_mods);
gtk_widget_add_accelerator (GTK_WIDGET (priv->title_button), "clicked", accel_group,
accel_key, accel_mods, 0);
}
static void
+modest_shell_dispose (GObject *obj)
+{
+ ModestShellPrivate *priv;
+
+ priv = MODEST_SHELL_GET_PRIVATE (obj);
+
+ if (priv->progress_timeout_id) {
+ g_source_remove (priv->progress_timeout_id);
+ priv->progress_timeout_id = 0;
+ }
+ G_OBJECT_CLASS(parent_class)->dispose (obj);
+}
+
+static void
modest_shell_finalize (GObject *obj)
{
ModestShellPrivate *priv;
if (priv->progress_timeout_id) {
g_source_remove (priv->progress_timeout_id);
+ priv->progress_timeout_id = 0;
}
for (n = 0; n < 31; n++) {
if (priv->progress_frames[n]) {
priv = MODEST_SHELL_GET_PRIVATE (shell);
g_signal_emit_by_name (G_OBJECT (window), "delete-event", NULL, &ret_value);
if (ret_value == FALSE) {
- gint page_num;
-
- page_num = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), GTK_WIDGET (window));
- if (page_num != -1) {
- gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook), page_num);
+ GList *children;
+
+ children = gtk_container_get_children (GTK_CONTAINER (priv->notebook));
+ if (g_list_find (children, window)) {
+ gtk_container_remove (GTK_CONTAINER (priv->notebook), GTK_WIDGET (window));
}
+
}
update_title (shell);
menu = modest_shell_window_get_menu (MODEST_SHELL_WINDOW (child));
if (menu) {
- gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
+ /* Run dimming rules */
+ ModestWindow *window = modest_shell_peek_window (self);
+ modest_ui_actions_check_menu_dimming_rules (window);
+
+ gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
(GtkMenuPositionFunc) menu_position_cb, (gpointer) self,
1, gtk_get_current_event_time ());
}
priv = MODEST_SHELL_GET_PRIVATE (shell);
gtk_box_pack_start (GTK_BOX (priv->banners_box), GTK_WIDGET (banner), FALSE, FALSE, 0);
}
+
+static gboolean
+on_delete_event (GtkWidget *widget,
+ GdkEvent *event,
+ gpointer user_data)
+{
+ ModestWindow *top_window;
+
+ while ((top_window = modest_shell_peek_window (MODEST_SHELL (widget))) != NULL) {
+ if (modest_shell_delete_window (MODEST_SHELL (widget), top_window))
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static gboolean
+on_control_q (GtkAccelGroup *accel_group,
+ GObject *acceleratable,
+ guint keyval,
+ GdkModifierType modifier)
+{
+ ModestWindowMgr *mgr;
+ GtkWidget *shell;
+ gboolean ret_value;
+
+ mgr = modest_runtime_get_window_mgr ();
+ shell = modest_gtk_window_mgr_get_shell (MODEST_GTK_WINDOW_MGR (mgr));
+ g_signal_emit_by_name (G_OBJECT (shell), "delete-event", NULL, &ret_value);
+
+ return ret_value;
+}
projects / modest / blobdiff