#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-status-presets.h>
-// FIXME - what's the correct debug flag?
-#define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
+#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include <libempathy/empathy-debug.h>
#include "empathy-ui-utils.h"
gboolean editing_status;
int block_set_editing;
int block_changed;
+ guint focus_out_idle_source;
McPresence state;
+ int previous_type;
McPresence flash_state_1;
McPresence flash_state_2;
};
static GtkTreeModel *
-create_model (void)
+presence_chooser_create_model (void)
{
- GtkListStore *store = gtk_list_store_new (N_COLUMNS,
+ GtkListStore *store;
+ char *custom_message;
+
+ 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_DISPLAY_MARKUP */
G_TYPE_BOOLEAN, /* COL_STATUS_CUSTOMISABLE */
G_TYPE_INT); /* COL_TYPE */
-
- GtkTreeIter iter;
-
+
+ custom_message = g_strdup_printf ("<i>%s</i>", _("Custom Message..."));
+
int i;
for (i = 0; i < G_N_ELEMENTS (states); i += 2) {
GList *list, *l;
+ const char *status, *icon_name;
- const char *status = empathy_presence_get_default_message (states[i]);
- const char *icon_name = empathy_icon_name_for_presence (states[i]);
+ status = empathy_presence_get_default_message (states[i]);
+ icon_name = empathy_icon_name_for_presence (states[i]);
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter,
+ gtk_list_store_insert_with_values (store, NULL, -1,
COL_STATE_ICON_NAME, icon_name,
COL_STATE, states[i],
COL_STATUS_TEXT, status,
-1);
if (states[i+1]) {
+
/* Set custom messages if wanted */
list = empathy_status_presets_get (states[i], 5);
for (l = list; l; l = l->next) {
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter,
+ gtk_list_store_insert_with_values (store,
+ NULL, -1,
COL_STATE_ICON_NAME, icon_name,
COL_STATE, states[i],
COL_STATUS_TEXT, l->data,
-1);
}
g_list_free (list);
-
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter,
+
+ gtk_list_store_insert_with_values (store, NULL, -1,
COL_STATE_ICON_NAME, icon_name,
COL_STATE, states[i],
COL_STATUS_TEXT, "",
- COL_DISPLAY_MARKUP, "<i>Custom Message...</i>",
+ COL_DISPLAY_MARKUP, custom_message,
COL_STATUS_CUSTOMISABLE, TRUE,
COL_TYPE, ENTRY_TYPE_CUSTOM,
-1);
}
}
-
+
/* add a separator */
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter,
+ gtk_list_store_insert_with_values (store, NULL, -1,
COL_TYPE, ENTRY_TYPE_SEPARATOR,
-1);
-
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter,
+
+ gtk_list_store_insert_with_values (store, NULL, -1,
COL_STATE_ICON_NAME, GTK_STOCK_EDIT,
COL_STATUS_TEXT, "",
- COL_DISPLAY_MARKUP, "Edit Custom Messages...",
+ COL_DISPLAY_MARKUP, _("Edit Custom Messages..."),
COL_TYPE, ENTRY_TYPE_EDIT_CUSTOM,
-1);
+ g_free (custom_message);
+
return GTK_TREE_MODEL (store);
}
static void
-popup_shown_cb (GObject *self, GParamSpec *pspec, gpointer user_data)
+presence_chooser_popup_shown_cb (GObject *self,
+ GParamSpec *pspec,
+ gpointer user_data)
{
+ EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
gboolean shown;
+
g_object_get (self, "popup-shown", &shown, NULL);
if (!shown) return;
- GtkTreeModel *model = create_model ();
+ /* 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;
+ }
+
+ GtkTreeModel *model = presence_chooser_create_model ();
gtk_combo_box_set_model (GTK_COMBO_BOX (self), GTK_TREE_MODEL (model));
-
+
g_object_unref (model);
}
static void
-set_status_editing (EmpathyPresenceChooser *self, gboolean editing)
+presence_chooser_set_status_editing (EmpathyPresenceChooser *self,
+ gboolean editing)
{
EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
GtkWidget *entry = gtk_bin_get_child (GTK_BIN (self));
if (priv->block_set_editing) return;
- if (editing)
- {
+ if (editing) {
priv->editing_status = TRUE;
+
gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
GTK_ENTRY_ICON_SECONDARY,
GTK_STOCK_OK);
GTK_ENTRY_ICON_PRIMARY,
FALSE);
}
- else
- {
+ else {
gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
GTK_ENTRY_ICON_SECONDARY,
NULL);
/* attempt to get the toplevel for this widget */
GtkWidget *window = gtk_widget_get_toplevel (GTK_WIDGET (self));
- if (GTK_WIDGET_TOPLEVEL (window) && GTK_IS_WINDOW (window))
- {
+ if (GTK_WIDGET_TOPLEVEL (window) && GTK_IS_WINDOW (window)) {
/* unset the focus */
gtk_window_set_focus (GTK_WINDOW (window), NULL);
}
+
+ /* 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;
+ }
+
gtk_editable_set_position (GTK_EDITABLE (entry), 0);
priv->editing_status = FALSE;
mc_set_custom_state (EmpathyPresenceChooser *self)
{
EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
- GtkWidget *entry = gtk_bin_get_child (GTK_BIN (self));
+ GtkWidget *entry;
+ const char *status;
+ entry = gtk_bin_get_child (GTK_BIN (self));
/* update the status with MC */
- const char *status = gtk_entry_get_text (GTK_ENTRY (entry));
+ 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,
const char *status)
{
EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
- GtkWidget *entry = gtk_bin_get_child (GTK_BIN (self));
+ GtkWidget *entry;
const char *icon_name;
+ entry = gtk_bin_get_child (GTK_BIN (self));
+
priv->block_set_editing++;
priv->block_changed++;
}
static void
-reset_status (EmpathyPresenceChooser *self)
+presence_chooser_reset_status (EmpathyPresenceChooser *self)
{
/* recover the status that was unset */
presence_chooser_presence_changed_cb (self);
+ presence_chooser_set_status_editing (self, FALSE);
}
static void
-entry_icon_release_cb (EmpathyPresenceChooser *self,
- GtkEntryIconPosition icon_pos,
- GdkEvent *event,
- GtkEntry *entry)
+presence_chooser_entry_icon_release_cb (EmpathyPresenceChooser *self,
+ GtkEntryIconPosition icon_pos,
+ GdkEvent *event,
+ GtkEntry *entry)
{
- set_status_editing (self, FALSE);
+ presence_chooser_set_status_editing (self, FALSE);
mc_set_custom_state (self);
}
static void
-entry_activate_cb (EmpathyPresenceChooser *self,
- GtkEntry *entry)
+presence_chooser_entry_activate_cb (EmpathyPresenceChooser *self,
+ GtkEntry *entry)
{
- set_status_editing (self, FALSE);
+ presence_chooser_set_status_editing (self, FALSE);
mc_set_custom_state (self);
}
static gboolean
-entry_key_press_event_cb (EmpathyPresenceChooser *self,
- GdkEventKey *event,
- GtkWidget *entry)
+presence_chooser_entry_key_press_event_cb (EmpathyPresenceChooser *self,
+ GdkEventKey *event,
+ GtkWidget *entry)
{
EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
- if (priv->editing_status && event->keyval == GDK_Escape)
- {
+ if (priv->editing_status && event->keyval == GDK_Escape) {
/* the user pressed Escape, undo the editing */
- set_status_editing (self, FALSE);
- reset_status (self);
+ presence_chooser_reset_status (self);
return TRUE;
}
+ else if (event->keyval == GDK_Up || event->keyval == GDK_Down) {
+ /* ignore */
+ return TRUE;
+ }
return FALSE; /* send this event elsewhere */
}
+static gboolean
+presence_chooser_entry_button_press_event_cb (EmpathyPresenceChooser *self,
+ GdkEventButton *event,
+ GtkWidget *entry)
+{
+ EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
+
+ if (!priv->editing_status &&
+ event->button == 1 &&
+ !GTK_WIDGET_HAS_FOCUS (entry)) {
+ gtk_widget_grab_focus (entry);
+ gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1);
+
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
static void
-changed_cb (GtkComboBox *self, gpointer user_data)
+presence_chooser_entry_changed_cb (EmpathyPresenceChooser *self,
+ GtkEntry *entry)
+{
+ EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
+
+ if (priv->block_changed) return;
+
+ /* the combo is being edited to a custom entry */
+ if (!priv->editing_status) {
+ presence_chooser_set_status_editing (self, TRUE);
+ }
+}
+
+static void
+presence_chooser_changed_cb (GtkComboBox *self, gpointer user_data)
{
EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
McPresence new_state;
gboolean customisable = TRUE;
int type = -1;
+ GtkWidget *entry;
GtkTreeModel *model = gtk_combo_box_get_model (self);
- if (!gtk_combo_box_get_active_iter (self, &iter))
- {
- /* the combo is being edited to a custom entry */
- if (!priv->editing_status)
- {
- set_status_editing (EMPATHY_PRESENCE_CHOOSER (self), TRUE);
- }
+ if (!gtk_combo_box_get_active_iter (self, &iter)) {
return;
}
COL_TYPE, &type,
-1);
- GtkWidget *entry = gtk_bin_get_child (GTK_BIN (self));
+ entry = gtk_bin_get_child (GTK_BIN (self));
/* some types of status aren't editable, set the editability of the
* entry appropriately. Unless we're just about to reset it anyway,
* in which case, don't fiddle with it */
- /* FIXME: there is a bug here, if we start in the Hidden state, it
- * will be editable. It's not something that often occurs though. */
- if (type != ENTRY_TYPE_EDIT_CUSTOM)
- {
+ if (type != ENTRY_TYPE_EDIT_CUSTOM) {
gtk_editable_set_editable (GTK_EDITABLE (entry), customisable);
priv->state = new_state;
}
- if (type == ENTRY_TYPE_EDIT_CUSTOM)
- {
- reset_status (EMPATHY_PRESENCE_CHOOSER (self));
+ if (type == ENTRY_TYPE_EDIT_CUSTOM) {
+ presence_chooser_reset_status (EMPATHY_PRESENCE_CHOOSER (self));
/* attempt to get the toplevel for this widget */
GtkWidget *window = gtk_widget_get_toplevel (GTK_WIDGET (self));
- if (!GTK_WIDGET_TOPLEVEL (window) || !GTK_IS_WINDOW (window))
- {
+ if (!GTK_WIDGET_TOPLEVEL (window) || !GTK_IS_WINDOW (window)) {
window = NULL;
}
presence_chooser_dialog_show (GTK_WINDOW (window));
}
- else if (type == ENTRY_TYPE_CUSTOM)
- {
+ else if (type == ENTRY_TYPE_CUSTOM) {
gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
GTK_ENTRY_ICON_PRIMARY,
icon_name);
/* preseed the status */
- const char *status = empathy_idle_get_status (priv->idle);
- priv->block_set_editing++;
- gtk_entry_set_text (GTK_ENTRY (entry), status);
- priv->block_set_editing--;
+ if (priv->previous_type == ENTRY_TYPE_BUILTIN) {
+ /* if their previous entry was a builtin, don't
+ * preseed */
+ gtk_entry_set_text (GTK_ENTRY (entry), "");
+ }
+ else {
+ /* else preseed the text of their currently entered
+ * status message */
+ const char *status;
+
+ status = empathy_idle_get_status (priv->idle);
+ gtk_entry_set_text (GTK_ENTRY (entry), status);
+ }
/* grab the focus */
gtk_widget_grab_focus (entry);
-
- set_status_editing (EMPATHY_PRESENCE_CHOOSER (self), TRUE);
}
- else
- {
+ else {
char *status;
/* just in case we were setting a new status when
* things were changed */
- set_status_editing (EMPATHY_PRESENCE_CHOOSER (self), FALSE);
+ presence_chooser_set_status_editing (
+ EMPATHY_PRESENCE_CHOOSER (self),
+ FALSE);
gtk_tree_model_get (model, &iter,
COL_STATUS_TEXT, &status,
g_free (status);
}
+ if (type != ENTRY_TYPE_EDIT_CUSTOM) {
+ priv->previous_type = type;
+ }
g_free (icon_name);
}
}
static gboolean
-focus_out_cb (EmpathyPresenceChooser *chooser, GdkEventFocus *event,
- GtkEntry *entry)
+presence_chooser_entry_focus_out_idle_cb (gpointer user_data)
+{
+ EmpathyPresenceChooser *chooser;
+ GtkWidget *entry;
+
+ DEBUG ("Autocommiting status message\n");
+
+ chooser = EMPATHY_PRESENCE_CHOOSER (user_data);
+ entry = gtk_bin_get_child (GTK_BIN (chooser));
+
+ presence_chooser_entry_activate_cb (chooser, GTK_ENTRY (entry));
+
+ return FALSE;
+}
+
+static gboolean
+presence_chooser_entry_focus_out_cb (EmpathyPresenceChooser *chooser,
+ GdkEventFocus *event,
+ GtkEntry *entry)
{
EmpathyPresenceChooserPriv *priv = GET_PRIV (chooser);
- if (priv->editing_status)
- {
- // entry_activate_cb (chooser, entry);
+ if (priv->editing_status) {
+ /* this seems a bit evil and maybe it will be fragile,
+ * someone should think of a better way to do it.
+ *
+ * The entry has focused out, but we don't know where the focus
+ * has gone. If it goes to the combo box, we don't want to
+ * do anything. If it's gone anywhere else, we want to commit
+ * the result.
+ *
+ * Thus we install this idle handler and store its source.
+ * If the source is scheduled when the popup handler runs,
+ * it will remove it, else the callback will commit the result.
+ */
+ priv->focus_out_idle_source = g_idle_add (
+ presence_chooser_entry_focus_out_idle_cb,
+ chooser);
}
+ gtk_editable_set_position (GTK_EDITABLE (entry), 0);
+
return FALSE;
}
{
EmpathyPresenceChooserPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (chooser,
EMPATHY_TYPE_PRESENCE_CHOOSER, EmpathyPresenceChooserPriv);
+ GtkTreeModel *model;
+ GtkWidget *entry;
+ GtkCellRenderer *renderer;
chooser->priv = priv;
-
- GtkTreeModel *model = create_model ();
+
+ model = presence_chooser_create_model ();
gtk_combo_box_set_model (GTK_COMBO_BOX (chooser), GTK_TREE_MODEL (model));
gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (chooser),
gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (chooser),
combo_row_separator_func,
NULL, NULL);
-
- GtkWidget *entry = gtk_bin_get_child (GTK_BIN (chooser));
+
+ entry = gtk_bin_get_child (GTK_BIN (chooser));
gtk_entry_set_icon_activatable (GTK_ENTRY (entry),
GTK_ENTRY_ICON_PRIMARY, FALSE);
g_signal_connect_object (entry, "icon-release",
- G_CALLBACK (entry_icon_release_cb), chooser,
+ G_CALLBACK (presence_chooser_entry_icon_release_cb),
+ chooser,
G_CONNECT_SWAPPED);
g_signal_connect_object (entry, "activate",
- G_CALLBACK (entry_activate_cb), chooser,
+ G_CALLBACK (presence_chooser_entry_activate_cb),
+ chooser,
G_CONNECT_SWAPPED);
g_signal_connect_object (entry, "key-press-event",
- G_CALLBACK (entry_key_press_event_cb), chooser,
+ G_CALLBACK (presence_chooser_entry_key_press_event_cb),
+ chooser,
+ G_CONNECT_SWAPPED);
+ g_signal_connect_object (entry, "button-press-event",
+ G_CALLBACK (presence_chooser_entry_button_press_event_cb),
+ chooser,
G_CONNECT_SWAPPED);
- // FIXME - should this also happen when the user presses TAB ?
- GtkCellRenderer *renderer;
gtk_cell_layout_clear (GTK_CELL_LAYOUT (chooser));
renderer = gtk_cell_renderer_pixbuf_new ();
g_object_unref (model);
g_signal_connect (chooser, "notify::popup-shown",
- G_CALLBACK (popup_shown_cb), NULL);
+ G_CALLBACK (presence_chooser_popup_shown_cb), NULL);
g_signal_connect (chooser, "changed",
- G_CALLBACK (changed_cb), NULL);
+ G_CALLBACK (presence_chooser_changed_cb), NULL);
g_signal_connect_swapped (entry, "changed",
- G_CALLBACK (changed_cb), chooser);
+ G_CALLBACK (presence_chooser_entry_changed_cb),
+ chooser);
g_signal_connect_swapped (entry, "focus-out-event",
- G_CALLBACK (focus_out_cb), chooser);
+ G_CALLBACK (presence_chooser_entry_focus_out_cb),
+ chooser);
priv->idle = empathy_idle_dup_singleton ();
presence_chooser_presence_changed_cb (chooser);
g_signal_connect_swapped (priv->idle, "notify",
- G_CALLBACK (presence_chooser_presence_changed_cb),
- chooser);
+ G_CALLBACK (presence_chooser_presence_changed_cb),
+ chooser);
g_object_set (chooser,
// FIXME: this string sucks
g_source_remove (priv->flash_timeout_id);
}
+ if (priv->focus_out_idle_source) {
+ g_source_remove (priv->focus_out_idle_source);
+ }
+
g_signal_handlers_disconnect_by_func (priv->idle,
presence_chooser_presence_changed_cb,
object);
EmpathyPresenceChooserPriv *priv;
McPresence state;
McPresence flash_state;
- const gchar *status;
+ const gchar *status;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ gboolean valid, match_state = FALSE, match = FALSE;
priv = GET_PRIV (chooser);
flash_state = empathy_idle_get_flash_state (priv->idle);
/* look through the model and attempt to find a matching state */
- GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX (chooser));
- GtkTreeIter iter;
- gboolean valid, match_state = FALSE, match = FALSE;
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (chooser));
for (valid = gtk_tree_model_get_iter_first (model, &iter);
valid;
- valid = gtk_tree_model_iter_next (model, &iter))
- {
+ valid = gtk_tree_model_iter_next (model, &iter)) {
int m_type;
McPresence m_state;
char *m_status;
if (m_type == ENTRY_TYPE_CUSTOM ||
m_type == ENTRY_TYPE_SEPARATOR ||
- m_type == ENTRY_TYPE_EDIT_CUSTOM)
- {
+ m_type == ENTRY_TYPE_EDIT_CUSTOM) {
continue;
}
- else if (!match_state && state == m_state)
- {
+ else if (!match_state && state == m_state) {
/* we are now in the section that can contain our
* match */
match_state = TRUE;
}
- else if (match_state && state != m_state)
- {
+ else if (match_state && state != m_state) {
/* we have passed the section that can contain our
* match */
break;
}
- if (match)
- {
+ if (match) {
priv->block_changed++;
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (chooser), &iter);
priv->block_changed--;
}
- else
- {
- // FIXME - do we insert the match into the menu?
+ else {
ui_set_custom_state (chooser, state, status);
}
if (flash_state != MC_PRESENCE_UNSET) {
presence_chooser_flash_start (chooser, state, flash_state);
- } else {
+ }
+ else {
presence_chooser_flash_stop (chooser, state);
}
}
if (on) {
state = priv->flash_state_1;
- } else {
+ }
+ else {
state = priv->flash_state_2;
}
priv->flash_timeout_id = 0;
}
GtkWidget *entry = gtk_bin_get_child (GTK_BIN (chooser));
-
+
gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
GTK_ENTRY_ICON_PRIMARY,
empathy_icon_name_for_presence (state));
-
- // FIXME - what does this do?
- // priv->last_state = state;
}
GtkWidget *
}
- /* Separator. */
+ /* Separator */
item = gtk_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
if (active) {
empathy_status_presets_set_last (state, text);
- } else {
+ }
+ else {
empathy_status_presets_remove (state, text);
}
}
projects / empathy.git / blobdiff