/* '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 modest_hildon2_window_show_progress (ModestWindow *window,
+ gboolean show);
static void setup_menu (ModestHildon2Window *self);
static void modest_hildon2_window_show_toolbar (ModestWindow *self,
gboolean show_toolbar);
+static void modest_hildon2_window_add_toolbar (ModestWindow *self,
+ GtkToolbar *toolbar);
+static void modest_hildon2_window_add_to_menu (ModestWindow *window,
+ const gchar *label,
+ const gchar *accelerator,
+ ModestWindowMenuCallback callback,
+ ModestDimmingCallback dimming_callback);
+static void modest_hildon2_window_add_item_to_menu (ModestWindow *window,
+ GtkWidget *item,
+ ModestDimmingCallback dimming_callback);
+static void modest_hildon2_window_set_title (ModestWindow *self,
+ const gchar *title);
static gboolean modest_hildon2_window_toggle_menu (HildonWindow *window,
guint button,
guint32 time);
-static void modest_hildon2_window_pack_toolbar_not_implemented (ModestHildon2Window *self,
- GtkPackType pack_type,
- GtkWidget *toolbar);
static EditModeRegister *edit_mode_register_new (const gchar *description,
const gchar *button_label,
GtkTreeView *tree_view,
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",
modest_window_class->zoom_minus_func = on_zoom_minus_plus_not_implemented;
modest_window_class->zoom_plus_func = on_zoom_minus_plus_not_implemented;
modest_window_class->show_toolbar_func = modest_hildon2_window_show_toolbar;
+ modest_window_class->add_toolbar_func = modest_hildon2_window_add_toolbar;
+ modest_window_class->add_to_menu_func = modest_hildon2_window_add_to_menu;
+ modest_window_class->add_item_to_menu_func = modest_hildon2_window_add_item_to_menu;
+ modest_window_class->set_title_func = modest_hildon2_window_set_title;
+ modest_window_class->show_progress_func = modest_hildon2_window_show_progress;
- modest_hildon2_window_class->pack_toolbar_func = modest_hildon2_window_pack_toolbar_not_implemented;
}
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
hildon_banner_show_information (NULL, NULL, _CS("ckct_ib_cannot_zoom_here"));
return FALSE;
}
-
-static void
-modest_hildon2_window_pack_toolbar_not_implemented (ModestHildon2Window *self,
- GtkPackType pack_type,
- GtkWidget *toolbar)
-{
- g_return_if_fail (MODEST_IS_HILDON2_WINDOW (self));
-
- g_warning ("%s not implemented", __FUNCTION__);
-}
-
-void
-modest_hildon2_window_pack_toolbar (ModestHildon2Window *self,
- GtkPackType pack_type,
- GtkWidget *toolbar)
-{
- g_return_if_fail (MODEST_IS_HILDON2_WINDOW (self));
-
- MODEST_HILDON2_WINDOW_GET_CLASS (self)->pack_toolbar_func (self, pack_type, toolbar);
-}
-
void
-modest_hildon2_window_add_button_to_menu (ModestHildon2Window *self,
- GtkButton *button,
- ModestDimmingCallback dimming_callback)
+modest_hildon2_window_add_item_to_menu (ModestWindow *self,
+ GtkWidget *button,
+ ModestDimmingCallback dimming_callback)
{
ModestHildon2WindowPrivate *priv;
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,
+static void
+modest_hildon2_window_add_to_menu (ModestWindow *self,
+ const gchar *label,
const gchar *accelerator,
- ModestHildon2AppMenuCallback callback,
+ ModestWindowMenuCallback callback,
ModestDimmingCallback dimming_callback)
{
ModestHildon2WindowPrivate *priv = NULL;
accel_key, accel_mods, 0);
}
- modest_hildon2_window_add_button_to_menu (self, GTK_BUTTON (button), dimming_callback);
+ modest_window_add_item_to_menu (MODEST_WINDOW (self), GTK_WIDGET (button), dimming_callback);
}
static void setup_menu (ModestHildon2Window *self)
* doesn't switch toolbar visibility */
}
+static void
+modest_hildon2_window_add_toolbar (ModestWindow *self,
+ GtkToolbar *toolbar)
+{
+ hildon_window_add_toolbar (HILDON_WINDOW (self),
+ toolbar);
+}
+
+static void
+modest_hildon2_window_set_title (ModestWindow *self,
+ const gchar *title)
+{
+ gtk_window_set_title (GTK_WINDOW (self),
+ title);
+}
+
+static void
+modest_hildon2_window_show_progress (ModestWindow *self,
+ gboolean show)
+{
+ hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self),
+ show);
+}
+
void
modest_hildon2_window_register_edit_mode (ModestHildon2Window *self,
gint edit_mode_id,
reg->description);
hildon_edit_toolbar_set_button_label (HILDON_EDIT_TOOLBAR (priv->edit_toolbar),
reg->button_label);
- modest_hildon2_window_pack_toolbar (self, GTK_PACK_START,
- priv->edit_toolbar);
+ modest_window_pack_toolbar (MODEST_WINDOW (self), GTK_PACK_START,
+ priv->edit_toolbar);
g_signal_connect (G_OBJECT (priv->edit_toolbar), "button-clicked",
G_CALLBACK (edit_toolbar_button_clicked), (gpointer) self);
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
ModestHildon2Window *self)
{
g_return_if_fail (MODEST_IS_HILDON2_WINDOW (self));
-
+
modest_hildon2_window_unset_edit_mode (self);
}
projects / modest / blobdiff