From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 15 Apr 2010 20:45:22 +0000 (+0200)
Subject: improve gui and add presence icons
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=254304263258fff5960d4cbc7627933ae2630fdd

improve gui and add presence icons
---

diff --git a/gtk-glade/friendlist.c b/gtk-glade/friendlist.c
index 25173488..d4fddf87 100644
--- a/gtk-glade/friendlist.c
+++ b/gtk-glade/friendlist.c
@@ -39,17 +39,17 @@ typedef struct _status_picture_tab_t{
 } status_picture_tab_t;
 
 status_picture_tab_t status_picture_tab[]={
-	{	LINPHONE_STATUS_ONLINE,		"sip-online.png"	},
-	{	LINPHONE_STATUS_BUSY,		"sip-busy.png"		},
-	{	LINPHONE_STATUS_BERIGHTBACK,	"sip-bifm.png"		},
-	{	LINPHONE_STATUS_AWAY,		"sip-away.png"		},
-	{	LINPHONE_STATUS_ONTHEPHONE,	"sip-otp.png"		},
-	{	LINPHONE_STATUS_OUTTOLUNCH,	"sip-otl.png"		},
-	{	LINPHONE_STATUS_NOT_DISTURB,	"sip-closed.png"	},
-	{	LINPHONE_STATUS_MOVED,		"sip-closed.png"	},
-	{	LINPHONE_STATUS_ALT_SERVICE,	"sip-closed.png"	},
-	{	LINPHONE_STATUS_OFFLINE,	"sip-away.png"		},
-	{	LINPHONE_STATUS_PENDING,	"sip-wfa.png"		},
+	{	LINPHONE_STATUS_ONLINE,		"status-green.png"	},
+	{	LINPHONE_STATUS_BUSY,		"status-orange.png"		},
+	{	LINPHONE_STATUS_BERIGHTBACK,	"status-orange.png"		},
+	{	LINPHONE_STATUS_AWAY,		"status-orange.png"		},
+	{	LINPHONE_STATUS_ONTHEPHONE,	"status-orange.png"		},
+	{	LINPHONE_STATUS_OUTTOLUNCH,	"status-orange.png"		},
+	{	LINPHONE_STATUS_NOT_DISTURB,	"status-red.png"	},
+	{	LINPHONE_STATUS_MOVED,		"status-orange.png"	},
+	{	LINPHONE_STATUS_ALT_SERVICE,	"status-orange.png"	},
+	{	LINPHONE_STATUS_OFFLINE,	"status-offline.png"		},
+	{	LINPHONE_STATUS_PENDING,	"status-offline.png"		},
 	{	LINPHONE_STATUS_END,		NULL			},
 };
 
@@ -153,7 +153,7 @@ void linphone_gtk_set_my_presence(LinphoneOnlineStatus ss){
 	GtkWidget *image=gtk_image_new_from_pixbuf(pbuf);
 	GtkWidget *menu;
 	g_object_unref(G_OBJECT(pbuf));
-	gtk_button_set_label(GTK_BUTTON(button),linphone_online_status_to_string(ss));
+	gtk_widget_set_tooltip_text(button,linphone_online_status_to_string(ss));
 	gtk_button_set_image(GTK_BUTTON(button),image);
 	/*prepare menu*/
 	menu=(GtkWidget*)g_object_get_data(G_OBJECT(button),"presence_menu");
diff --git a/gtk-glade/incall_view.c b/gtk-glade/incall_view.c
index 1cf772b0..c3c95eab 100644
--- a/gtk-glade/incall_view.c
+++ b/gtk-glade/incall_view.c
@@ -208,6 +208,5 @@ void linphone_gtk_mute_toggled(GtkToggleButton *button){
 
 void linphone_gtk_enable_mute_button(GtkToggleButton *button, gboolean sensitive){
 	gtk_widget_set_sensitive(GTK_WIDGET(button),sensitive);
-	gtk_object_set(GTK_OBJECT(button),"gtk-button-images",TRUE,NULL);
 	linphone_gtk_draw_mute_button(button,FALSE);
 }
diff --git a/gtk-glade/main.c b/gtk-glade/main.c
index c87352f4..770e1241 100644
--- a/gtk-glade/main.c
+++ b/gtk-glade/main.c
@@ -1226,6 +1226,7 @@ int main(int argc, char *argv[]){
 	const char *config_file;
 	const char *factory_config_file;
 	const char *lang;
+	GtkSettings *settings;
 
 	g_thread_init(NULL);
 	gdk_threads_init();
@@ -1272,6 +1273,9 @@ int main(int argc, char *argv[]){
 		gdk_threads_leave();
 		return -1;
 	}
+	settings=gtk_settings_get_default();
+	g_object_set(settings, "gtk-menu-images", TRUE, NULL);
+	g_object_set(settings, "gtk-button-images", TRUE, NULL);
 #ifdef WIN32
 	if (workingdir!=NULL)
 		_chdir(workingdir);
diff --git a/pixmaps/status-green.png b/pixmaps/status-green.png
new file mode 100644
index 00000000..67eb9a97
Binary files /dev/null and b/pixmaps/status-green.png differ
diff --git a/pixmaps/status-offline.png b/pixmaps/status-offline.png
new file mode 100644
index 00000000..243c5c06
Binary files /dev/null and b/pixmaps/status-offline.png differ
diff --git a/pixmaps/status-orange.png b/pixmaps/status-orange.png
new file mode 100644
index 00000000..f2e66d34
Binary files /dev/null and b/pixmaps/status-orange.png differ
diff --git a/pixmaps/status-red.png b/pixmaps/status-red.png
new file mode 100644
index 00000000..e7a0ec98
Binary files /dev/null and b/pixmaps/status-red.png differ