[Gaim-commits] CVS: gaim/src gtkprefs.c,1.305,1.306 gtksavedstatuses.c,1.28,1.29 gtksavedstatuses.h,1.4,1.5

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13236/src

Modified Files:
	gtkprefs.c gtksavedstatuses.c gtksavedstatuses.h 
Log Message:
A saved status dropdown.

I don't know if it works, because the only way for me to test it right now
is through remote X, over 3000 miles away.
And I ain't puttin up with that for long. I'm going to check it out when I
get home and fix it up locally.


Index: gtkprefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -d -p -r1.305 -r1.306
--- gtkprefs.c	22 Nov 2005 05:21:42 -0000	1.305
+++ gtkprefs.c	23 Nov 2005 02:04:59 -0000	1.306
@@ -32,6 +32,7 @@
 #include "proxy.h"
 #include "prpl.h"
 #include "request.h"
+#include "savedstatuses.h"
 #include "sound.h"
 #include "util.h"
 #include "network.h"
@@ -43,6 +44,7 @@
 #include "gtkimhtml.h"
 #include "gtkimhtmltoolbar.h"
 #include "gtkprefs.h"
+#include "gtksavedstatuses.h"
 #include "gtksound.h"
 #include "gtkthemes.h"
 #include "gtkutils.h"
@@ -1632,28 +1634,12 @@ sound_page()
 	return ret;
 }
 
-/* XXX CORE/UI */
-#if 0
+
 static void
-set_default_away(GtkWidget *w, gpointer data)
+set_idle_away(GaimSavedStatus *status)
 {
-	struct away_message *default_away = NULL;
-	int length = g_slist_length(away_messages);
-	int i = GPOINTER_TO_INT(data);
-
-	if (away_messages == NULL)
-		default_away = NULL;
-	else if (i >= length)
-		default_away = g_slist_nth_data(away_messages, length - 1);
-	else
-		default_away = g_slist_nth_data(away_messages, i);
-
-	if(default_away)
-		gaim_prefs_set_string("/core/away/default_message", default_away->name);
-	else
-		gaim_prefs_set_string("/core/away/default_message", "");
+	gaim_prefs_set_int("/core/savedstatus/idleaway", gaim_savedstatus_get_creation_time(status));
 }
-#endif
 
 static GtkWidget *
 away_page()
@@ -1664,6 +1650,7 @@ away_page()
 	GtkWidget *label;
 	GtkWidget *button;
 	GtkWidget *select;
+	GtkWidget *menu;
 	GtkSizeGroup *sg;
 
 	ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE);
@@ -1702,6 +1689,10 @@ away_page()
 	g_signal_connect(G_OBJECT(button), "clicked",
 					 G_CALLBACK(gaim_gtk_toggle_sensitive), label);
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+	menu = gaim_gtk_status_menu(gaim_savedstatus_get_idleaway(), G_CALLBACK(set_idle_away));
+	gtk_box_pack_start(GTK_BOX(hbox), menu, FALSE, FALSE, 0);
+	g_signal_connect(G_OBJECT(button), "clicked",
+			 G_CALLBACK(gaim_gtk_toggle_sensitive), menu);
 
 	/*
 	 * TODO: Need to allow users to choose a GaimSavedStatus
@@ -1713,6 +1704,7 @@ away_page()
 	 */
 
 	if (!gaim_prefs_get_bool("/core/away/away_when_idle")) {
+		gtk_widget_set_sensitive(GTK_WIDGET(menu), FALSE);
 		gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE);
 		gtk_widget_set_sensitive(GTK_WIDGET(label), FALSE);
 	}

Index: gtksavedstatuses.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtksavedstatuses.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -p -r1.28 -r1.29
--- gtksavedstatuses.c	20 Nov 2005 21:22:39 -0000	1.28
+++ gtksavedstatuses.c	23 Nov 2005 02:04:59 -0000	1.29
@@ -1450,6 +1450,56 @@ edit_substatus(StatusEditor *status_edit
 	gtk_widget_show(win);
 }
 
+/**************************************************************************
+ * Utilities                                                              *
+ **************************************************************************/
+
+void status_menu_cb(GtkComboBox *widget, void(*callback)(GaimSavedStatus*))
+{
+	GtkTreeIter iter;
+	char *title;
+	gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter);
+	gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(widget)), &iter,
+			   STATUS_WINDOW_COLUMN_TITLE, &title,
+			   -1);	
+	callback(gaim_savedstatus_find(title));
+}
+
+GtkWidget *gaim_gtk_status_menu(GaimSavedStatus *current_status, GCallback callback)
+{
+	GtkWidget *combobox;
+	const GList *saved_statuses;
+	GtkCellRenderer *rend;
+	int i;
+	int index = -1;
+	GtkListStore *ls = gtk_list_store_new(STATUS_WINDOW_NUM_COLUMNS,
+					      G_TYPE_STRING,
+					      G_TYPE_STRING,
+					      G_TYPE_STRING);
+	
+	
+	for (saved_statuses = gaim_savedstatuses_get_all(), i = 0;
+	     saved_statuses != NULL;
+	     saved_statuses = g_list_next(saved_statuses), i++) {
+		add_status_to_saved_status_list(ls, saved_statuses->data);
+		if (saved_statuses->data == current_status)
+			index = i;
+	}
+	
+	combobox = gtk_combo_box_new_with_model(GTK_TREE_MODEL(ls));
+	rend = gtk_cell_renderer_text_new();
+	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combobox), rend, TRUE);
+	gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(combobox), rend, "text",
+					   STATUS_WINDOW_COLUMN_TITLE);
+#if GTK_CHECK_VERSION(2,6,0)
+	g_object_set(rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+#endif
+	
+	gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), index);
+	g_signal_connect(G_OBJECT(combobox), "changed", G_CALLBACK(status_menu_cb), callback);
+	return combobox;
+}
+
 
 /**************************************************************************
 * GTK+ saved status glue

Index: gtksavedstatuses.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtksavedstatuses.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- gtksavedstatuses.h	4 Jan 2005 01:38:26 -0000	1.4
+++ gtksavedstatuses.h	23 Nov 2005 02:04:59 -0000	1.5
@@ -64,4 +64,13 @@ void gaim_gtk_status_init(void);
  */
 void gaim_gtk_status_uninit(void);
 
+/**
+ * Creates a dropdown menu of saved statuses and calls a callback
+ * when one is selected
+ *
+ * @param callback The callback to call when the selection changes
+ * @return         The menu widget
+ */
+GtkWidget *gaim_gtk_status_menu(GaimSavedStatus *status, GCallback callback);
+
 #endif /* _GAIM_GTKSAVEDSTATUSES_H_ */