#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"
#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"
struct _EmpathyRosterWindowPriv {
EmpathyRosterView *view;
TpAccountManager *account_manager;
+ EmpathyChatManager *chat_manager;
+ EmpathyThemeManager *theme_manager;
EmpathyChatroomManager *chatroom_manager;
EmpathyEventManager *event_manager;
EmpathySoundManager *sound_mgr;
GtkWidget *button_add_contact;
GtkWidget *spinner_loading;
GtkWidget *tooltip_widget;
+ GtkWidget *chat_window;
GMenu *menumodel;
GMenu *rooms_section;
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);
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,
{ "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,
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;
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,
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);
self->priv->view = EMPATHY_ROSTER_VIEW (
empathy_roster_view_new (model));
+
g_object_unref (model);
gtk_widget_show (GTK_WIDGET (self->priv->view));
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);
/* 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);