static void modest_shell_window_class_init (gpointer klass, gpointer class_data);
static void modest_shell_window_instance_init (GTypeInstance *instance, gpointer g_class);
static void modest_shell_window_dispose (GObject *obj);
+static void modest_shell_window_finalize (GObject *obj);
static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window);
static void modest_shell_window_show_progress (ModestWindow *window,
gboolean show);
-static void setup_menu (ModestShellWindow *self);
-
static void modest_shell_window_show_toolbar (ModestWindow *self,
gboolean show_toolbar);
static void modest_shell_window_add_toolbar (ModestWindow *self,
GtkAccelGroup *accel_group;
GtkWidget *menu;
+ gchar *title;
};
#define MODEST_SHELL_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
static GtkWindowClass *parent_class = NULL;
/* uncomment the following if you have defined any signals */
-static guint signals[LAST_SIGNAL] = {0};
+/* static guint signals[LAST_SIGNAL] = {0}; */
/************************************************************************/
GObjectClass *gobject_class;
gobject_class = (GObjectClass*) klass;
ModestWindowClass *modest_window_class = (ModestWindowClass *) klass;
- HildonWindowClass *hildon_window_class = (HildonWindowClass *) klass;
parent_class = g_type_class_peek_parent (klass);
gobject_class->dispose = modest_shell_window_dispose;
+ gobject_class->finalize = modest_shell_window_finalize;
g_type_class_add_private (gobject_class, sizeof(ModestShellWindowPrivate));
priv = MODEST_SHELL_WINDOW_GET_PRIVATE(obj);
+ if (priv->shell && priv->app_menu_dimming_group) {
+ gtk_window_remove_accel_group (GTK_WINDOW (priv->shell),
+ priv->accel_group);
+ }
+
+ if (priv->accel_group) {
+ g_object_unref (priv->accel_group);
+ priv->accel_group = NULL;
+ }
+
if (priv->app_menu_dimming_group) {
g_object_unref (priv->app_menu_dimming_group);
priv->app_menu_dimming_group = NULL;
}
static void
+modest_shell_window_finalize (GObject *obj)
+{
+ ModestShellWindowPrivate *priv;
+
+ priv = MODEST_SHELL_WINDOW_GET_PRIVATE(obj);
+
+ if (priv->title)
+ g_free (priv->title);
+
+ G_OBJECT_CLASS(parent_class)->finalize (obj);
+}
+
+static void
modest_shell_window_instance_init (GTypeInstance *instance, gpointer g_class)
{
ModestShellWindow *self = NULL;
parent_priv = MODEST_WINDOW_GET_PRIVATE (self);
priv = MODEST_SHELL_WINDOW_GET_PRIVATE (self);
+ priv->title = NULL;
+
priv->accel_group = gtk_accel_group_new ();
priv->app_menu_dimming_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_MENU, FALSE);
- gtk_window_add_accel_group (GTK_WINDOW (self), priv->accel_group);
+ if (priv->shell)
+ gtk_window_add_accel_group (GTK_WINDOW (priv->shell), priv->accel_group);
priv->menu = gtk_menu_new ();
{
g_return_val_if_fail (MODEST_IS_SHELL_WINDOW (window), FALSE);
- modest_platform_information_banner (NULL, NULL, _CS("ckct_ib_cannot_zoom_here"));
+ modest_platform_information_banner (NULL, NULL, _CS_CANNOT_ZOOM_HERE);
return FALSE;
}
-void
+
+void
modest_shell_window_add_item_to_menu (ModestWindow *self,
- GtkWidget *button,
+ GtkWidget *item,
ModestDimmingCallback dimming_callback)
{
ModestShellWindowPrivate *priv;
- GtkWidget *menu;
g_return_if_fail (MODEST_IS_SHELL_WINDOW(self));
- g_return_if_fail (GTK_IS_BUTTON (button));
+ g_return_if_fail (GTK_IS_MENU_ITEM (item));
priv = MODEST_SHELL_WINDOW_GET_PRIVATE (self);
- modest_ui_dimming_manager_set_widget_dimming_mode (GTK_WIDGET (button),
+ modest_ui_dimming_manager_set_widget_dimming_mode (item,
MODEST_UI_DIMMING_MODE_HIDE);
if (dimming_callback)
modest_dimming_rules_group_add_widget_rule (priv->app_menu_dimming_group,
- GTK_WIDGET (button),
+ item,
(GCallback) dimming_callback,
MODEST_WINDOW (self));
if (priv->menu) {
- gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), button);
+ gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), item);
} else {
- gtk_widget_destroy (button);
+ gtk_widget_destroy (item);
}
- gtk_widget_show (GTK_WIDGET (button));
+ gtk_widget_show (item);
}
static void
{
ModestShellWindowPrivate *priv = NULL;
GtkWidget *menu_item;
- GtkWidget *menu;
g_return_if_fail (MODEST_IS_SHELL_WINDOW(self));
g_return_if_fail (label && label[0] != '\0');
priv = MODEST_SHELL_WINDOW_GET_PRIVATE (self);
menu_item = gtk_menu_item_new_with_label (label);
- g_signal_connect_after (G_OBJECT (button), "activate-item",
- G_CALLBACK (callback), (gpointer) self);
+ g_signal_connect (G_OBJECT (menu_item), "activate",
+ G_CALLBACK (callback), (gpointer) self);
if (accelerator != NULL) {
guint accel_key;
GdkModifierType accel_mods;
gtk_accelerator_parse (accelerator, &accel_key, &accel_mods);
- gtk_widget_add_accelerator (menu_item, "clicked", priv->accel_group,
+ gtk_widget_add_accelerator (menu_item, "activate", priv->accel_group,
accel_key, accel_mods, 0);
}
- if (priv->menu) {
- gtk_menu_shell_append (GTK_MENU (priv->menu), menu_item);
- } else {
- gtk_widget_destroy (menu_item);
- }
+ modest_window_add_item_to_menu (MODEST_WINDOW (self), menu_item, dimming_callback);
}
static void
static void
modest_shell_window_add_toolbar (ModestWindow *self,
- GtkToolbar *toolbar)
+ GtkToolbar *toolbar)
{
- gtk_box_pack_end (GTK_BOX (self), toolbar, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (self), GTK_WIDGET (toolbar), FALSE, FALSE, 0);
}
static void
ModestShellWindowPrivate *priv = NULL;
priv = MODEST_SHELL_WINDOW_GET_PRIVATE (self);
- modest_shell_set_title (MODEST_SHELL (priv->shell),
- MODEST_WINDOW (self),
- title);
+ if (priv->title)
+ g_free (priv->title);
+ priv->title = g_strdup (title);
+ if (priv->shell) {
+ modest_shell_set_title (MODEST_SHELL (priv->shell),
+ MODEST_WINDOW (self),
+ title);
+ }
}
static void
modest_shell_window_show_progress (ModestWindow *self,
gboolean show)
{
+ ModestShellWindowPrivate *priv = NULL;
+
+ priv = MODEST_SHELL_WINDOW_GET_PRIVATE (self);
modest_shell_show_progress (MODEST_SHELL (priv->shell),
self,
show);
priv = MODEST_SHELL_WINDOW_GET_PRIVATE (self);
if (priv->shell) {
+ if (priv->accel_group) {
+ gtk_window_remove_accel_group (GTK_WINDOW (priv->shell), priv->accel_group);
+ }
modest_shell_delete_window (MODEST_SHELL (shell), MODEST_WINDOW (self));
g_object_unref (priv->shell);
}
priv->shell = g_object_ref (shell);
+ modest_shell_set_title (MODEST_SHELL (priv->shell),
+ MODEST_WINDOW (self),
+ priv->title);
+ if (priv->accel_group)
+ gtk_window_add_accel_group (GTK_WINDOW (priv->shell), priv->accel_group);
}
GtkWidget *