#include <stdio.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include <glib.h>
#include <glib/gi18n.h>
#include <libempathy/empathy-tp-roomlist.h>
#include <libempathy/empathy-chatroom.h>
#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-debug.h>
+#include <libempathy/empathy-dispatcher.h>
#include <libempathy-gtk/empathy-account-chooser.h>
#include <libempathy-gtk/empathy-ui-utils.h>
#include "empathy-new-chatroom-dialog.h"
#include "ephy-spinner.h"
-#define DEBUG_DOMAIN "NewChatroomDialog"
+#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
+#include <libempathy/empathy-debug.h>
typedef struct {
EmpathyTpRoomlist *room_list;
GtkWidget *account_chooser;
GtkWidget *label_server;
GtkWidget *entry_server;
- GtkWidget *togglebutton_refresh;
GtkWidget *label_room;
GtkWidget *entry_room;
- GtkWidget *vbox_browse;
- GtkWidget *image_status;
- GtkWidget *label_status;
- GtkWidget *hbox_status;
+ GtkWidget *expander_browse;
GtkWidget *throbber;
GtkWidget *treeview;
GtkTreeModel *model;
} EmpathyNewChatroomDialog;
enum {
+ COL_NEED_PASSWORD,
+ COL_INVITE_ONLY,
COL_NAME,
COL_ROOM,
+ COL_MEMBERS,
+ COL_TOOLTIP,
COL_COUNT
};
EmpathyChatroom *chatroom,
EmpathyNewChatroomDialog *dialog);
static void new_chatroom_dialog_listing_cb (EmpathyTpRoomlist *room_list,
- gboolean listing,
+ gpointer unused,
EmpathyNewChatroomDialog *dialog);
static void new_chatroom_dialog_model_clear (EmpathyNewChatroomDialog *dialog);
static void new_chatroom_dialog_model_row_activated_cb (GtkTreeView *tree_view,
static void new_chatroom_dialog_browse_stop (EmpathyNewChatroomDialog *dialog);
static void new_chatroom_dialog_entry_server_activate_cb (GtkWidget *widget,
EmpathyNewChatroomDialog *dialog);
-static void new_chatroom_dialog_togglebutton_refresh_toggled_cb (GtkWidget *widget,
+static void new_chatroom_dialog_expander_browse_activate_cb (GtkWidget *widget,
+ EmpathyNewChatroomDialog *dialog);
+static gboolean new_chatroom_dialog_entry_server_focus_out_cb (GtkWidget *widget,
+ GdkEventFocus *event,
EmpathyNewChatroomDialog *dialog);
static EmpathyNewChatroomDialog *dialog_p = NULL;
empathy_new_chatroom_dialog_show (GtkWindow *parent)
{
EmpathyNewChatroomDialog *dialog;
- GladeXML *glade;
+ GtkBuilder *gui;
GtkSizeGroup *size_group;
+ gchar *filename;
if (dialog_p) {
gtk_window_present (GTK_WINDOW (dialog_p->window));
dialog_p = dialog = g_new0 (EmpathyNewChatroomDialog, 1);
- glade = empathy_glade_get_file ("empathy-new-chatroom-dialog.glade",
- "new_chatroom_dialog",
- NULL,
+ filename = empathy_file_lookup ("empathy-new-chatroom-dialog.ui", "src");
+ gui = empathy_builder_get_file (filename,
"new_chatroom_dialog", &dialog->window,
"table_info", &dialog->table_info,
"label_account", &dialog->label_account,
"label_room", &dialog->label_room,
"entry_server", &dialog->entry_server,
"entry_room", &dialog->entry_room,
- "togglebutton_refresh", &dialog->togglebutton_refresh,
- "vbox_browse", &dialog->vbox_browse,
- "image_status", &dialog->image_status,
- "label_status", &dialog->label_status,
- "hbox_status", &dialog->hbox_status,
"treeview", &dialog->treeview,
"button_join", &dialog->button_join,
+ "expander_browse", &dialog->expander_browse,
NULL);
+ g_free (filename);
- empathy_glade_connect (glade,
- dialog,
+ empathy_builder_connect (gui, dialog,
"new_chatroom_dialog", "response", new_chatroom_dialog_response_cb,
"new_chatroom_dialog", "destroy", new_chatroom_dialog_destroy_cb,
"entry_server", "changed", new_chatroom_dialog_entry_changed_cb,
"entry_server", "activate", new_chatroom_dialog_entry_server_activate_cb,
+ "entry_server", "focus-out-event", new_chatroom_dialog_entry_server_focus_out_cb,
"entry_room", "changed", new_chatroom_dialog_entry_changed_cb,
- "togglebutton_refresh", "toggled", new_chatroom_dialog_togglebutton_refresh_toggled_cb,
+ "expander_browse", "activate", new_chatroom_dialog_expander_browse_activate_cb,
NULL);
- g_object_unref (glade);
+ g_object_unref (gui);
g_object_add_weak_pointer (G_OBJECT (dialog->window), (gpointer) &dialog_p);
dialog->throbber = ephy_spinner_new ();
ephy_spinner_set_size (EPHY_SPINNER (dialog->throbber), GTK_ICON_SIZE_LARGE_TOOLBAR);
gtk_widget_show (dialog->throbber);
-
- gtk_box_pack_start (GTK_BOX (dialog->hbox_status), dialog->throbber,
- FALSE, FALSE, 0);
+ gtk_table_attach (GTK_TABLE (dialog->table_info),
+ dialog->throbber,
+ 2, 3, 0, 1,
+ 0, 0, 0, 0);
/* Account chooser for custom */
dialog->account_chooser = empathy_account_chooser_new ();
NULL);
gtk_table_attach_defaults (GTK_TABLE (dialog->table_info),
dialog->account_chooser,
- 1, 3, 0, 1);
+ 1, 2, 0, 1);
gtk_widget_show (dialog->account_chooser);
g_signal_connect (GTK_COMBO_BOX (dialog->account_chooser), "changed",
/* Store/Model */
store = gtk_list_store_new (COL_COUNT,
- G_TYPE_STRING, /* Image */
- G_TYPE_STRING, /* Text */
- G_TYPE_STRING); /* Room */
+ G_TYPE_STRING, /* Invite */
+ G_TYPE_STRING, /* Password */
+ G_TYPE_STRING, /* Name */
+ G_TYPE_STRING, /* Room */
+ G_TYPE_STRING, /* Member count */
+ G_TYPE_STRING); /* Tool tip */
dialog->model = GTK_TREE_MODEL (store);
gtk_tree_view_set_model (view, dialog->model);
+ gtk_tree_view_set_tooltip_column (view, COL_TOOLTIP);
+ gtk_tree_view_set_search_column (view, COL_NAME);
/* Selection */
selection = gtk_tree_view_get_selection (view);
GtkTreeView *view;
GtkTreeViewColumn *column;
GtkCellRenderer *cell;
+ gint width, height;
+
+ gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &width, &height);
view = GTK_TREE_VIEW (dialog->treeview);
- gtk_tree_view_set_headers_visible (view, FALSE);
+
+ cell = gtk_cell_renderer_pixbuf_new ();
+ g_object_set (cell,
+ "width", width,
+ "height", height,
+ "stock-size", GTK_ICON_SIZE_MENU,
+ NULL);
+ column = gtk_tree_view_column_new_with_attributes (NULL,
+ cell,
+ "stock-id", COL_INVITE_ONLY,
+ NULL);
+ gtk_tree_view_append_column (view, column);
+
+ column = gtk_tree_view_column_new_with_attributes (NULL,
+ cell,
+ "stock-id", COL_NEED_PASSWORD,
+ NULL);
+ gtk_tree_view_append_column (view, column);
cell = gtk_cell_renderer_text_new ();
g_object_set (cell,
"xpad", (guint) 4,
- "ypad", (guint) 1,
+ "ypad", (guint) 2,
"ellipsize", PANGO_ELLIPSIZE_END,
NULL);
- column = gtk_tree_view_column_new_with_attributes (_("Chat Rooms"),
+ column = gtk_tree_view_column_new_with_attributes (_("Chat Room"),
cell,
"text", COL_NAME,
NULL);
gtk_tree_view_column_set_expand (column, TRUE);
gtk_tree_view_append_column (view, column);
+
+ cell = gtk_cell_renderer_text_new ();
+ g_object_set (cell,
+ "xpad", (guint) 4,
+ "ypad", (guint) 2,
+ "ellipsize", PANGO_ELLIPSIZE_END,
+ "alignment", PANGO_ALIGN_RIGHT,
+ NULL);
+ column = gtk_tree_view_column_new_with_attributes (_("Members"),
+ cell,
+ "text", COL_MEMBERS,
+ NULL);
+ gtk_tree_view_append_column (view, column);
}
static void
/* hardcode here known protocols */
if (strcmp (protocol, "jabber") == 0) {
gtk_widget_set_sensitive (dialog->entry_server, TRUE);
- gtk_widget_show (dialog->vbox_browse);
-
}
else if (strcmp (protocol, "local-xmpp") == 0) {
gtk_widget_set_sensitive (dialog->entry_server, FALSE);
- gtk_widget_show (dialog->vbox_browse);
}
else if (strcmp (protocol, "irc") == 0) {
gtk_widget_set_sensitive (dialog->entry_server, FALSE);
- gtk_widget_show (dialog->vbox_browse);
- } else {
+ }
+ else {
gtk_widget_set_sensitive (dialog->entry_server, TRUE);
- gtk_widget_show (dialog->vbox_browse);
}
room = gtk_entry_get_text (GTK_ENTRY (dialog->entry_room));
- gtk_widget_set_sensitive (dialog->button_join, !G_STR_EMPTY (room));
+ gtk_widget_set_sensitive (dialog->button_join, !EMP_STR_EMPTY (room));
/* Final set up of the dialog */
gtk_widget_grab_focus (dialog->entry_room);
account = empathy_account_chooser_get_account (account_chooser);
dialog->room_list = empathy_tp_roomlist_new (account);
- if (dialog->room_list) {
+ if (dialog->room_list) {
g_signal_connect (dialog->room_list, "destroy",
G_CALLBACK (new_chatroom_dialog_roomlist_destroy_cb),
dialog);
g_signal_connect (dialog->room_list, "new-room",
G_CALLBACK (new_chatroom_dialog_new_room_cb),
dialog);
- g_signal_connect (dialog->room_list, "listing",
+ g_signal_connect (dialog->room_list, "notify::is-listing",
G_CALLBACK (new_chatroom_dialog_listing_cb),
dialog);
GtkTreeSelection *selection;
GtkListStore *store;
GtkTreeIter iter;
+ gchar *members;
+ gchar *tooltip;
+ const gchar *need_password;
+ const gchar *invite_only;
- empathy_debug (DEBUG_DOMAIN, "New chatroom listed: %s (%s)",
- empathy_chatroom_get_name (chatroom),
- empathy_chatroom_get_room (chatroom));
+ DEBUG ("New chatroom listed: %s (%s)",
+ empathy_chatroom_get_name (chatroom),
+ empathy_chatroom_get_room (chatroom));
/* Add to model */
view = GTK_TREE_VIEW (dialog->treeview);
selection = gtk_tree_view_get_selection (view);
store = GTK_LIST_STORE (dialog->model);
+ members = g_strdup_printf ("%d", empathy_chatroom_get_members_count (chatroom));
+ tooltip = g_strdup_printf (C_("Room/Join's roomlist tooltip. Parameters"
+ "are a channel name, yes/no, yes/no and a number.",
+ "<b>%s</b>\nInvite required: %s\nPassword required: %s\nMembers: %s"),
+ empathy_chatroom_get_name (chatroom),
+ empathy_chatroom_get_invite_only (chatroom) ? _("Yes") : _("No"),
+ empathy_chatroom_get_need_password (chatroom) ? _("Yes") : _("No"),
+ members);
+ invite_only = (empathy_chatroom_get_invite_only (chatroom) ?
+ GTK_STOCK_INDEX : NULL);
+ need_password = (empathy_chatroom_get_need_password (chatroom) ?
+ GTK_STOCK_DIALOG_AUTHENTICATION : NULL);
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter,
+ COL_NEED_PASSWORD, need_password,
+ COL_INVITE_ONLY, invite_only,
COL_NAME, empathy_chatroom_get_name (chatroom),
COL_ROOM, empathy_chatroom_get_room (chatroom),
+ COL_MEMBERS, members,
+ COL_TOOLTIP, tooltip,
-1);
+
+ g_free (members);
+ g_free (tooltip);
}
static void
new_chatroom_dialog_listing_cb (EmpathyTpRoomlist *room_list,
- gboolean listing,
+ gpointer unused,
EmpathyNewChatroomDialog *dialog)
{
+ gboolean listing;
+
+ listing = empathy_tp_roomlist_is_listing (room_list);
+
/* Update the throbber */
if (listing) {
ephy_spinner_start (EPHY_SPINNER (dialog->throbber));
} else {
ephy_spinner_stop (EPHY_SPINNER (dialog->throbber));
}
-
- /* Update the refresh toggle button */
- g_signal_handlers_block_by_func (dialog->togglebutton_refresh,
- new_chatroom_dialog_togglebutton_refresh_toggled_cb,
- dialog);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->togglebutton_refresh),
- listing);
- g_signal_handlers_unblock_by_func (dialog->togglebutton_refresh,
- new_chatroom_dialog_togglebutton_refresh_toggled_cb,
- dialog);
}
static void
static void
new_chatroom_dialog_join (EmpathyNewChatroomDialog *dialog)
{
- McAccount *account;
EmpathyAccountChooser *account_chooser;
- MissionControl *mc;
- const gchar *room;
- const gchar *server = NULL;
- gchar *room_name = NULL;
+ McAccount *account;
+ const gchar *room;
+ const gchar *server = NULL;
+ gchar *room_name = NULL;
room = gtk_entry_get_text (GTK_ENTRY (dialog->entry_room));
server = gtk_entry_get_text (GTK_ENTRY (dialog->entry_server));
account_chooser = EMPATHY_ACCOUNT_CHOOSER (dialog->account_chooser);
account = empathy_account_chooser_get_account (account_chooser);
- if (!G_STR_EMPTY (server)) {
+ if (!EMP_STR_EMPTY (server)) {
room_name = g_strconcat (room, "@", server, NULL);
} else {
room_name = g_strdup (room);
}
- empathy_debug (DEBUG_DOMAIN, "Requesting channel for '%s'", room_name);
+ DEBUG ("Requesting channel for '%s'", room_name);
+ empathy_dispatcher_join_muc (account, room_name, NULL, NULL);
- mc = empathy_mission_control_new ();
- mission_control_request_channel_with_string_handle (mc,
- account,
- TP_IFACE_CHANNEL_TYPE_TEXT,
- room_name,
- TP_HANDLE_TYPE_ROOM,
- NULL, NULL);
g_free (room_name);
- g_object_unref (mc);
}
static void
const gchar *room;
room = gtk_entry_get_text (GTK_ENTRY (dialog->entry_room));
- gtk_widget_set_sensitive (dialog->button_join, !G_STR_EMPTY (room));
+ gtk_widget_set_sensitive (dialog->button_join, !EMP_STR_EMPTY (room));
/* FIXME: Select the room in the list */
}
}
new_chatroom_dialog_entry_server_activate_cb (GtkWidget *widget,
EmpathyNewChatroomDialog *dialog)
{
- new_chatroom_dialog_togglebutton_refresh_toggled_cb (dialog->togglebutton_refresh,
- dialog);
+ new_chatroom_dialog_browse_start (dialog);
}
static void
-new_chatroom_dialog_togglebutton_refresh_toggled_cb (GtkWidget *widget,
- EmpathyNewChatroomDialog *dialog)
+new_chatroom_dialog_expander_browse_activate_cb (GtkWidget *widget,
+ EmpathyNewChatroomDialog *dialog)
{
- gboolean toggled;
+ gboolean expanded;
- toggled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
-
- if (toggled) {
- new_chatroom_dialog_browse_start (dialog);
- } else {
+ expanded = gtk_expander_get_expanded (GTK_EXPANDER (widget));
+ if (expanded) {
new_chatroom_dialog_browse_stop (dialog);
+ gtk_window_set_resizable (GTK_WINDOW (dialog->window), FALSE);
+ } else {
+ new_chatroom_dialog_browse_start (dialog);
+ gtk_window_set_resizable (GTK_WINDOW (dialog->window), TRUE);
}
}
+static gboolean
+new_chatroom_dialog_entry_server_focus_out_cb (GtkWidget *widget,
+ GdkEventFocus *event,
+ EmpathyNewChatroomDialog *dialog)
+{
+ gboolean expanded;
+
+ expanded = gtk_expander_get_expanded (GTK_EXPANDER (dialog->expander_browse));
+ if (expanded) {
+ new_chatroom_dialog_browse_start (dialog);
+ }
+ return FALSE;
+}
projects / empathy.git / blobdiff