diff --git a/gtk/incall_view.c b/gtk/incall_view.c index db056fdc8..15b1396bb 100644 --- a/gtk/incall_view.c +++ b/gtk/incall_view.c @@ -646,26 +646,16 @@ static void volume_control_value_changed(GtkScaleButton *button, gdouble value, } } -static void volume_control_button_update_value(GtkWidget *widget) { - LinphoneCall *call = (LinphoneCall *)g_object_get_data(G_OBJECT(widget), "call"); - VolumeControlType type = (VolumeControlType)g_object_get_data(G_OBJECT(widget), "type"); - - if(type == VOLUME_CTRL_PLAYBACK) { - gtk_scale_button_set_value(GTK_SCALE_BUTTON(widget), linphone_call_get_speaker_volume_gain(call)); - } else if(type == VOLUME_CTRL_RECORD) { - gtk_scale_button_set_value(GTK_SCALE_BUTTON(widget), linphone_call_get_microphone_volume_gain(call)); - } -} - -static gboolean volume_control_button_enter_event_handler(GtkWidget *widget) { - volume_control_button_update_value(widget); - return FALSE; -} - static void volume_control_init(GtkWidget *vol_ctrl, VolumeControlType type, LinphoneCall *call) { g_object_set_data(G_OBJECT(vol_ctrl), "call", call); g_object_set_data(G_OBJECT(vol_ctrl), "type", (gpointer)type); - g_signal_connect(G_OBJECT(vol_ctrl), "enter-notify-event", G_CALLBACK(volume_control_button_enter_event_handler), NULL); + + if(type == VOLUME_CTRL_PLAYBACK) { + gtk_scale_button_set_value(GTK_SCALE_BUTTON(vol_ctrl), linphone_call_get_speaker_volume_gain(call)); + } else if(type == VOLUME_CTRL_RECORD) { + gtk_scale_button_set_value(GTK_SCALE_BUTTON(vol_ctrl), linphone_call_get_microphone_volume_gain(call)); + } + g_signal_connect(G_OBJECT(vol_ctrl), "value-changed", G_CALLBACK(volume_control_value_changed), NULL); } @@ -874,11 +864,22 @@ void linphone_gtk_in_call_view_set_transfer_status(LinphoneCall *call,LinphoneCa } void linphone_gtk_draw_mute_button(GtkButton *button, gboolean active){ - const char *icon_name = active ? "linphone-micro-muted" : "linphone-micro-enabled"; - GtkWidget *image = gtk_image_new_from_icon_name(icon_name, GTK_ICON_SIZE_BUTTON); - gtk_button_set_image(button, image); - gtk_widget_show(image); g_object_set_data(G_OBJECT(button),"active",GINT_TO_POINTER(active)); + if (active){ + GtkWidget *image=create_pixmap("mic_muted.png"); + /*gtk_button_set_label(GTK_BUTTON(button),_("Unmute"));*/ + if (image!=NULL) { + gtk_button_set_image(GTK_BUTTON(button),image); + gtk_widget_show(image); + } + }else{ + GtkWidget *image=create_pixmap("mic_active.png"); + /*gtk_button_set_label(GTK_BUTTON(button),_("Mute"));*/ + if (image!=NULL) { + gtk_button_set_image(GTK_BUTTON(button),image); + gtk_widget_show(image); + } + } } void linphone_gtk_mute_clicked(GtkButton *button){ diff --git a/gtk/main.c b/gtk/main.c index 5a03ac033..f9bc2722d 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -2124,17 +2124,6 @@ int main(int argc, char *argv[]){ /*for pulseaudio:*/ g_setenv("PULSE_PROP_media.role", "phone", TRUE); #endif - - /* Add the data directory of Linphone to XDG_DATA_DIRS to enable GTK+ to find - the Linphone specific icons */ - tmp = g_getenv("XDG_DATA_DIRS"); - if(tmp && strlen(tmp) > 0) { - char *xdg_data_dirs = g_strdup_printf("%s:%s", tmp, PACKAGE_DATA_DIR "/linphone"); - g_setenv("XDG_DATA_DIRS", xdg_data_dirs, TRUE); - g_free(xdg_data_dirs); - } else { - g_setenv("XDG_DATA_DIRS", PACKAGE_DATA_DIR "/linphone", FALSE); - } lang=linphone_gtk_get_lang(config_file); if (lang == NULL || lang[0]=='\0'){ diff --git a/gtk/main.ui b/gtk/main.ui index 3f9d7fbe5..50f2a106f 100644 --- a/gtk/main.ui +++ b/gtk/main.ui @@ -2,7 +2,6 @@ - True False @@ -305,7 +304,10 @@ none False vertical - linphone-micro-enabled + audio-volume-muted +audio-volume-high +audio-volume-low +audio-volume-medium False @@ -348,7 +350,10 @@ none False vertical - linphone-speaker-enabled + audio-volume-muted +audio-volume-high +audio-volume-low +audio-volume-medium False diff --git a/pixmaps/CMakeLists.txt b/pixmaps/CMakeLists.txt index 8ad2c4485..800869425 100644 --- a/pixmaps/CMakeLists.txt +++ b/pixmaps/CMakeLists.txt @@ -27,11 +27,6 @@ install(FILES ${PIXMAPS} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) -install(DIRECTORY hicolor DESTINATION ${PACKAGE_DATA_DIR}/linphone/icons - FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -) - install(FILES linphone.png DESTINATION ${PACKAGE_DATA_DIR}/icons/hicolor/48x48/apps PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index 2b26e25f0..b0fb73d8a 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -1,5 +1,6 @@ pixmapdir=$(datadir)/pixmaps/linphone -dist_pixmap_DATA= \ + +pixmap_DATA= \ hold_on.png hold_off.png \ mic_muted.png mic_active.png \ linphone.png linphone-banner.png \ @@ -20,9 +21,9 @@ dist_pixmap_DATA= \ notok.png -appicondir=$(datadir)/icons/hicolor/48x48/apps -dist_appicon_DATA= linphone.png +iconsdir=$(datadir)/icons/hicolor/48x48/apps -iconsdir=$(datadir)/linphone/icons -dist_icons_DATA=hicolor +icons_DATA= linphone.png + +EXTRA_DIST=$(pixmap_DATA) $(icons_DATA) diff --git a/pixmaps/hicolor/16x16/status/linphone-micro-enabled.png b/pixmaps/hicolor/16x16/status/linphone-micro-enabled.png deleted file mode 100644 index c0aae0a2a..000000000 Binary files a/pixmaps/hicolor/16x16/status/linphone-micro-enabled.png and /dev/null differ diff --git a/pixmaps/hicolor/16x16/status/linphone-micro-muted.png b/pixmaps/hicolor/16x16/status/linphone-micro-muted.png deleted file mode 100644 index 335a2532c..000000000 Binary files a/pixmaps/hicolor/16x16/status/linphone-micro-muted.png and /dev/null differ diff --git a/pixmaps/hicolor/16x16/status/linphone-speaker-enabled.png b/pixmaps/hicolor/16x16/status/linphone-speaker-enabled.png deleted file mode 100644 index aba6c2053..000000000 Binary files a/pixmaps/hicolor/16x16/status/linphone-speaker-enabled.png and /dev/null differ diff --git a/pixmaps/hicolor/16x16/status/linphone-speaker-muted.png b/pixmaps/hicolor/16x16/status/linphone-speaker-muted.png deleted file mode 100644 index 897024cd9..000000000 Binary files a/pixmaps/hicolor/16x16/status/linphone-speaker-muted.png and /dev/null differ diff --git a/pixmaps/hicolor/24x24/status/.directory b/pixmaps/hicolor/24x24/status/.directory deleted file mode 100644 index c8a3bf660..000000000 --- a/pixmaps/hicolor/24x24/status/.directory +++ /dev/null @@ -1,4 +0,0 @@ -[Dolphin] -PreviewsShown=true -Timestamp=2015,8,3,15,21,55 -Version=3 diff --git a/pixmaps/hicolor/24x24/status/linphone-micro-enabled.png b/pixmaps/hicolor/24x24/status/linphone-micro-enabled.png deleted file mode 100644 index 040601904..000000000 Binary files a/pixmaps/hicolor/24x24/status/linphone-micro-enabled.png and /dev/null differ diff --git a/pixmaps/hicolor/24x24/status/linphone-micro-muted.png b/pixmaps/hicolor/24x24/status/linphone-micro-muted.png deleted file mode 100644 index 4f930da9a..000000000 Binary files a/pixmaps/hicolor/24x24/status/linphone-micro-muted.png and /dev/null differ diff --git a/pixmaps/hicolor/24x24/status/linphone-speaker-enabled.png b/pixmaps/hicolor/24x24/status/linphone-speaker-enabled.png deleted file mode 100644 index 2e04950ad..000000000 Binary files a/pixmaps/hicolor/24x24/status/linphone-speaker-enabled.png and /dev/null differ diff --git a/pixmaps/hicolor/24x24/status/linphone-speaker-muted.png b/pixmaps/hicolor/24x24/status/linphone-speaker-muted.png deleted file mode 100644 index 9d36ab72d..000000000 Binary files a/pixmaps/hicolor/24x24/status/linphone-speaker-muted.png and /dev/null differ diff --git a/pixmaps/hicolor/32x32/status/linphone-micro-enabled.png b/pixmaps/hicolor/32x32/status/linphone-micro-enabled.png deleted file mode 100644 index 9f350d868..000000000 Binary files a/pixmaps/hicolor/32x32/status/linphone-micro-enabled.png and /dev/null differ diff --git a/pixmaps/hicolor/32x32/status/linphone-micro-muted.png b/pixmaps/hicolor/32x32/status/linphone-micro-muted.png deleted file mode 100644 index 98d9a36da..000000000 Binary files a/pixmaps/hicolor/32x32/status/linphone-micro-muted.png and /dev/null differ diff --git a/pixmaps/hicolor/32x32/status/linphone-speaker-enabled.png b/pixmaps/hicolor/32x32/status/linphone-speaker-enabled.png deleted file mode 100644 index 79ab7b1b8..000000000 Binary files a/pixmaps/hicolor/32x32/status/linphone-speaker-enabled.png and /dev/null differ diff --git a/pixmaps/hicolor/32x32/status/linphone-speaker-muted.png b/pixmaps/hicolor/32x32/status/linphone-speaker-muted.png deleted file mode 100644 index 62a57710e..000000000 Binary files a/pixmaps/hicolor/32x32/status/linphone-speaker-muted.png and /dev/null differ diff --git a/pixmaps/hicolor/48x48/status/linphone-micro-enabled.png b/pixmaps/hicolor/48x48/status/linphone-micro-enabled.png deleted file mode 100644 index a54697ad1..000000000 Binary files a/pixmaps/hicolor/48x48/status/linphone-micro-enabled.png and /dev/null differ diff --git a/pixmaps/hicolor/48x48/status/linphone-micro-muted.png b/pixmaps/hicolor/48x48/status/linphone-micro-muted.png deleted file mode 100644 index 7856153dd..000000000 Binary files a/pixmaps/hicolor/48x48/status/linphone-micro-muted.png and /dev/null differ diff --git a/pixmaps/hicolor/48x48/status/linphone-speaker-enabled.png b/pixmaps/hicolor/48x48/status/linphone-speaker-enabled.png deleted file mode 100644 index 2b65cb057..000000000 Binary files a/pixmaps/hicolor/48x48/status/linphone-speaker-enabled.png and /dev/null differ diff --git a/pixmaps/hicolor/48x48/status/linphone-speaker-muted.png b/pixmaps/hicolor/48x48/status/linphone-speaker-muted.png deleted file mode 100644 index c7b8bf6d6..000000000 Binary files a/pixmaps/hicolor/48x48/status/linphone-speaker-muted.png and /dev/null differ diff --git a/pixmaps/mic_active.png b/pixmaps/mic_active.png new file mode 100644 index 000000000..ee6b9038c Binary files /dev/null and b/pixmaps/mic_active.png differ diff --git a/pixmaps/mic_muted.png b/pixmaps/mic_muted.png new file mode 100644 index 000000000..60fd18761 Binary files /dev/null and b/pixmaps/mic_muted.png differ diff --git a/pixmaps/speaker.png b/pixmaps/speaker.png new file mode 100644 index 000000000..acc92dbcf Binary files /dev/null and b/pixmaps/speaker.png differ diff --git a/pixmaps/svg/.directory b/pixmaps/svg/.directory deleted file mode 100644 index c99a6191a..000000000 --- a/pixmaps/svg/.directory +++ /dev/null @@ -1,4 +0,0 @@ -[Dolphin] -PreviewsShown=true -Timestamp=2015,8,3,13,7,36 -Version=3 diff --git a/pixmaps/svg/linphone-micro-enabled.svg b/pixmaps/svg/linphone-micro-enabled.svg deleted file mode 100644 index a23354bc1..000000000 --- a/pixmaps/svg/linphone-micro-enabled.svg +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - image/svg+xml - - micro_default - - - - - - micro_default - Created with Sketch. - - - - - - diff --git a/pixmaps/svg/linphone-micro-muted.svg b/pixmaps/svg/linphone-micro-muted.svg deleted file mode 100644 index 09d505c59..000000000 --- a/pixmaps/svg/linphone-micro-muted.svg +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - image/svg+xml - - micro_default - - - - - - micro_default - Created with Sketch. - - - - - - - - - - diff --git a/pixmaps/svg/linphone-speaker-enabled.svg b/pixmaps/svg/linphone-speaker-enabled.svg deleted file mode 100644 index 8a122795d..000000000 --- a/pixmaps/svg/linphone-speaker-enabled.svg +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - image/svg+xml - - speaker_default - - - - - - speaker_default - Created with Sketch. - - - - - - - - - - diff --git a/pixmaps/svg/linphone-speaker-muted.svg b/pixmaps/svg/linphone-speaker-muted.svg deleted file mode 100644 index 1e85b85be..000000000 --- a/pixmaps/svg/linphone-speaker-muted.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - image/svg+xml - - speaker_default - - - - - - speaker_default - Created with Sketch. - - - - -