diff --git a/gtk-glade/incall_view.c b/gtk-glade/incall_view.c
index 1167c5ccd..1cf772b05 100644
--- a/gtk-glade/incall_view.c
+++ b/gtk-glade/incall_view.c
@@ -164,7 +164,7 @@ void linphone_gtk_in_call_view_terminate(const char *error_msg){
GtkWidget *main_window=linphone_gtk_get_main_window();
GtkWidget *status=linphone_gtk_get_widget(main_window,"in_call_status");
GtkWidget *animation=linphone_gtk_get_widget(main_window,"in_call_animation");
- GdkPixbuf *pbuf=create_pixbuf(linphone_gtk_get_ui_config("stop_call_icon","red.png"));
+ GdkPixbuf *pbuf=create_pixbuf(linphone_gtk_get_ui_config("stop_call_icon","stopcall-red.png"));
if (error_msg==NULL)
gtk_label_set_markup(GTK_LABEL(status),_("Call ended."));
diff --git a/gtk-glade/main.c b/gtk-glade/main.c
index 85a354d40..c87352f4a 100644
--- a/gtk-glade/main.c
+++ b/gtk-glade/main.c
@@ -1048,14 +1048,16 @@ static void linphone_gtk_configure_main_window(){
static const char *stop_call_icon;
static const char *search_icon;
static gboolean update_check_menu;
+ static gboolean buttons_have_borders;
GtkWidget *w=linphone_gtk_get_main_window();
if (!config_loaded){
title=linphone_gtk_get_ui_config("title","Linphone");
home=linphone_gtk_get_ui_config("home","http://www.linphone.org");
- start_call_icon=linphone_gtk_get_ui_config("start_call_icon","green.png");
- stop_call_icon=linphone_gtk_get_ui_config("stop_call_icon","red.png");
+ start_call_icon=linphone_gtk_get_ui_config("start_call_icon","startcall-green.png");
+ stop_call_icon=linphone_gtk_get_ui_config("stop_call_icon","stopcall-red.png");
search_icon=linphone_gtk_get_ui_config("directory_search_icon",NULL);
update_check_menu=linphone_gtk_get_ui_config_int("update_check_menu",0);
+ buttons_have_borders=linphone_gtk_get_ui_config_int("buttons_border",1);
config_loaded=TRUE;
}
linphone_gtk_configure_window(w,"main_window");
@@ -1068,11 +1070,15 @@ static void linphone_gtk_configure_main_window(){
if (start_call_icon){
GdkPixbuf *pbuf=create_pixbuf(start_call_icon);
gtk_image_set_from_pixbuf(GTK_IMAGE(linphone_gtk_get_widget(w,"start_call_icon")),pbuf);
+ if (buttons_have_borders)
+ gtk_button_set_relief(GTK_BUTTON(linphone_gtk_get_widget(w,"start_call")),GTK_RELIEF_NORMAL);
g_object_unref(G_OBJECT(pbuf));
}
if (stop_call_icon){
GdkPixbuf *pbuf=create_pixbuf(stop_call_icon);
gtk_image_set_from_pixbuf(GTK_IMAGE(linphone_gtk_get_widget(w,"terminate_call_icon")),pbuf);
+ if (buttons_have_borders)
+ gtk_button_set_relief(GTK_BUTTON(linphone_gtk_get_widget(w,"terminate_call")),GTK_RELIEF_NORMAL);
g_object_unref(G_OBJECT(pbuf));
}
if (search_icon){
@@ -1086,6 +1092,20 @@ static void linphone_gtk_configure_main_window(){
tmp=g_strdup(home);
g_object_set_data(G_OBJECT(menu_item),"home",tmp);
}
+ {
+ GdkPixbuf *pbuf=create_pixbuf("contact-orange.png");
+ if (pbuf) {
+ gtk_image_set_from_pixbuf(GTK_IMAGE(linphone_gtk_get_widget(w,"contact_tab_icon")),pbuf);
+ g_object_unref(G_OBJECT(pbuf));
+ }
+ }
+ {
+ GdkPixbuf *pbuf=create_pixbuf("dialer-orange.png");
+ if (pbuf) {
+ gtk_image_set_from_pixbuf(GTK_IMAGE(linphone_gtk_get_widget(w,"keypad_tab_icon")),pbuf);
+ g_object_unref(G_OBJECT(pbuf));
+ }
+ }
if (!linphone_gtk_can_manage_accounts())
gtk_widget_hide(linphone_gtk_get_widget(w,"run_assistant"));
if (update_check_menu){
diff --git a/gtk-glade/main.glade b/gtk-glade/main.glade
index ee3183636..b858892fb 100644
--- a/gtk-glade/main.glade
+++ b/gtk-glade/main.glade
@@ -285,6 +285,7 @@
True
True
+ True
Enter username, phone number, or full sip address
●
@@ -709,9 +710,26 @@ Fiber Channel
-
+
True
- Contacts
+
+
+ True
+ gtk-missing-image
+
+
+ 0
+
+
+
+
+ True
+ Contacts
+
+
+ 1
+
+
False
@@ -733,270 +751,306 @@ Fiber Channel
0
0
-
+
True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 4
- 4
- 4
- 20
- 10
- True
+ 0
-
- D
+
True
- True
- True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 4
+ 4
+ 4
+ True
+
+
+ D
+ 50
+ 50
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 3
+ 4
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+
+ #
+ 50
+ 50
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 2
+ 3
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+
+ 0
+ 50
+ 50
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 1
+ 2
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+
+ *
+ 50
+ 50
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+
+ C
+ 50
+ 50
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 3
+ 4
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+
+ 9
+ 50
+ 50
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 2
+ 3
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+
+ 8
+ 50
+ 50
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 1
+ 2
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+
+ 7
+ 50
+ 50
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+
+ B
+ 50
+ 50
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 3
+ 4
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+
+ 6
+ 50
+ 50
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 2
+ 3
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+
+ 5
+ 50
+ 50
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 1
+ 2
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+
+ 4
+ 50
+ 50
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+
+ A
+ 50
+ 50
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+
+ 3
+ 50
+ 50
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+
+ 2
+ 50
+ 50
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+
+ 1
+ 50
+ 50
+ True
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ GTK_FILL
+
+
+
-
- 3
- 4
- 3
- 4
- GTK_FILL
-
-
-
-
-
- #
- True
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-
-
- 2
- 3
- 3
- 4
- GTK_FILL
-
-
-
-
-
- 0
- True
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-
-
- 1
- 2
- 3
- 4
- GTK_FILL
-
-
-
-
-
- *
- True
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-
-
- 3
- 4
- GTK_FILL
-
-
-
-
-
- C
- True
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-
-
- 3
- 4
- 2
- 3
- GTK_FILL
-
-
-
-
-
- 9
- True
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-
-
- 2
- 3
- 2
- 3
- GTK_FILL
-
-
-
-
-
- 8
- True
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-
-
- 1
- 2
- 2
- 3
- GTK_FILL
-
-
-
-
-
- 7
- True
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-
-
- 2
- 3
- GTK_FILL
-
-
-
-
-
- B
- True
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-
-
- 3
- 4
- 1
- 2
- GTK_FILL
-
-
-
-
-
- 6
- True
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-
-
- 2
- 3
- 1
- 2
- GTK_FILL
-
-
-
-
-
- 5
- True
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-
-
- 1
- 2
- 1
- 2
- GTK_FILL
-
-
-
-
-
- 4
- True
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
-
- A
- True
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-
-
- 3
- 4
- GTK_FILL
-
-
-
-
-
- 3
- True
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-
-
- 2
- 3
- GTK_FILL
-
-
-
-
-
- 2
- True
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
-
- 1
- True
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-
-
- GTK_FILL
-
-
@@ -1022,9 +1076,26 @@ Fiber Channel
-
+
True
- Keypad
+
+
+ True
+ gtk-missing-image
+
+
+ 0
+
+
+
+
+ True
+ Keypad
+
+
+ 1
+
+
1
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index e94ac7eef..15c7ec138 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -10,6 +10,7 @@ sip-otp.png sip-wfa.png \
green.png red.png \
mic_muted.png mic_active.png \
linphone-3-250x130.png linphone-3.png linphone2-57x57.png \
-linphone.png linphone-banner.png
+linphone.png linphone-banner.png \
+contact-orange.png dialer-orange.png
EXTRA_DIST=$(pixmap_DATA)
diff --git a/pixmaps/contact-orange.png b/pixmaps/contact-orange.png
new file mode 100644
index 000000000..53ba07ed8
Binary files /dev/null and b/pixmaps/contact-orange.png differ
diff --git a/pixmaps/dialer-orange.png b/pixmaps/dialer-orange.png
new file mode 100644
index 000000000..2d715eac0
Binary files /dev/null and b/pixmaps/dialer-orange.png differ
diff --git a/pixmaps/startcall-green.png b/pixmaps/startcall-green.png
new file mode 100644
index 000000000..2156d24e1
Binary files /dev/null and b/pixmaps/startcall-green.png differ
diff --git a/pixmaps/stopcall-red.png b/pixmaps/stopcall-red.png
new file mode 100644
index 000000000..1004b8a01
Binary files /dev/null and b/pixmaps/stopcall-red.png differ