* Authors: Richard Hult <richard@imendio.com>
* Martyn Russell <martyn@imendio.com>
* Xavier Claessens <xclaesse@gmail.com>
- * Davyd Madeley <davyd.madeley@collabora.co.uk>
+ * Danielle Madeley <danielle.madeley@collabora.co.uk>
*/
#include "config.h"
#include <telepathy-glib/util.h>
#include <libempathy/empathy-connectivity.h>
-#include <libempathy/empathy-idle.h>
+#include <libempathy/empathy-presence-manager.h>
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-status-presets.h>
* Widget which extends #GtkComboBoxEntry to change presence.
*/
-/* Flashing delay for icons (milliseconds). */
-#define FLASH_TIMEOUT 500
-
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyPresenceChooser)
/* For custom message dialog */
} PresenceChooserEntryType;
typedef struct {
- EmpathyIdle *idle;
+ EmpathyPresenceManager *presence_mgr;
EmpathyConnectivity *connectivity;
gboolean editing_status;
PresenceChooserEntryType previous_type;
TpAccountManager *account_manager;
+ GdkPixbuf *not_favorite_pixbuf;
} EmpathyPresenceChooserPriv;
/* States to be listed in the menu.
{ TP_CONNECTION_PRESENCE_TYPE_UNSET, },
};
+static void presence_chooser_constructed (GObject *object);
static void presence_chooser_finalize (GObject *object);
static void presence_chooser_presence_changed_cb (EmpathyPresenceChooser *chooser);
static void presence_chooser_menu_add_item (GtkWidget *menu,
static void presence_chooser_custom_activate_cb (GtkWidget *item,
gpointer user_data);
-G_DEFINE_TYPE (EmpathyPresenceChooser, empathy_presence_chooser, GTK_TYPE_COMBO_BOX_ENTRY);
+G_DEFINE_TYPE (EmpathyPresenceChooser, empathy_presence_chooser, GTK_TYPE_COMBO_BOX);
static void
empathy_presence_chooser_class_init (EmpathyPresenceChooserClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ object_class->constructed = presence_chooser_constructed;
object_class->finalize = presence_chooser_finalize;
g_type_class_add_private (object_class, sizeof (EmpathyPresenceChooserPriv));
G_TYPE_BOOLEAN, /* COL_STATUS_CUSTOMISABLE */
G_TYPE_INT); /* COL_TYPE */
- custom_message = g_strdup_printf ("<i>%s</i>", _("Custom Message..."));
+ custom_message = g_strdup_printf ("<i>%s</i>", _("Custom Message…"));
for (i = 0; states[i].state != TP_CONNECTION_PRESENCE_TYPE_UNSET; i++) {
GList *list, *l;
g_list_free (list);
gtk_list_store_insert_with_values (store, NULL, -1,
- COL_STATUS_TEXT, _("Custom Message..."),
+ COL_STATUS_TEXT, _("Custom Message…"),
COL_STATE_ICON_NAME, icon_name,
COL_STATE, states[i].state,
COL_DISPLAY_MARKUP, custom_message,
-1);
gtk_list_store_insert_with_values (store, NULL, -1,
- COL_STATUS_TEXT, _("Edit Custom Messages..."),
+ COL_STATUS_TEXT, _("Edit Custom Messages…"),
COL_STATE_ICON_NAME, GTK_STOCK_EDIT,
- COL_DISPLAY_MARKUP, _("Edit Custom Messages..."),
+ COL_DISPLAY_MARKUP, _("Edit Custom Messages…"),
COL_TYPE, ENTRY_TYPE_EDIT_CUSTOM,
-1);
static void
presence_chooser_set_favorite_icon (EmpathyPresenceChooser *self)
{
+ EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
GtkWidget *entry;
PresenceChooserEntryType type;
/* saved entries can be removed from the list */
gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
GTK_ENTRY_ICON_SECONDARY,
- "empathy-starred");
+ "emblem-favorite");
gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry),
GTK_ENTRY_ICON_SECONDARY,
_("Click to remove this status as a favorite"));
}
- else {
+ else if (priv->not_favorite_pixbuf != NULL) {
/* custom entries can be favorited */
- gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
+ gtk_entry_set_icon_from_pixbuf (GTK_ENTRY (entry),
GTK_ENTRY_ICON_SECONDARY,
- "empathy-unstarred");
+ priv->not_favorite_pixbuf);
gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry),
GTK_ENTRY_ICON_SECONDARY,
_("Click to make this status a favorite"));
DEBUG ("Sending state to MC-> %d (%s)", priv->state, status);
- empathy_idle_set_presence (priv->idle, priv->state, status);
+ empathy_presence_manager_set_presence (priv->presence_mgr, priv->state, status);
}
static void
EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
GtkWidget *entry;
const char *icon_name;
+ const gchar *status_tooltip;
entry = gtk_bin_get_child (GTK_BIN (self));
gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
GTK_ENTRY_ICON_PRIMARY,
icon_name);
- gtk_entry_set_text (GTK_ENTRY (entry), status == NULL ? "" : status);
+ status_tooltip = status == NULL ? "" : status;
+ gtk_entry_set_text (GTK_ENTRY (entry), status_tooltip);
+ gtk_widget_set_tooltip_text (GTK_WIDGET (entry), status_tooltip);
presence_chooser_set_favorite_icon (self);
priv->block_changed--;
mc_set_custom_state (self);
}
else {
- PresenceChooserEntryType type;
TpConnectionPresenceType state;
char *status;
- type = presence_chooser_get_entry_type (self);
state = get_state_and_status (self, &status);
if (!empathy_status_presets_is_valid (state)) {
{
EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
- if (priv->editing_status && event->keyval == GDK_Escape) {
+ if (priv->editing_status && event->keyval == GDK_KEY_Escape) {
/* the user pressed Escape, undo the editing */
presence_chooser_reset_status (self);
return TRUE;
}
- else if (event->keyval == GDK_Up || event->keyval == GDK_Down) {
+ else if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_Down) {
/* ignore */
return TRUE;
}
COL_STATUS_TEXT, &status,
-1);
- empathy_idle_set_presence (priv->idle, priv->state, status);
+ empathy_presence_manager_set_presence (priv->presence_mgr, priv->state, status);
g_free (status);
}
GList *accounts, *l;
GError *error = NULL;
- if (!tp_account_manager_prepare_finish (manager, result, &error)) {
+ if (!tp_proxy_prepare_finish (manager, result, &error)) {
DEBUG ("Failed to prepare account manager: %s", error->message);
g_error_free (error);
return;
{
EmpathyPresenceChooserPriv *priv = GET_PRIV (chooser);
- tp_account_manager_prepare_async (priv->account_manager, NULL,
+ tp_proxy_prepare_async (priv->account_manager, NULL,
update_sensitivity_am_prepared_cb,
chooser);
}
presence_chooser_update_sensitivity (chooser);
}
+/* Create a greyed version of the 'favorite' icon */
+static GdkPixbuf *
+create_not_favorite_pixbuf (void)
+{
+ GdkPixbuf *favorite, *result;
+
+ favorite = empathy_pixbuf_from_icon_name ("emblem-favorite",
+ GTK_ICON_SIZE_MENU);
+
+ if (favorite == NULL)
+ return NULL;
+
+ result = gdk_pixbuf_copy (favorite);
+ gdk_pixbuf_saturate_and_pixelate (favorite, result, 1.0, TRUE);
+
+ g_object_unref (favorite);
+ return result;
+}
+
+static void
+icon_theme_changed_cb (GtkIconTheme *icon_theme,
+ EmpathyPresenceChooser *self)
+{
+ EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
+
+ /* Theme has changed, recreate the not-favorite icon */
+ if (priv->not_favorite_pixbuf != NULL)
+ g_object_unref (priv->not_favorite_pixbuf);
+ priv->not_favorite_pixbuf = create_not_favorite_pixbuf ();
+
+ /* Update the icon */
+ presence_chooser_set_favorite_icon (self);
+}
+
static void
empathy_presence_chooser_init (EmpathyPresenceChooser *chooser)
{
EmpathyPresenceChooserPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (chooser,
EMPATHY_TYPE_PRESENCE_CHOOSER, EmpathyPresenceChooserPriv);
+
+ chooser->priv = priv;
+
+ /* Create the not-favorite icon */
+ priv->not_favorite_pixbuf = create_not_favorite_pixbuf ();
+}
+
+static void
+presence_chooser_constructed (GObject *object)
+{
+ EmpathyPresenceChooser *chooser = EMPATHY_PRESENCE_CHOOSER (object);
+ EmpathyPresenceChooserPriv *priv = chooser->priv;
GtkWidget *entry;
GtkCellRenderer *renderer;
+ const gchar *status_tooltip;
- chooser->priv = priv;
+ tp_g_signal_connect_object (gtk_icon_theme_get_default (), "changed",
+ G_CALLBACK (icon_theme_changed_cb),
+ chooser, 0);
presence_chooser_create_model (chooser);
- gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (chooser),
+ gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (chooser),
COL_STATUS_TEXT);
gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (chooser),
combo_row_separator_func,
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (chooser), renderer,
"markup", COL_DISPLAY_MARKUP,
NULL);
+ g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
g_signal_connect (chooser, "notify::popup-shown",
G_CALLBACK (presence_chooser_popup_shown_cb), NULL);
G_CALLBACK (presence_chooser_entry_focus_out_cb),
chooser);
- priv->idle = empathy_idle_dup_singleton ();
+ priv->presence_mgr = empathy_presence_manager_dup_singleton ();
priv->account_manager = tp_account_manager_dup ();
g_signal_connect_swapped (priv->account_manager,
G_CALLBACK (presence_chooser_presence_changed_cb),
chooser);
- empathy_signal_connect_weak (priv->account_manager, "account-validity-changed",
+ tp_g_signal_connect_object (priv->account_manager, "account-validity-changed",
G_CALLBACK (presence_chooser_account_manager_account_validity_changed_cb),
- G_OBJECT (chooser));
- empathy_signal_connect_weak (priv->account_manager, "account-removed",
+ chooser, 0);
+ tp_g_signal_connect_object (priv->account_manager, "account-removed",
G_CALLBACK (presence_chooser_account_manager_account_changed_cb),
- G_OBJECT (chooser));
- empathy_signal_connect_weak (priv->account_manager, "account-enabled",
+ chooser, 0);
+ tp_g_signal_connect_object (priv->account_manager, "account-enabled",
G_CALLBACK (presence_chooser_account_manager_account_changed_cb),
- G_OBJECT (chooser));
- empathy_signal_connect_weak (priv->account_manager, "account-disabled",
+ chooser, 0);
+ tp_g_signal_connect_object (priv->account_manager, "account-disabled",
G_CALLBACK (presence_chooser_account_manager_account_changed_cb),
- G_OBJECT (chooser));
+ chooser, 0);
- /* FIXME: this string sucks */
- gtk_widget_set_tooltip_text (GTK_WIDGET (chooser),
- _("Set your presence and current status"));
+ status_tooltip = gtk_entry_get_text (GTK_ENTRY (entry));
+ gtk_widget_set_tooltip_text (GTK_WIDGET (chooser), status_tooltip);
priv->connectivity = empathy_connectivity_dup_singleton ();
- empathy_signal_connect_weak (priv->connectivity,
+ tp_g_signal_connect_object (priv->connectivity,
"state-change",
G_CALLBACK (presence_chooser_connectivity_state_change),
- G_OBJECT (chooser));
+ chooser, 0);
presence_chooser_update_sensitivity (chooser);
}
if (priv->account_manager != NULL)
g_object_unref (priv->account_manager);
- g_signal_handlers_disconnect_by_func (priv->idle,
+ g_signal_handlers_disconnect_by_func (priv->presence_mgr,
presence_chooser_presence_changed_cb,
object);
- g_object_unref (priv->idle);
+ g_object_unref (priv->presence_mgr);
g_object_unref (priv->connectivity);
+ if (priv->not_favorite_pixbuf != NULL)
+ g_object_unref (priv->not_favorite_pixbuf);
G_OBJECT_CLASS (empathy_presence_chooser_parent_class)->finalize (object);
}
GtkWidget *
empathy_presence_chooser_new (void)
{
- GtkWidget *chooser;
-
- chooser = g_object_new (EMPATHY_TYPE_PRESENCE_CHOOSER, NULL);
-
- return chooser;
+ /* FIXME, why can't this go in init ()? */
+ return g_object_new (EMPATHY_TYPE_PRESENCE_CHOOSER,
+ "has-entry", TRUE,
+ NULL);
}
static void
gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
GTK_ENTRY_ICON_PRIMARY,
empathy_icon_name_for_presence (state));
+ gtk_widget_set_tooltip_text (GTK_WIDGET (entry), status);
entry = gtk_bin_get_child (GTK_BIN (chooser));
gtk_editable_set_editable (GTK_EDITABLE (entry),
gtk_widget_show (item);
/* Custom messages */
- item = gtk_image_menu_item_new_with_label (_("Custom messages..."));
+ item = gtk_image_menu_item_new_with_label (_("Custom messages…"));
image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
presence_chooser_set_state (TpConnectionPresenceType state,
const gchar *status)
{
- EmpathyIdle *idle;
+ EmpathyPresenceManager *presence_mgr;
- idle = empathy_idle_dup_singleton ();
- empathy_idle_set_presence (idle, state, status);
- g_object_unref (idle);
+ presence_mgr = empathy_presence_manager_dup_singleton ();
+ empathy_presence_manager_set_presence (presence_mgr, state, status);
+ g_object_unref (presence_mgr);
}
static void
projects / empathy.git / blobdiff