*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301 USA
*
* Authors: Richard Hult <richard@imendio.com>
* Martyn Russell <martyn@imendio.com>
#include <gdk/gdkkeysyms.h>
#include <telepathy-glib/util.h>
-#include <libmissioncontrol/mc-enum-types.h>
#include <libempathy/empathy-idle.h>
#include <libempathy/empathy-utils.h>
#include "empathy-ui-utils.h"
#include "empathy-images.h"
#include "empathy-presence-chooser.h"
+#include "empathy-status-preset-dialog.h"
+
+/**
+ * SECTION:empathy-presence-chooser
+ * @title:EmpathyPresenceChooser
+ * @short_description: A widget used to change presence
+ * @include: libempathy-gtk/empathy-presence-chooser.h
+ *
+ * #EmpathyPresenceChooser is a widget which extends #GtkComboBoxEntry
+ * to change presence.
+ */
+
+/**
+ * EmpathyAccountChooser:
+ * @parent: parent object
+ *
+ * Widget which extends #GtkComboBoxEntry to change presence.
+ */
/* Flashing delay for icons (milliseconds). */
#define FLASH_TIMEOUT 500
/* For combobox's model */
enum {
+ COL_STATUS_TEXT,
COL_STATE_ICON_NAME,
COL_STATE,
- COL_STATUS_TEXT,
COL_DISPLAY_MARKUP,
COL_STATUS_CUSTOMISABLE,
COL_TYPE,
int block_changed;
guint focus_out_idle_source;
- McPresence state;
+ TpConnectionPresenceType state;
PresenceChooserEntryType previous_type;
- McPresence flash_state_1;
- McPresence flash_state_2;
+ TpConnectionPresenceType flash_state_1;
+ TpConnectionPresenceType flash_state_2;
guint flash_timeout_id;
} EmpathyPresenceChooserPriv;
-typedef struct {
- GtkWidget *dialog;
- GtkWidget *checkbutton_save;
- GtkWidget *comboboxentry_message;
- GtkWidget *entry_message;
- GtkWidget *combobox_status;
- GtkTreeModel *model_status;
-} CustomMessageDialog;
-
-static CustomMessageDialog *message_dialog = NULL;
/* States to be listed in the menu.
* Each state has a boolean telling if it can have custom message */
-static guint states[] = {MC_PRESENCE_AVAILABLE, TRUE,
- MC_PRESENCE_DO_NOT_DISTURB, TRUE,
- MC_PRESENCE_AWAY, TRUE,
- MC_PRESENCE_HIDDEN, FALSE,
- MC_PRESENCE_OFFLINE, FALSE};
+static struct { TpConnectionPresenceType state;
+ gboolean customisable;
+} states[] = { { TP_CONNECTION_PRESENCE_TYPE_AVAILABLE, TRUE } ,
+ { TP_CONNECTION_PRESENCE_TYPE_BUSY, TRUE },
+ { TP_CONNECTION_PRESENCE_TYPE_AWAY, TRUE },
+ { TP_CONNECTION_PRESENCE_TYPE_HIDDEN, FALSE },
+ { TP_CONNECTION_PRESENCE_TYPE_OFFLINE, FALSE},
+ { TP_CONNECTION_PRESENCE_TYPE_UNSET, },
+ };
static void presence_chooser_finalize (GObject *object);
static void presence_chooser_presence_changed_cb (EmpathyPresenceChooser *chooser);
static gboolean presence_chooser_flash_timeout_cb (EmpathyPresenceChooser *chooser);
static void presence_chooser_flash_start (EmpathyPresenceChooser *chooser,
- McPresence state_1,
- McPresence state_2);
+ TpConnectionPresenceType state_1,
+ TpConnectionPresenceType state_2);
static void presence_chooser_flash_stop (EmpathyPresenceChooser *chooser,
- McPresence state);
+ TpConnectionPresenceType state);
static void presence_chooser_menu_add_item (GtkWidget *menu,
const gchar *str,
- McPresence state);
+ TpConnectionPresenceType state);
static void presence_chooser_noncustom_activate_cb (GtkWidget *item,
gpointer user_data);
-static void presence_chooser_set_state (McPresence state,
+static void presence_chooser_set_state (TpConnectionPresenceType state,
const gchar *status);
static void presence_chooser_custom_activate_cb (GtkWidget *item,
gpointer user_data);
-static void presence_chooser_dialog_show (GtkWindow *parent);
G_DEFINE_TYPE (EmpathyPresenceChooser, empathy_presence_chooser, GTK_TYPE_COMBO_BOX_ENTRY);
int i;
store = gtk_list_store_new (N_COLUMNS,
- G_TYPE_STRING, /* COL_STATE_ICON_NAME */
- MC_TYPE_PRESENCE, /* COL_STATE */
G_TYPE_STRING, /* COL_STATUS_TEXT */
+ G_TYPE_STRING, /* COL_STATE_ICON_NAME */
+ G_TYPE_UINT, /* COL_STATE */
G_TYPE_STRING, /* COL_DISPLAY_MARKUP */
G_TYPE_BOOLEAN, /* COL_STATUS_CUSTOMISABLE */
G_TYPE_INT); /* COL_TYPE */
custom_message = g_strdup_printf ("<i>%s</i>", _("Custom Message..."));
- for (i = 0; i < G_N_ELEMENTS (states); i += 2) {
+ for (i = 0; states[i].state != TP_CONNECTION_PRESENCE_TYPE_UNSET; i++) {
GList *list, *l;
const char *status, *icon_name;
- status = empathy_presence_get_default_message (states[i]);
- icon_name = empathy_icon_name_for_presence (states[i]);
+ status = empathy_presence_get_default_message (states[i].state);
+ icon_name = empathy_icon_name_for_presence (states[i].state);
gtk_list_store_insert_with_values (store, NULL, -1,
- COL_STATE_ICON_NAME, icon_name,
- COL_STATE, states[i],
COL_STATUS_TEXT, status,
+ COL_STATE_ICON_NAME, icon_name,
+ COL_STATE, states[i].state,
COL_DISPLAY_MARKUP, status,
- COL_STATUS_CUSTOMISABLE, states[i+1],
+ COL_STATUS_CUSTOMISABLE, states[i].customisable,
COL_TYPE, ENTRY_TYPE_BUILTIN,
-1);
- if (states[i+1]) {
-
+ if (states[i].customisable) {
/* Set custom messages if wanted */
- list = empathy_status_presets_get (states[i], 5);
+ list = empathy_status_presets_get (states[i].state, -1);
+ list = g_list_sort (list, (GCompareFunc) g_utf8_collate);
for (l = list; l; l = l->next) {
gtk_list_store_insert_with_values (store,
NULL, -1,
- COL_STATE_ICON_NAME, icon_name,
- COL_STATE, states[i],
COL_STATUS_TEXT, l->data,
+ COL_STATE_ICON_NAME, icon_name,
+ COL_STATE, states[i].state,
COL_DISPLAY_MARKUP, l->data,
COL_STATUS_CUSTOMISABLE, TRUE,
COL_TYPE, ENTRY_TYPE_SAVED,
g_list_free (list);
gtk_list_store_insert_with_values (store, NULL, -1,
+ COL_STATUS_TEXT, _("Custom Message..."),
COL_STATE_ICON_NAME, icon_name,
- COL_STATE, states[i],
- COL_STATUS_TEXT, "",
+ COL_STATE, states[i].state,
COL_DISPLAY_MARKUP, custom_message,
COL_STATUS_CUSTOMISABLE, TRUE,
COL_TYPE, ENTRY_TYPE_CUSTOM,
-1);
gtk_list_store_insert_with_values (store, NULL, -1,
+ COL_STATUS_TEXT, _("Edit Custom Messages..."),
COL_STATE_ICON_NAME, GTK_STOCK_EDIT,
- COL_STATUS_TEXT, "",
COL_DISPLAY_MARKUP, _("Edit Custom Messages..."),
COL_TYPE, ENTRY_TYPE_EDIT_CUSTOM,
-1);
return;
}
- /* see presence_chooser_entry_focus_out_cb() for what this does */
+ /* see presence_chooser_entry_focus_out_cb () for what this does */
if (priv->focus_out_idle_source != 0) {
g_source_remove (priv->focus_out_idle_source);
priv->focus_out_idle_source = 0;
presence_chooser_is_preset (EmpathyPresenceChooser *self)
{
EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
- McPresence state;
+ TpConnectionPresenceType state;
const char *status;
GList *presets, *l;
gboolean match = FALSE;
for (l = presets; l; l = l->next) {
char *preset = (char *) l->data;
- if (!strcmp (status, preset)) {
+ if (!tp_strdiff (status, preset)) {
match = TRUE;
break;
}
gtk_window_set_focus (GTK_WINDOW (window), NULL);
}
- /* see presence_chooser_entry_focus_out_cb()
+ /* see presence_chooser_entry_focus_out_cb ()
* for what this does */
if (priv->focus_out_idle_source != 0) {
g_source_remove (priv->focus_out_idle_source);
/* update the status with MC */
status = gtk_entry_get_text (GTK_ENTRY (entry));
- DEBUG ("Sending state to MC-> %s (%s)\n",
- g_enum_get_value (g_type_class_peek (MC_TYPE_PRESENCE),
- priv->state)->value_name,
- status);
+ DEBUG ("Sending state to MC-> %d (%s)\n", priv->state, status);
empathy_idle_set_presence (priv->idle, priv->state, status);
}
static void
ui_set_custom_state (EmpathyPresenceChooser *self,
- McPresence state,
+ TpConnectionPresenceType state,
const char *status)
{
EmpathyPresenceChooserPriv *priv = GET_PRIV (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);
+ gtk_entry_set_text (GTK_ENTRY (entry), status == NULL ? "" : status);
presence_chooser_set_favorite_icon (self);
priv->block_changed--;
{
EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
- if (priv->editing_status)
- {
+ if (priv->editing_status) {
presence_chooser_set_status_editing (self, FALSE);
mc_set_custom_state (self);
}
else {
PresenceChooserEntryType type;
- McPresence state;
+ TpConnectionPresenceType state;
const char *status;
type = presence_chooser_get_entry_type (self);
state = empathy_idle_get_state (priv->idle);
status = empathy_idle_get_status (priv->idle);
+ if (!empathy_status_presets_is_valid (state))
+ /* It doesn't make sense to add such presence as favorite */
+ return;
+
if (presence_chooser_is_preset (self)) {
/* remove the entry */
DEBUG ("REMOVING PRESET (%i, %s)\n", state, status);
EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
GtkTreeIter iter;
char *icon_name;
- McPresence new_state;
+ TpConnectionPresenceType new_state;
gboolean customisable = TRUE;
PresenceChooserEntryType type = -1;
GtkWidget *entry;
}
if (type == ENTRY_TYPE_EDIT_CUSTOM) {
- GtkWidget *window;
+ GtkWidget *window, *dialog;
presence_chooser_reset_status (EMPATHY_PRESENCE_CHOOSER (self));
window = NULL;
}
- presence_chooser_dialog_show (GTK_WINDOW (window));
+ dialog = empathy_status_preset_dialog_new (GTK_WINDOW (window));
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
}
else if (type == ENTRY_TYPE_CUSTOM) {
gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
presence_chooser_set_status_editing (
EMPATHY_PRESENCE_CHOOSER (self),
FALSE);
+ gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
+ GTK_ENTRY_ICON_PRIMARY,
+ icon_name);
gtk_tree_model_get (model, &iter,
COL_STATUS_TEXT, &status,
G_OBJECT_CLASS (empathy_presence_chooser_parent_class)->finalize (object);
}
+/**
+ * empathy_presence_chooser_new:
+ *
+ * Creates a new #EmpathyPresenceChooser widget.
+ *
+ * Return value: A new #EmpathyPresenceChooser widget
+ */
GtkWidget *
empathy_presence_chooser_new (void)
{
presence_chooser_presence_changed_cb (EmpathyPresenceChooser *chooser)
{
EmpathyPresenceChooserPriv *priv;
- McPresence state;
- McPresence flash_state;
+ TpConnectionPresenceType state;
+ TpConnectionPresenceType flash_state;
const gchar *status;
GtkTreeModel *model;
GtkTreeIter iter;
valid;
valid = gtk_tree_model_iter_next (model, &iter)) {
int m_type;
- McPresence m_state;
+ TpConnectionPresenceType m_state;
char *m_status;
gtk_tree_model_get (model, &iter,
COL_STATUS_TEXT, &m_status,
-1);
- match = !strcmp (status, m_status);
+ match = !tp_strdiff (status, m_status);
g_free (m_status);
ui_set_custom_state (chooser, state, status);
}
- if (flash_state != MC_PRESENCE_UNSET) {
+ if (flash_state != TP_CONNECTION_PRESENCE_TYPE_UNSET) {
presence_chooser_flash_start (chooser, state, flash_state);
}
else {
presence_chooser_flash_timeout_cb (EmpathyPresenceChooser *chooser)
{
EmpathyPresenceChooserPriv *priv;
- McPresence state;
+ TpConnectionPresenceType state;
static gboolean on = FALSE;
GtkWidget *entry;
static void
presence_chooser_flash_start (EmpathyPresenceChooser *chooser,
- McPresence state_1,
- McPresence state_2)
+ TpConnectionPresenceType state_1,
+ TpConnectionPresenceType state_2)
{
EmpathyPresenceChooserPriv *priv;
static void
presence_chooser_flash_stop (EmpathyPresenceChooser *chooser,
- McPresence state)
+ TpConnectionPresenceType state)
{
EmpathyPresenceChooserPriv *priv = GET_PRIV (chooser);
GtkWidget *entry;
empathy_icon_name_for_presence (state));
}
+/**
+ * empathy_presence_chooser_create_menu:
+ *
+ * Creates a new #GtkMenu allowing users to change their presence from a menu.
+ *
+ * Return value: a new #GtkMenu for changing presence in a menu.
+ */
GtkWidget *
empathy_presence_chooser_create_menu (void)
{
menu = gtk_menu_new ();
- for (i = 0; i < G_N_ELEMENTS (states); i += 2) {
+ for (i = 0; states[i].state != TP_CONNECTION_PRESENCE_TYPE_UNSET; i++) {
GList *list, *l;
- status = empathy_presence_get_default_message (states[i]);
+ status = empathy_presence_get_default_message (states[i].state);
presence_chooser_menu_add_item (menu,
status,
- states[i]);
+ states[i].state);
- if (states[i+1]) {
+ if (states[i].customisable) {
/* Set custom messages if wanted */
- list = empathy_status_presets_get (states[i], 5);
+ list = empathy_status_presets_get (states[i].state, 5);
for (l = list; l; l = l->next) {
presence_chooser_menu_add_item (menu,
l->data,
- states[i]);
+ states[i].state);
}
g_list_free (list);
}
static void
presence_chooser_menu_add_item (GtkWidget *menu,
const gchar *str,
- McPresence state)
+ TpConnectionPresenceType state)
{
GtkWidget *item;
GtkWidget *image;
gtk_widget_show (image);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+ gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
gtk_widget_show (item);
g_object_set_data_full (G_OBJECT (item),
presence_chooser_noncustom_activate_cb (GtkWidget *item,
gpointer user_data)
{
- McPresence state;
+ TpConnectionPresenceType state;
const gchar *status;
status = g_object_get_data (G_OBJECT (item), "status");
}
static void
-presence_chooser_set_state (McPresence state,
+presence_chooser_set_state (TpConnectionPresenceType state,
const gchar *status)
{
EmpathyIdle *idle;
presence_chooser_custom_activate_cb (GtkWidget *item,
gpointer user_data)
{
- presence_chooser_dialog_show (NULL);
-}
-
-static McPresence
-presence_chooser_dialog_get_selected (CustomMessageDialog *dialog)
-{
- GtkTreeModel *model;
- GtkTreeIter iter;
- McPresence presence = LAST_MC_PRESENCE;
-
- model = gtk_combo_box_get_model (GTK_COMBO_BOX (dialog->combobox_status));
- if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (dialog->combobox_status), &iter)) {
- gtk_tree_model_get (model, &iter,
- COL_PRESENCE, &presence,
- -1);
- }
-
- return presence;
-}
-
-static void
-presence_chooser_dialog_status_changed_cb (GtkWidget *widget,
- CustomMessageDialog *dialog)
-{
- GtkListStore *store;
- GtkTreeIter iter;
- McPresence presence = LAST_MC_PRESENCE;
- GList *messages, *l;
-
- presence = presence_chooser_dialog_get_selected (dialog);
-
- store = gtk_list_store_new (1, G_TYPE_STRING);
- messages = empathy_status_presets_get (presence, -1);
- for (l = messages; l; l = l->next) {
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter, 0, l->data, -1);
- }
-
- gtk_entry_set_text (GTK_ENTRY (dialog->entry_message),
- messages ? messages->data : "");
-
- g_list_free (messages);
-
- gtk_combo_box_set_model (GTK_COMBO_BOX (dialog->comboboxentry_message),
- GTK_TREE_MODEL (store));
-
- g_object_unref (store);
-}
-
-static void
-presence_chooser_dialog_message_changed_cb (GtkWidget *widget,
- CustomMessageDialog *dialog)
-{
- McPresence presence;
- GList *messages, *l;
- const gchar *text;
- gboolean found = FALSE;
-
- presence = presence_chooser_dialog_get_selected (dialog);
- text = gtk_entry_get_text (GTK_ENTRY (dialog->entry_message));
-
- messages = empathy_status_presets_get (presence, -1);
- for (l = messages; l; l = l->next) {
- if (!tp_strdiff (text, l->data)) {
- found = TRUE;
- break;
- }
- }
- g_list_free (messages);
-
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->checkbutton_save),
- found);
-}
-
-static void
-presence_chooser_dialog_save_toggled_cb (GtkWidget *widget,
- CustomMessageDialog *dialog)
-{
- gboolean active;
- McPresence state;
- const gchar *text;
-
- active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->checkbutton_save));
- state = presence_chooser_dialog_get_selected (dialog);
- text = gtk_entry_get_text (GTK_ENTRY (dialog->entry_message));
-
- if (active) {
- empathy_status_presets_set_last (state, text);
- } else {
- empathy_status_presets_remove (state, text);
- }
-}
-
-static void
-presence_chooser_dialog_setup (CustomMessageDialog *dialog)
-{
- GtkListStore *store;
- GtkCellRenderer *renderer;
- GtkTreeIter iter;
- guint i;
-
- store = gtk_list_store_new (COL_COUNT,
- G_TYPE_STRING, /* Icon name */
- G_TYPE_STRING, /* Label */
- MC_TYPE_PRESENCE); /* Presence */
- gtk_combo_box_set_model (GTK_COMBO_BOX (dialog->combobox_status),
- GTK_TREE_MODEL (store));
-
- renderer = gtk_cell_renderer_pixbuf_new ();
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (dialog->combobox_status), renderer, FALSE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (dialog->combobox_status), renderer,
- "icon-name", COL_ICON,
- NULL);
- g_object_set (renderer, "stock-size", GTK_ICON_SIZE_BUTTON, NULL);
-
- renderer = gtk_cell_renderer_text_new ();
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (dialog->combobox_status), renderer, TRUE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (dialog->combobox_status), renderer,
- "text", COL_LABEL,
- NULL);
-
- for (i = 0; i < G_N_ELEMENTS (states); i += 2) {
- if (!states[i+1]) {
- continue;
- }
+ GtkWidget *dialog;
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter,
- COL_ICON, empathy_icon_name_for_presence (states[i]),
- COL_LABEL, empathy_presence_get_default_message (states[i]),
- COL_PRESENCE, states[i],
- -1);
- }
-
- gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->combobox_status), 0);
-}
-
-static void
-presence_chooser_dialog_response_cb (GtkWidget *widget,
- gint response,
- CustomMessageDialog *dialog)
-{
- if (response == GTK_RESPONSE_APPLY) {
- McPresence state;
- const gchar *text;
-
- state = presence_chooser_dialog_get_selected (dialog);
- text = gtk_entry_get_text (GTK_ENTRY (dialog->entry_message));
-
- presence_chooser_set_state (state, text);
- }
-
- gtk_widget_destroy (widget);
+ dialog = empathy_status_preset_dialog_new (NULL);
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
}
-
-static void
-presence_chooser_dialog_destroy_cb (GtkWidget *widget,
- CustomMessageDialog *dialog)
-{
-
- g_free (dialog);
- message_dialog = NULL;
-}
-
-static void
-presence_chooser_dialog_show (GtkWindow *parent)
-{
- GtkBuilder *gui;
- gchar *filename;
-
- if (message_dialog) {
- gtk_window_present (GTK_WINDOW (message_dialog->dialog));
- return;
- }
-
- message_dialog = g_new0 (CustomMessageDialog, 1);
-
- filename = empathy_file_lookup ("empathy-presence-chooser.ui",
- "libempathy-gtk");
- gui = empathy_builder_get_file (filename,
- "custom_message_dialog", &message_dialog->dialog,
- "checkbutton_save", &message_dialog->checkbutton_save,
- "comboboxentry_message", &message_dialog->comboboxentry_message,
- "combobox_status", &message_dialog->combobox_status,
- NULL);
- g_free (filename);
-
- empathy_builder_connect (gui, message_dialog,
- "custom_message_dialog", "destroy", presence_chooser_dialog_destroy_cb,
- "custom_message_dialog", "response", presence_chooser_dialog_response_cb,
- "combobox_status", "changed", presence_chooser_dialog_status_changed_cb,
- "checkbutton_save", "toggled", presence_chooser_dialog_save_toggled_cb,
- NULL);
-
- g_object_unref (gui);
-
- /* Setup the message combobox */
- message_dialog->entry_message = GTK_BIN (message_dialog->comboboxentry_message)->child;
- gtk_entry_set_activates_default (GTK_ENTRY (message_dialog->entry_message), TRUE);
- gtk_entry_set_width_chars (GTK_ENTRY (message_dialog->entry_message), 25);
- g_signal_connect (message_dialog->entry_message, "changed",
- G_CALLBACK (presence_chooser_dialog_message_changed_cb),
- message_dialog);
-
- presence_chooser_dialog_setup (message_dialog);
-
- gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (message_dialog->comboboxentry_message), 0);
-
- if (parent) {
- gtk_window_set_transient_for (
- GTK_WINDOW (message_dialog->dialog),
- parent);
- }
-
- gtk_widget_show_all (message_dialog->dialog);
-}
-