#include "empathy-irc-network-dialog.h"
#include "empathy-ui-utils.h"
+#include "empathy-live-search.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
#include <libempathy/empathy-debug.h>
PROP_NETWORK
};
+enum {
+ RESPONSE_RESET = 0
+};
+
typedef struct {
EmpathyAccountSettings *settings;
EmpathyIrcNetwork *network;
GtkWidget *treeview;
GtkListStore *store;
+ GtkTreeModelFilter *filter;
+ GtkWidget *search;
+ GtkWidget *select_button;
+
+ gulong search_sig;
+ gulong activate_sig;
} EmpathyIrcNetworkChooserDialogPriv;
enum {
}
}
+/* The iter returned by *it is a priv->store iter (not a filter one) */
static EmpathyIrcNetwork *
dup_selected_network (EmpathyIrcNetworkChooserDialog *self,
GtkTreeIter *it)
GtkTreeModel *model;
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
- gtk_tree_selection_get_selected (selection, &model, &iter);
+ if (selection == NULL)
+ return NULL;
+
+ if (!gtk_tree_selection_get_selected (selection, &model, &iter))
+ return NULL;
gtk_tree_model_get (model, &iter, COL_NETWORK_OBJ, &network, -1);
g_assert (network != NULL);
if (it != NULL)
- *it = iter;
+ {
+ gtk_tree_model_filter_convert_iter_to_child_iter (priv->filter, it,
+ &iter);
+ }
return network;
}
network = dup_selected_network (self, NULL);
if (network == priv->network)
{
- g_object_unref (network);
+ g_clear_object (&network);
return;
}
priv->changed = TRUE;
}
+/* Take a filter iterator as argument */
static void
scroll_to_iter (EmpathyIrcNetworkChooserDialog *self,
- GtkTreeIter *iter)
+ GtkTreeIter *filter_iter)
{
EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
GtkTreePath *path;
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (priv->store), iter);
+ path = gtk_tree_model_get_path (GTK_TREE_MODEL (priv->filter), filter_iter);
if (path != NULL)
{
}
}
+/* Take a filter iterator as argument */
static void
select_iter (EmpathyIrcNetworkChooserDialog *self,
- GtkTreeIter *iter,
+ GtkTreeIter *filter_iter,
gboolean emulate_changed)
{
EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
GtkTreeSelection *selection;
+ GtkTreePath *path;
/* Select the network */
selection = gtk_tree_view_get_selection (
GTK_TREE_VIEW (priv->treeview));
- gtk_tree_selection_select_iter (selection, iter);
+ gtk_tree_selection_select_iter (selection, filter_iter);
+
+ path = gtk_tree_model_get_path (GTK_TREE_MODEL (priv->filter), filter_iter);
+ if (path != NULL)
+ {
+ gtk_tree_view_set_cursor (GTK_TREE_VIEW (priv->treeview), path,
+ NULL, FALSE);
+
+ gtk_tree_path_free (path);
+ }
/* Scroll to the selected network */
- scroll_to_iter (self, iter);
+ scroll_to_iter (self, filter_iter);
if (emulate_changed)
{
}
}
+static GtkTreeIter
+iter_to_filter_iter (EmpathyIrcNetworkChooserDialog *self,
+ GtkTreeIter *iter)
+{
+ EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
+ GtkTreeIter filter_iter;
+
+ g_assert (gtk_tree_model_filter_convert_child_iter_to_iter (priv->filter,
+ &filter_iter, iter));
+
+ return filter_iter;
+}
+
static void
fill_store (EmpathyIrcNetworkChooserDialog *self)
{
for (l = networks; l != NULL; l = g_slist_next (l))
{
- gchar *name;
EmpathyIrcNetwork *network = l->data;
GtkTreeIter iter;
- g_object_get (network, "name", &name, NULL);
-
gtk_list_store_insert_with_values (priv->store, &iter, -1,
COL_NETWORK_OBJ, network,
- COL_NETWORK_NAME, name,
+ COL_NETWORK_NAME, empathy_irc_network_get_name (network),
-1);
if (network == priv->network)
- select_iter (self, &iter, FALSE);
+ {
+ GtkTreeIter filter_iter = iter_to_filter_iter (self, &iter);
+
+ select_iter (self, &filter_iter, FALSE);
+ }
- g_free (name);
g_object_unref (network);
}
{
EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
EmpathyIrcNetwork *network;
- gchar *name;
- GtkTreeIter iter;
+ GtkTreeIter iter, filter_iter;
+
+ priv->changed = TRUE;
network = dup_selected_network (self, &iter);
+ if (network == NULL)
+ return;
/* name could be changed */
- g_object_get (network, "name", &name, NULL);
gtk_list_store_set (GTK_LIST_STORE (priv->store), &iter,
- COL_NETWORK_NAME, name, -1);
+ COL_NETWORK_NAME, empathy_irc_network_get_name (network), -1);
- scroll_to_iter (self, &iter);
+ filter_iter = iter_to_filter_iter (self, &iter);
+ scroll_to_iter (self, &filter_iter);
- priv->changed = TRUE;
+ gtk_widget_grab_focus (priv->treeview);
g_object_unref (network);
- g_free (name);
}
static void
EmpathyIrcNetwork *network;
network = dup_selected_network (self, NULL);
+ if (network == NULL)
+ return;
+
display_irc_network_dialog (self, network);
g_object_unref (network);
{
EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
EmpathyIrcNetwork *network;
- gchar *name;
- GtkTreeIter iter;
+ GtkTreeIter iter, filter_iter;
+
+ gtk_widget_hide (priv->search);
network = empathy_irc_network_new (_("New Network"));
empathy_irc_network_manager_add (priv->network_manager, network);
- g_object_get (network, "name", &name, NULL);
-
gtk_list_store_insert_with_values (priv->store, &iter, -1,
COL_NETWORK_OBJ, network,
- COL_NETWORK_NAME, name,
+ COL_NETWORK_NAME, empathy_irc_network_get_name (network),
-1);
- select_iter (self, &iter, TRUE);
+ filter_iter = iter_to_filter_iter (self, &iter);
+ select_iter (self, &filter_iter, TRUE);
display_irc_network_dialog (self, network);
- g_free (name);
g_object_unref (network);
}
EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
EmpathyIrcNetwork *network;
GtkTreeIter iter;
- gchar *name;
network = dup_selected_network (self, &iter);
+ if (network == NULL)
+ return;
- g_object_get (network, "name", &name, NULL);
- DEBUG ("Remove network %s", name);
+ /* Hide the search after picking the network to get the right one */
+ gtk_widget_hide (priv->search);
- gtk_list_store_remove (priv->store, &iter);
- empathy_irc_network_manager_remove (priv->network_manager, network);
+ DEBUG ("Remove network %s", empathy_irc_network_get_name (network));
+
+ /* Delete network and select next network */
+ if (gtk_list_store_remove (priv->store, &iter))
+ {
+ GtkTreeIter filter_iter = iter_to_filter_iter (self, &iter);
+
+ select_iter (self, &filter_iter, TRUE);
+ }
+ else
+ {
+ /* this should only happen if the last network was deleted */
+ GtkTreeIter last, filter_iter;
+ gint n_elements;
+
+ n_elements = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (priv->store),
+ NULL);
- /* Select next network */
- if (gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->store), &iter))
- select_iter (self, &iter, TRUE);
+ if (n_elements > 0)
+ {
+ gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (priv->store), &last,
+ NULL, (n_elements-1));
+ filter_iter = iter_to_filter_iter (self, &last);
+
+ select_iter (self, &filter_iter, TRUE);
+ }
+ }
+
+ empathy_irc_network_manager_remove (priv->network_manager, network);
+ gtk_widget_grab_focus (priv->treeview);
- g_free (name);
g_object_unref (network);
}
+static void
+reset_networks (EmpathyIrcNetworkChooserDialog *self)
+{
+ EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
+ GSList *networks, *l;
+
+ networks = empathy_irc_network_manager_get_dropped_networks (
+ priv->network_manager);
+
+ for (l = networks; l != NULL; l = g_slist_next (l))
+ {
+ EmpathyIrcNetwork *network;
+ GtkTreeIter iter;
+
+ network = EMPATHY_IRC_NETWORK (l->data);
+ empathy_irc_network_activate (network);
+
+ gtk_list_store_insert_with_values (priv->store, &iter, -1,
+ COL_NETWORK_OBJ, network,
+ COL_NETWORK_NAME, empathy_irc_network_get_name (network),
+ -1);
+ }
+
+ g_slist_foreach (networks, (GFunc) g_object_unref, NULL);
+}
+
static void
dialog_response_cb (GtkDialog *dialog,
gint response,
edit_network (self);
else if (response == GTK_RESPONSE_REJECT)
remove_network (self);
+ else if (response == RESPONSE_RESET)
+ reset_networks (self);
+}
+
+static gboolean
+filter_visible_func (GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer user_data)
+{
+ EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (user_data);
+ EmpathyIrcNetwork *network;
+ gboolean visible;
+
+ gtk_tree_model_get (model, iter, COL_NETWORK_OBJ, &network, -1);
+
+ visible = empathy_live_search_match (EMPATHY_LIVE_SEARCH (priv->search),
+ empathy_irc_network_get_name (network));
+
+ g_object_unref (network);
+ return visible;
+}
+
+static void
+search_activate_cb (GtkWidget *search,
+ EmpathyIrcNetworkChooserDialog *self)
+{
+ gtk_widget_hide (search);
+ gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_CLOSE);
+}
+
+static void
+search_text_notify_cb (EmpathyLiveSearch *search,
+ GParamSpec *pspec,
+ EmpathyIrcNetworkChooserDialog *self)
+{
+ EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
+ GtkTreeIter filter_iter;
+ gboolean sensitive = FALSE;
+
+ gtk_tree_model_filter_refilter (priv->filter);
+
+ /* Is there at least one network in the view ? */
+ if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->filter),
+ &filter_iter))
+ {
+ const gchar *text;
+
+ text = empathy_live_search_get_text (EMPATHY_LIVE_SEARCH (priv->search));
+ if (!EMP_STR_EMPTY (text))
+ {
+ /* We are doing a search, select the first matching network */
+ select_iter (self, &filter_iter, TRUE);
+ }
+ else
+ {
+ /* Search has been cancelled. Scroll to the selected network */
+ GtkTreeSelection *selection;
+
+ selection = gtk_tree_view_get_selection (
+ GTK_TREE_VIEW (priv->treeview));
+
+ if (gtk_tree_selection_get_selected (selection, NULL, &filter_iter))
+ scroll_to_iter (self, &filter_iter);
+ }
+
+ sensitive = TRUE;
+ }
+
+ gtk_widget_set_sensitive (priv->select_button, sensitive);
+}
+
+static void
+dialog_destroy_cb (GtkWidget *widget,
+ EmpathyIrcNetworkChooserDialog *self)
+{
+ EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
+
+ g_signal_handler_disconnect (priv->search, priv->search_sig);
+ g_signal_handler_disconnect (priv->search, priv->activate_sig);
}
static void
g_assert (priv->settings != NULL);
- gtk_window_set_title (GTK_WINDOW (self), _("IRC Networks"));
+ gtk_window_set_title (GTK_WINDOW (self), _("Choose an IRC network"));
/* Create store and treeview */
priv->store = gtk_list_store_new (2, G_TYPE_OBJECT, G_TYPE_STRING);
COL_NETWORK_NAME,
GTK_SORT_ASCENDING);
- priv->treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (priv->store));
+ priv->treeview = gtk_tree_view_new ();
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (priv->treeview), FALSE);
gtk_tree_view_set_enable_search (GTK_TREE_VIEW (priv->treeview), FALSE);
gtk_container_add (GTK_CONTAINER (scroll), priv->treeview);
gtk_box_pack_start (GTK_BOX (vbox), scroll, TRUE, TRUE, 6);
+ /* Live search */
+ priv->search = empathy_live_search_new (priv->treeview);
+
+ gtk_box_pack_start (GTK_BOX (vbox), priv->search, FALSE, TRUE, 0);
+
+ priv->filter = GTK_TREE_MODEL_FILTER (gtk_tree_model_filter_new (
+ GTK_TREE_MODEL (priv->store), NULL));
+ gtk_tree_model_filter_set_visible_func (priv->filter,
+ filter_visible_func, self, NULL);
+
+ gtk_tree_view_set_model (GTK_TREE_VIEW (priv->treeview),
+ GTK_TREE_MODEL (priv->filter));
+
+ priv->search_sig = g_signal_connect (priv->search, "notify::text",
+ G_CALLBACK (search_text_notify_cb), self);
+
+ priv->activate_sig = g_signal_connect (priv->search, "activate",
+ G_CALLBACK (search_activate_cb), self);
+
/* Add buttons */
gtk_dialog_add_buttons (dialog,
GTK_STOCK_ADD, GTK_RESPONSE_OK,
GTK_STOCK_EDIT, GTK_RESPONSE_APPLY,
GTK_STOCK_REMOVE, GTK_RESPONSE_REJECT,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+ _("Reset _Networks List"), RESPONSE_RESET,
NULL);
+ priv->select_button = gtk_dialog_add_button (dialog,
+ C_("verb displayed on a button to select an IRC network", "Select"),
+ GTK_RESPONSE_CLOSE);
+
fill_store (self);
g_signal_connect (priv->treeview, "cursor-changed",
g_signal_connect (self, "response",
G_CALLBACK (dialog_response_cb), self);
+ g_signal_connect (self, "destroy",
+ G_CALLBACK (dialog_destroy_cb), self);
/* Request a side ensuring to display at least some networks */
gtk_widget_set_size_request (GTK_WIDGET (self), -1, 300);
+
+ gtk_window_set_modal (GTK_WINDOW (self), TRUE);
}
static void
tp_clear_object (&priv->network);
tp_clear_object (&priv->network_manager);
tp_clear_object (&priv->store);
+ tp_clear_object (&priv->filter);
if (G_OBJECT_CLASS (empathy_irc_network_chooser_dialog_parent_class)->dispose)
G_OBJECT_CLASS (empathy_irc_network_chooser_dialog_parent_class)->dispose (object);
GtkWidget *
empathy_irc_network_chooser_dialog_new (EmpathyAccountSettings *settings,
- EmpathyIrcNetwork *network)
+ EmpathyIrcNetwork *network,
+ GtkWindow *parent)
{
return g_object_new (EMPATHY_TYPE_IRC_NETWORK_CHOOSER_DIALOG,
"settings", settings,
"network", network,
+ "transient-for", parent,
NULL);
}
projects / empathy.git / blobdiff