From: Jose Dapena Paz Date: Wed, 11 Feb 2009 13:36:33 +0000 (+0000) Subject: Show "no accounts" in accounts window if no accounts defined (fixes NB#101354). X-Git-Tag: git_migration_finished~613 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=acca9cd9c2046b5712042221d2fe2095454a7b34 Show "no accounts" in accounts window if no accounts defined (fixes NB#101354). pmo-trunk-r7460 --- diff --git a/src/hildon2/modest-accounts-window.c b/src/hildon2/modest-accounts-window.c index a9f9e59..ab3671c 100644 --- a/src/hildon2/modest-accounts-window.c +++ b/src/hildon2/modest-accounts-window.c @@ -66,12 +66,20 @@ static gboolean _modest_accounts_window_map_event (GtkWidget *widget, GdkEvent *event, gpointer userdata); static void update_progress_hint (ModestAccountsWindow *self); - +static void on_row_inserted (GtkTreeModel *tree_model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer user_data); +static void on_row_deleted (GtkTreeModel *tree_model, + GtkTreePath *path, + gpointer user_data); +static void row_count_changed (ModestAccountsWindow *self); typedef struct _ModestAccountsWindowPrivate ModestAccountsWindowPrivate; struct _ModestAccountsWindowPrivate { GtkWidget *account_view; + GtkWidget *no_accounts_label; /* signals */ GSList *sighandlers; @@ -171,6 +179,7 @@ static void connect_signals (ModestAccountsWindow *self) { ModestAccountsWindowPrivate *priv; + GtkTreeModel *model; priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE(self); @@ -186,6 +195,20 @@ connect_signals (ModestAccountsWindow *self) "progress-list-changed", G_CALLBACK (on_progress_list_changed), self); + model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->account_view)); + + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (model), + "row-inserted", + G_CALLBACK (on_row_inserted), self); + + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (model), + "row-deleted", + G_CALLBACK (on_row_deleted), self); + /* we don't register this in sighandlers, as it should be run * after disconnecting all signals, in destroy stage */ } @@ -198,20 +221,29 @@ modest_accounts_window_new (void) HildonProgram *app; GdkPixbuf *window_icon; GtkWidget *pannable; + GtkWidget *box; self = MODEST_ACCOUNTS_WINDOW(g_object_new(MODEST_TYPE_ACCOUNTS_WINDOW, NULL)); priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE(self); + box = gtk_vbox_new (FALSE, 0); + + priv->no_accounts_label = gtk_label_new (_("mcen_ia_noaccounts")); + gtk_misc_set_alignment (GTK_MISC (priv->no_accounts_label), 0.5, 0.0); + gtk_box_pack_start (GTK_BOX (box), priv->no_accounts_label, TRUE, TRUE, 0); + pannable = hildon_pannable_area_new (); priv->account_view = GTK_WIDGET (modest_account_view_new (modest_runtime_get_account_mgr ())); setup_menu (self); gtk_container_add (GTK_CONTAINER (pannable), priv->account_view); - gtk_container_add (GTK_CONTAINER (self), pannable); + gtk_box_pack_start (GTK_BOX (box), pannable, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (self), box); gtk_widget_show (priv->account_view); gtk_widget_show (pannable); + gtk_widget_show (box); connect_signals (MODEST_ACCOUNTS_WINDOW (self)); @@ -243,6 +275,8 @@ modest_accounts_window_new (void) G_OBJECT (self)); update_progress_hint (self); + row_count_changed (self); + return MODEST_WINDOW(self); } @@ -348,3 +382,48 @@ on_progress_list_changed (ModestWindowMgr *mgr, { update_progress_hint (self); } + +static void +on_row_inserted (GtkTreeModel *tree_model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer user_data) +{ + ModestAccountsWindow *self; + + self = (ModestAccountsWindow *) user_data; + + row_count_changed (self); +} + +static void +on_row_deleted (GtkTreeModel *tree_model, + GtkTreePath *path, + gpointer user_data) +{ + ModestAccountsWindow *self; + + self = (ModestAccountsWindow *) user_data; + + row_count_changed (self); +} + +static void row_count_changed (ModestAccountsWindow *self) +{ + ModestAccountsWindowPrivate *priv; + GtkTreeModel *model; + gint count; + + priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE (self); + model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->account_view)); + + count = gtk_tree_model_iter_n_children (model, NULL); + + if (count == 0) { + gtk_widget_hide (priv->account_view); + gtk_widget_show (priv->no_accounts_label); + } else { + gtk_widget_hide (priv->no_accounts_label); + gtk_widget_show (priv->account_view); + } +}