X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=src%2Fempathy-roster-window.c;h=e874fb533b26e062273d068d7a07670927514b6f;hp=9dd7a4e750b2f7daced22300b24c98a3b89754d1;hb=ba536b64debb3d818b95a88aa3309211a867e1be;hpb=ff897a9a71c4eb91548f40ab6ea09e17936cd8c1 diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c index 9dd7a4e7..e874fb53 100644 --- a/src/empathy-roster-window.c +++ b/src/empathy-roster-window.c @@ -32,6 +32,7 @@ #include "empathy-accounts-dialog.h" #include "empathy-call-observer.h" #include "empathy-chat-manager.h" +#include "empathy-chat-window.h" #include "empathy-chatroom-manager.h" #include "empathy-chatrooms-window.h" #include "empathy-client-factory.h" @@ -55,6 +56,8 @@ #include "empathy-roster-model-manager.h" #include "empathy-roster-view.h" #include "empathy-status-presets.h" +#include "empathy-theme-manager.h" +#include "empathy-theme-manager.h" #include "empathy-ui-utils.h" #include "empathy-utils.h" @@ -90,6 +93,8 @@ G_DEFINE_TYPE (EmpathyRosterWindow, empathy_roster_window, GTK_TYPE_APPLICATION_ struct _EmpathyRosterWindowPriv { EmpathyRosterView *view; TpAccountManager *account_manager; + EmpathyChatManager *chat_manager; + EmpathyThemeManager *theme_manager; EmpathyChatroomManager *chatroom_manager; EmpathyEventManager *event_manager; EmpathySoundManager *sound_mgr; @@ -116,6 +121,7 @@ struct _EmpathyRosterWindowPriv { GtkWidget *button_add_contact; GtkWidget *spinner_loading; GtkWidget *tooltip_widget; + GtkWidget *chat_window; GMenu *menumodel; GMenu *rooms_section; @@ -1033,6 +1039,8 @@ empathy_roster_window_finalize (GObject *window) g_object_unref (self->priv->call_observer); g_object_unref (self->priv->event_manager); + g_object_unref (self->priv->chat_manager); + g_object_unref (self->priv->theme_manager); g_object_unref (self->priv->chatroom_manager); g_object_unref (self->priv->gsettings_ui); @@ -1301,9 +1309,8 @@ roster_window_join_chatroom_menu_activate_cb (GSimpleAction *action, account, room); if (chatroom == NULL) { - DEBUG ("Failed to get chatroom '%s' on '%s': %s", - room, path, error->message); - g_error_free (error); + DEBUG ("Failed to get chatroom '%s' on '%s'", + room, path); goto out; } @@ -1334,6 +1341,7 @@ roster_window_favorite_chatroom_menu_add (EmpathyRosterWindow *self, g_menu_item_set_action_and_target (item, "win.join", "(ss)", name, account_path); g_menu_item_set_attribute (item, "room-name", "s", name); + g_menu_item_set_attribute (item, "account-path", "s", account_path); g_menu_append_item (self->priv->rooms_section, item); g_free (label); @@ -1355,21 +1363,45 @@ roster_window_favorite_chatroom_menu_removed_cb ( { GList *chatrooms; guint i, n; + TpAccount *account; + const gchar *account_path; + + account = empathy_chatroom_get_account (chatroom); + account_path = tp_proxy_get_object_path (account); n = g_menu_model_get_n_items (G_MENU_MODEL (self->priv->rooms_section)); for (i = 0; i < n; i++) { - const gchar *name; + gchar *tmp; + + if (!g_menu_model_get_item_attribute ( + G_MENU_MODEL (self->priv->rooms_section), i, + "room-name", "s", &tmp)) + continue; + + if (tp_strdiff (tmp, empathy_chatroom_get_name (chatroom))) + { + g_free (tmp); + continue; + } + + g_free (tmp); + + if (!g_menu_model_get_item_attribute ( + G_MENU_MODEL (self->priv->rooms_section), i, + "account-path", "s", &tmp)) + continue; - if (g_menu_model_get_item_attribute ( - G_MENU_MODEL (self->priv->rooms_section), i, "room-name", - "s", &name) - && !tp_strdiff (name, empathy_chatroom_get_name (chatroom))) + if (tp_strdiff (tmp, account_path)) { - g_menu_remove (self->priv->rooms_section, i); - break; + g_free (tmp); + continue; } + + g_menu_remove (self->priv->rooms_section, i); + g_free (tmp); + break; } chatrooms = empathy_chatroom_manager_get_chatrooms ( @@ -1516,6 +1548,25 @@ roster_window_help_contents_cb (GSimpleAction *action, empathy_url_show (GTK_WIDGET (self), "help:empathy"); } +static void +next_tab_cb (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) +{ + EmpathyRosterWindow *self = user_data; + empathy_chat_window_next_tab (EMPATHY_CHAT_WINDOW (self->priv->chat_window)); +} + +static void +prev_tab_cb (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) +{ + EmpathyRosterWindow *self = user_data; + empathy_chat_window_prev_tab (EMPATHY_CHAT_WINDOW (self->priv->chat_window)); +} + + static gboolean roster_window_throbber_button_press_event_cb (GtkWidget *throbber, GdkEventButton *event, @@ -1701,7 +1752,7 @@ set_notebook_page (EmpathyRosterWindow *self) { if (g_settings_get_boolean (self->priv->gsettings_ui, EMPATHY_PREFS_UI_SHOW_OFFLINE)) - display_page_message (self, _("You haven't added any contact yet"), + display_page_message (self, _("You haven't added any contacts yet"), PAGE_MESSAGE_FLAG_ADD_CONTACT); else display_page_message (self, _("No online contacts"), @@ -1874,6 +1925,13 @@ static GActionEntry menubar_entries[] = { { "help_about", roster_window_help_about_cb, NULL, NULL, NULL }, }; +static GActionEntry app_entries[] = +{ + { "tab_next", next_tab_cb, NULL, NULL, NULL }, + { "tab_prev", prev_tab_cb, NULL, NULL, NULL } +}; + + static void empathy_roster_window_set_property (GObject *object, guint property_id, @@ -2261,7 +2319,10 @@ empathy_roster_window_init (EmpathyRosterWindow *self) GtkBuilder *gui; GtkWidget *sw; gchar *filename; - GtkWidget *search_vbox; + GtkWidget *header_bar; + GtkWidget *new_conversation_button; + GtkWidget *image; + GtkWidget *chat_vbox; guint i; EmpathyRosterModel *model; @@ -2286,10 +2347,10 @@ empathy_roster_window_init (EmpathyRosterWindow *self) filename = empathy_file_lookup ("empathy-roster-window.ui", "src"); gui = tpaw_builder_get_file (filename, "main_vbox", &self->priv->main_vbox, + "chat_vbox", &chat_vbox, "balance_vbox", &self->priv->balance_vbox, "errors_vbox", &self->priv->errors_vbox, "auth_vbox", &self->priv->auth_vbox, - "search_vbox", &search_vbox, "presence_toolbar", &self->priv->presence_toolbar, "notebook", &self->priv->notebook, "no_entry_label", &self->priv->no_entry_label, @@ -2302,6 +2363,20 @@ empathy_roster_window_init (EmpathyRosterWindow *self) NULL); g_free (filename); + header_bar = gtk_header_bar_new (); + gtk_header_bar_set_title (GTK_HEADER_BAR(header_bar), _("Conversations")); + gtk_header_bar_set_show_close_button (GTK_HEADER_BAR(header_bar), TRUE); + + image = gtk_image_new_from_icon_name ("list-add-symbolic", GTK_ICON_SIZE_BUTTON); + new_conversation_button = gtk_button_new (); + g_signal_connect (new_conversation_button, "clicked", + G_CALLBACK (roster_window_chat_new_message_cb), self); + gtk_button_set_image (GTK_BUTTON (new_conversation_button), image); + gtk_widget_set_tooltip_text (new_conversation_button, _("New Conversation")); + gtk_window_set_titlebar (GTK_WINDOW (self), header_bar); + gtk_container_add (GTK_CONTAINER (header_bar), new_conversation_button); + gtk_widget_show_all (header_bar); + gtk_container_add (GTK_CONTAINER (self), self->priv->main_vbox); gtk_widget_show (self->priv->main_vbox); @@ -2323,6 +2398,10 @@ empathy_roster_window_init (EmpathyRosterWindow *self) self->priv->status_changed_handlers = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, NULL); + /* set up accelerators */ + g_action_map_add_action_entries (G_ACTION_MAP (self), + app_entries, G_N_ELEMENTS (app_entries), self); + /* set up menus */ g_action_map_add_action_entries (G_ACTION_MAP (self), menubar_entries, G_N_ELEMENTS (menubar_entries), self); @@ -2375,6 +2454,7 @@ empathy_roster_window_init (EmpathyRosterWindow *self) self->priv->view = EMPATHY_ROSTER_VIEW ( empathy_roster_view_new (model)); + g_object_unref (model); gtk_widget_show (GTK_WIDGET (self->priv->view)); @@ -2413,8 +2493,6 @@ empathy_roster_window_init (EmpathyRosterWindow *self) GTK_WIDGET (self->priv->view)); empathy_roster_view_set_live_search (self->priv->view, TPAW_LIVE_SEARCH (self->priv->search_bar)); - gtk_box_pack_start (GTK_BOX (search_vbox), self->priv->search_bar, - FALSE, TRUE, 0); g_signal_connect_swapped (self, "map", G_CALLBACK (gtk_widget_grab_focus), self->priv->view); @@ -2426,9 +2504,16 @@ empathy_roster_window_init (EmpathyRosterWindow *self) /* Set window size. */ empathy_geometry_bind (GTK_WINDOW (self), GEOMETRY_NAME); + self->priv->chat_window = GTK_WIDGET (empathy_chat_window_new ()); + gtk_widget_show (GTK_WIDGET (self->priv->chat_window) ); + gtk_box_pack_start (GTK_BOX (chat_vbox), self->priv->chat_window, TRUE, TRUE, 0); + /* Enable event handling */ self->priv->call_observer = empathy_call_observer_dup_singleton (); self->priv->event_manager = empathy_event_manager_dup_singleton (); + self->priv->chat_manager = empathy_chat_manager_dup_singleton (); + + self->priv->theme_manager = empathy_theme_manager_dup_singleton (); tp_g_signal_connect_object (self->priv->event_manager, "event-added", G_CALLBACK (roster_window_event_added_cb), self, 0); @@ -2445,15 +2530,11 @@ empathy_roster_window_init (EmpathyRosterWindow *self) "most-available-presence-changed", G_CALLBACK (roster_window_most_available_presence_changed_cb), self); - g_settings_bind (self->priv->gsettings_ui, EMPATHY_PREFS_UI_SHOW_OFFLINE, - self->priv->view, "show-offline", - G_SETTINGS_BIND_GET); - tp_g_signal_connect_object (self->priv->gsettings_ui, - "changed::" EMPATHY_PREFS_UI_SHOW_OFFLINE, - G_CALLBACK (show_offline_changed_cb), self, 0); - g_settings_bind (self->priv->gsettings_ui, EMPATHY_PREFS_UI_SHOW_GROUPS, - self->priv->view, "show-groups", - G_SETTINGS_BIND_GET); + g_object_set (G_OBJECT (self->priv->view), + "show-offline", TRUE, + "show-groups", FALSE, + NULL); + g_settings_bind (self->priv->gsettings_ui, "show-balance-in-roster", self->priv->balance_vbox, "visible", G_SETTINGS_BIND_GET);