X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-dimming-rules-group.c;h=9f7483756ba3d362fc6bc20b755fdd507d589494;hp=af23b007a83cc2ab4372dc80a13b036288074e6b;hb=74e08db4fa22d92bdd87f31bde34b076248ece1e;hpb=17e149470f77d037df836438e6f3fe00fc632b20 diff --git a/src/modest-dimming-rules-group.c b/src/modest-dimming-rules-group.c index af23b00..9f74837 100644 --- a/src/modest-dimming-rules-group.c +++ b/src/modest-dimming-rules-group.c @@ -31,19 +31,27 @@ #include "modest-dimming-rules-group-priv.h" #include "modest-dimming-rule.h" #include "modest-platform.h" +#include "modest-ui-dimming-rules.h" static void modest_dimming_rules_group_class_init (ModestDimmingRulesGroupClass *klass); static void modest_dimming_rules_group_init (ModestDimmingRulesGroup *obj); static void modest_dimming_rules_group_finalize (GObject *obj); +#ifdef MODEST_PLATFORM_MAEMO static void _insensitive_press_callback (GtkWidget *widget, gpointer user_data); +#endif +static void _add_rule (ModestDimmingRulesGroup *self, + ModestDimmingRule *rule, + ModestWindow *window); typedef struct _ModestDimmingRulesGroupPrivate ModestDimmingRulesGroupPrivate; struct _ModestDimmingRulesGroupPrivate { + ModestWindow *window; gchar *name; gboolean notifications_enabled; GHashTable *rules_map; + GSList *widget_rules; }; @@ -55,9 +63,7 @@ struct _ModestDimmingRulesGroupPrivate { static GObjectClass *parent_class = NULL; static void _execute_dimming_rule (gpointer key, gpointer value, gpointer user_data); -static void _insensitive_press_callback (GtkWidget *widget, gpointer user_data); - - +static void _execute_widget_dimming_rule (gpointer data, gpointer user_data); GType modest_dimming_rules_group_get_type (void) @@ -103,10 +109,13 @@ modest_dimming_rules_group_init (ModestDimmingRulesGroup *obj) priv = MODEST_DIMMING_RULES_GROUP_GET_PRIVATE(obj); priv->name = NULL; + priv->window = NULL; + priv->notifications_enabled = FALSE; priv->rules_map = g_hash_table_new_full ((GHashFunc) g_str_hash, (GEqualFunc) g_str_equal, (GDestroyNotify) g_free, (GDestroyNotify) g_object_unref); + priv->widget_rules = NULL; } static void @@ -122,6 +131,9 @@ modest_dimming_rules_group_finalize (GObject *obj) if (priv->rules_map != NULL) g_hash_table_destroy (priv->rules_map); + if (priv->widget_rules != NULL) + g_slist_foreach (priv->widget_rules, (GFunc) g_object_unref, NULL); + G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -157,11 +169,70 @@ modest_dimming_rules_group_get_name (ModestDimmingRulesGroup *self) return g_strdup (priv->name); } +static void +_add_rule (ModestDimmingRulesGroup *self, + ModestDimmingRule *rule, + ModestWindow *window) +{ + ModestDimmingRulesGroupPrivate *priv; + GtkWidget *widget = NULL; + const gchar *action_path = NULL; + + g_return_if_fail (MODEST_IS_DIMMING_RULES_GROUP(self)); + g_return_if_fail (MODEST_IS_WINDOW(window)); + g_return_if_fail (MODEST_IS_DIMMING_RULE (rule)); + + priv = MODEST_DIMMING_RULES_GROUP_GET_PRIVATE(self); + + /* Set window to process dimming rules */ + priv->window = MODEST_WINDOW (window); + + widget = modest_dimming_rule_get_widget (rule); +#ifdef MODEST_PLATFORM_MAEMO + /* Connect insensitive-presss handler to show notifications */ + g_signal_connect (G_OBJECT (widget), "insensitive-press", + G_CALLBACK (_insensitive_press_callback), + rule); +#endif + /* Register new dimming rule */ + modest_dimming_rule_set_group (rule, self); + action_path = modest_dimming_rule_get_action_path (rule); + if (action_path) + g_hash_table_insert (priv->rules_map, g_strdup(action_path), rule); + else + priv->widget_rules = g_slist_prepend (priv->widget_rules, rule); +} + +void +modest_dimming_rules_group_add_widget_rule (ModestDimmingRulesGroup *self, + GtkWidget *widget, + GCallback callback, + ModestWindow *window) +{ + ModestDimmingRulesGroupPrivate *priv; + ModestDimmingRule *dim_rule = NULL; + + g_return_if_fail (MODEST_IS_DIMMING_RULES_GROUP(self)); + g_return_if_fail (GTK_IS_WIDGET (widget)); + g_return_if_fail (MODEST_IS_WINDOW(window)); + + priv = MODEST_DIMMING_RULES_GROUP_GET_PRIVATE(self); + + /* Set window to process dimming rules */ + priv->window = MODEST_WINDOW (window); + + dim_rule = modest_dimming_rule_new_from_widget (priv->window, + (ModestDimmingCallback) callback, + widget); + + _add_rule (self, dim_rule, window); +} + void modest_dimming_rules_group_add_rules (ModestDimmingRulesGroup *self, const ModestDimmingEntry modest_dimming_entries[], guint n_elements, - gpointer user_data) + ModestWindow *window) { ModestDimmingRulesGroupPrivate *priv; ModestDimmingRule *dim_rule = NULL; @@ -173,10 +244,14 @@ modest_dimming_rules_group_add_rules (ModestDimmingRulesGroup *self, g_return_if_fail (MODEST_IS_DIMMING_RULES_GROUP(self)); g_return_if_fail (modest_dimming_entries != NULL); g_return_if_fail (n_elements > 0); - g_return_if_fail (MODEST_IS_WINDOW(user_data)); + g_return_if_fail (MODEST_IS_WINDOW(window)); priv = MODEST_DIMMING_RULES_GROUP_GET_PRIVATE(self); + /* Set window to process dimming rules */ + priv->window = MODEST_WINDOW (window); + + /* Add dimming rules */ for (i=0; i < n_elements; i++) { entry = modest_dimming_entries[i]; @@ -189,22 +264,15 @@ modest_dimming_rules_group_add_rules (ModestDimmingRulesGroup *self, if (!unique) continue; /* Check action path is valid */ - widget = modest_window_get_action_widget (MODEST_WINDOW (user_data), entry.action_path); + widget = modest_window_get_action_widget (MODEST_WINDOW (window), entry.action_path); if (widget == NULL) continue; /* Create a new dimming rule */ - dim_rule = modest_dimming_rule_new (MODEST_WINDOW(user_data), + dim_rule = modest_dimming_rule_new (priv->window, (ModestDimmingCallback) entry.callback, entry.action_path); - - /* Connect insensitive-presss handler to show notifications */ - g_signal_connect (G_OBJECT (widget), "insensitive-press", - G_CALLBACK (_insensitive_press_callback), - dim_rule); - - /* Register new dimming rule */ - modest_dimming_rule_set_group (dim_rule, self); - g_hash_table_insert (priv->rules_map, g_strdup(entry.action_path), dim_rule); + + _add_rule (self, dim_rule, window); } } @@ -223,11 +291,21 @@ void modest_dimming_rules_group_execute (ModestDimmingRulesGroup *self) { ModestDimmingRulesGroupPrivate *priv; + DimmedState *state = NULL; g_return_if_fail (MODEST_IS_DIMMING_RULES_GROUP(self)); priv = MODEST_DIMMING_RULES_GROUP_GET_PRIVATE(self); + /* Init dimming rules init data */ + state = modest_ui_dimming_rules_define_dimming_state (priv->window); + modest_window_set_dimming_state (priv->window, state); + + /* execute group dimming rules */ g_hash_table_foreach (priv->rules_map, _execute_dimming_rule, NULL); + g_slist_foreach (priv->widget_rules, (GFunc) _execute_widget_dimming_rule, NULL); + + /* Free dimming ruls init data */ + modest_window_set_dimming_state (priv->window, NULL); } @@ -241,6 +319,16 @@ _execute_dimming_rule (gpointer key, gpointer value, gpointer user_data) } static void +_execute_widget_dimming_rule (gpointer data, gpointer user_data) +{ + g_return_if_fail (MODEST_IS_DIMMING_RULE (data)); + + /* Process dimming rule */ + modest_dimming_rule_process (MODEST_DIMMING_RULE(data)); +} + +#ifdef MODEST_PLATFORM_MAEMO +static void _insensitive_press_callback (GtkWidget *widget, gpointer user_data) { ModestDimmingRulesGroup *group = NULL; @@ -270,3 +358,4 @@ _insensitive_press_callback (GtkWidget *widget, gpointer user_data) if (notification != NULL) g_free(notification); } +#endif