X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-hildon2-window.c;h=944173859923a39a896ca5f3e2e8fdae4b213dbb;hb=d3152f5a6ea0f939f9535fd8024538d95f14b588;hp=0888f5a0c302e15043ebd55dd3e8c35eebe42034;hpb=c166d31d376325f89ba36dae8123103a946a5fae;p=modest diff --git a/src/hildon2/modest-hildon2-window.c b/src/hildon2/modest-hildon2-window.c index 0888f5a..9441738 100644 --- a/src/hildon2/modest-hildon2-window.c +++ b/src/hildon2/modest-hildon2-window.c @@ -30,6 +30,7 @@ #include #include #include +#include "modest-marshal.h" #include #include #include @@ -37,6 +38,7 @@ #include #include #include +#include "modest-text-utils.h" #include typedef struct _EditModeRegister { @@ -50,7 +52,7 @@ typedef struct _EditModeRegister { /* 'private'/'protected' functions */ static void modest_hildon2_window_class_init (gpointer klass, gpointer class_data); static void modest_hildon2_window_instance_init (GTypeInstance *instance, gpointer g_class); -static void modest_hildon2_window_finalize (GObject *obj); +static void modest_hildon2_window_dispose (GObject *obj); static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window); static void setup_menu (ModestHildon2Window *self); @@ -79,6 +81,7 @@ struct _ModestHildon2WindowPrivate { GtkWidget *app_menu; ModestDimmingRulesGroup *app_menu_dimming_group; + GtkAccelGroup *accel_group; /* Edit mode support */ gboolean edit_mode; @@ -91,9 +94,18 @@ struct _ModestHildon2WindowPrivate { MODEST_TYPE_HILDON2_WINDOW, \ ModestHildon2WindowPrivate)) +/* list my signals */ +enum { + EDIT_MODE_CHANGED_SIGNAL, + LAST_SIGNAL +}; + /* globals */ static GtkWindowClass *parent_class = NULL; +/* uncomment the following if you have defined any signals */ +static guint signals[LAST_SIGNAL] = {0}; + /************************************************************************/ GType @@ -130,7 +142,16 @@ modest_hildon2_window_class_init (gpointer klass, gpointer class_data) ModestHildon2WindowClass *modest_hildon2_window_class = (ModestHildon2WindowClass *) klass; parent_class = g_type_class_peek_parent (klass); - gobject_class->finalize = modest_hildon2_window_finalize; + gobject_class->dispose = modest_hildon2_window_dispose; + + signals[EDIT_MODE_CHANGED_SIGNAL] = + g_signal_new ("edit-mode-changed", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (ModestHildon2WindowClass, edit_mode_changed), + NULL, NULL, + modest_marshal_VOID__INT_BOOLEAN, + G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_BOOLEAN); g_type_class_add_private (gobject_class, sizeof(ModestHildon2WindowPrivate)); @@ -144,19 +165,23 @@ modest_hildon2_window_class_init (gpointer klass, gpointer class_data) } static void -modest_hildon2_window_finalize (GObject *obj) +modest_hildon2_window_dispose (GObject *obj) { ModestHildon2WindowPrivate *priv; priv = MODEST_HILDON2_WINDOW_GET_PRIVATE(obj); - g_object_unref (priv->app_menu_dimming_group); - priv->app_menu_dimming_group = NULL; + if (priv->app_menu_dimming_group) { + g_object_unref (priv->app_menu_dimming_group); + priv->app_menu_dimming_group = NULL; + } - g_hash_table_destroy (priv->edit_mode_registry); - priv->edit_mode_registry = NULL; + if (priv->edit_mode_registry) { + g_hash_table_unref (priv->edit_mode_registry); + priv->edit_mode_registry = NULL; + } - G_OBJECT_CLASS(parent_class)->finalize (obj); + G_OBJECT_CLASS(parent_class)->dispose (obj); } static void @@ -170,15 +195,18 @@ modest_hildon2_window_instance_init (GTypeInstance *instance, gpointer g_class) parent_priv = MODEST_WINDOW_GET_PRIVATE (self); priv = MODEST_HILDON2_WINDOW_GET_PRIVATE (self); + priv->accel_group = gtk_accel_group_new (); + priv->edit_mode = FALSE; priv->edit_toolbar = NULL; priv->current_edit_tree_view = NULL; - priv->edit_command = -1; + priv->edit_command = MODEST_HILDON2_WINDOW_EDIT_MODE_NONE; priv->edit_mode_registry = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, edit_mode_register_destroy); parent_priv->ui_dimming_manager = modest_ui_dimming_manager_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); setup_menu (self); @@ -197,9 +225,8 @@ on_zoom_minus_plus_not_implemented (ModestWindow *window) { g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW (window), FALSE); - hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_cannot_zoom_here")); + hildon_banner_show_information (NULL, NULL, _CS("ckct_ib_cannot_zoom_here")); return FALSE; - } static void @@ -209,7 +236,7 @@ modest_hildon2_window_pack_toolbar_not_implemented (ModestHildon2Window *self, { g_return_if_fail (MODEST_IS_HILDON2_WINDOW (self)); - g_warning ("%s not implemented", __FUNCTION__); + g_debug ("%s not implemented", __FUNCTION__); } void @@ -233,17 +260,22 @@ modest_hildon2_window_add_button_to_menu (ModestHildon2Window *self, g_return_if_fail (GTK_IS_BUTTON (button)); priv = MODEST_HILDON2_WINDOW_GET_PRIVATE (self); + modest_ui_dimming_manager_set_widget_dimming_mode (GTK_WIDGET (button), + MODEST_UI_DIMMING_MODE_HIDE); + if (dimming_callback) modest_dimming_rules_group_add_widget_rule (priv->app_menu_dimming_group, GTK_WIDGET (button), (GCallback) dimming_callback, MODEST_WINDOW (self)); hildon_app_menu_append (HILDON_APP_MENU (priv->app_menu), GTK_BUTTON (button)); + gtk_widget_show (GTK_WIDGET (button)); } void modest_hildon2_window_add_to_menu (ModestHildon2Window *self, gchar *label, + const gchar *accelerator, ModestHildon2AppMenuCallback callback, ModestDimmingCallback dimming_callback) { @@ -260,6 +292,15 @@ modest_hildon2_window_add_to_menu (ModestHildon2Window *self, g_signal_connect_after (G_OBJECT (button), "clicked", 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 (button, "clicked", priv->accel_group, + accel_key, accel_mods, 0); + } + modest_hildon2_window_add_button_to_menu (self, GTK_BUTTON (button), dimming_callback); } @@ -360,7 +401,18 @@ modest_hildon2_window_set_edit_mode (ModestHildon2Window *self, selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->current_edit_tree_view)); gtk_tree_selection_set_mode (selection, reg->mode); - gtk_tree_selection_unselect_all (selection); + if (reg->mode == GTK_SELECTION_SINGLE || reg->mode == GTK_SELECTION_BROWSE) { + GtkTreeModel *model; + GtkTreeIter iter; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->current_edit_tree_view)); + if (gtk_tree_model_get_iter_first (model, &iter)) { + gtk_tree_view_scroll_to_point (GTK_TREE_VIEW (priv->current_edit_tree_view), 0, 0); + gtk_tree_selection_select_iter (selection, &iter); + } + } else { + gtk_tree_selection_unselect_all (selection); + } priv->edit_toolbar = hildon_edit_toolbar_new (); hildon_edit_toolbar_set_label (HILDON_EDIT_TOOLBAR (priv->edit_toolbar), @@ -379,6 +431,8 @@ modest_hildon2_window_set_edit_mode (ModestHildon2Window *self, gtk_widget_queue_resize (priv->current_edit_tree_view); gtk_window_fullscreen (GTK_WINDOW (self)); + g_signal_emit (G_OBJECT (self), signals[EDIT_MODE_CHANGED_SIGNAL], 0, + priv->edit_command, priv->edit_mode); } void @@ -396,7 +450,6 @@ modest_hildon2_window_unset_edit_mode (ModestHildon2Window *self) if (priv->edit_mode) { priv->edit_mode = FALSE; - priv->edit_command = -1; if (priv->current_edit_tree_view) { g_object_set (G_OBJECT (priv->current_edit_tree_view), "hildon-ui-mode", HILDON_UI_MODE_NORMAL, @@ -405,6 +458,9 @@ modest_hildon2_window_unset_edit_mode (ModestHildon2Window *self) priv->current_edit_tree_view = NULL; } gtk_window_unfullscreen (GTK_WINDOW (self)); + g_signal_emit (G_OBJECT (self), signals[EDIT_MODE_CHANGED_SIGNAL], 0, + priv->edit_command, priv->edit_mode); + priv->edit_command = MODEST_HILDON2_WINDOW_EDIT_MODE_NONE; } } @@ -448,15 +504,16 @@ edit_toolbar_button_clicked (HildonEditToolbar *toolbar, EditModeRegister *reg; g_return_if_fail (MODEST_IS_HILDON2_WINDOW (self)); - + reg = (EditModeRegister *) g_hash_table_lookup (priv->edit_mode_registry, GINT_TO_POINTER (priv->edit_command)); - if (reg == NULL) - modest_hildon2_window_unset_edit_mode (self); - if ((reg->action == NULL) || reg->action (self)) + if (reg) { + if ((reg->action == NULL) || reg->action (self)) + modest_hildon2_window_unset_edit_mode (self); + } else { modest_hildon2_window_unset_edit_mode (self); - + } } static void @@ -464,7 +521,7 @@ edit_toolbar_arrow_clicked (HildonEditToolbar *toolbar, ModestHildon2Window *self) { g_return_if_fail (MODEST_IS_HILDON2_WINDOW (self)); - + modest_hildon2_window_unset_edit_mode (self); }