diff --git a/gtk/main.c b/gtk/main.c index e1f2d47a9..20507d747 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -2041,7 +2041,7 @@ static void populate_xdg_data_dirs_envvar(void) { paths = g_strsplit(value, ":", -1); for(i=0; paths[i] && strcmp(paths[i], PACKAGE_DATA_DIR) != 0; i++); if(paths[i] == NULL) { - gchar *new_value = g_strdup_printf("%s:%s", value, PACKAGE_DATA_DIR); + gchar *new_value = g_strdup_printf("%s:%s", PACKAGE_DATA_DIR, value); g_setenv("XDG_DATA_DIRS", new_value, TRUE); g_free(new_value); } diff --git a/pixmaps/CMakeLists.txt b/pixmaps/CMakeLists.txt index 8c883d507..bc9722582 100644 --- a/pixmaps/CMakeLists.txt +++ b/pixmaps/CMakeLists.txt @@ -36,12 +36,24 @@ install(FILES svg/linphone-status-away.svg svg/linphone-status-donotdisturb.svg svg/linphone-status-offline.svg + svg/linphone-call-status-incoming.svg + svg/linphone-call-status-missed.svg + svg/linphone-call-status-outgoing.svg + svg/linphone-chat-new-message-and-writing.svg + svg/linphone-chat-new-message.svg + svg/linphone-chat-nothing.svg + svg/linphone-chat-writing.svg DESTINATION ${ICONS_INSTALL_DIR}/scalable/status PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ ) install(FILES svg/linphone-start-call.svg + svg/linphone-add-call.svg + svg/linphone-hold-off.svg + svg/linphone-hold-on.svg + svg/linphone-start-call2.svg + svg/linphone-start-chat.svg DESTINATION ${ICONS_INSTALL_DIR}/scalable/actions PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ ) @@ -61,6 +73,7 @@ install(FILES linphone-chat-new-message-and-writing.png linphone-call-status-incoming.png linphone-call-status-outgoing.png + linphone-call-status-missed.png linphone-contact-bookmarked.png linphone-contact-not-bookmarked.png DESTINATION ${ICONS_INSTALL_DIR}/48x48/status @@ -69,7 +82,6 @@ install(FILES install(FILES linphone-start-call2.png - linphone-show-dialer.png linphone-add-call.png linphone-start-call.png linphone-start-chat.png diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index 7fb8cd7a0..801deae51 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -27,6 +27,7 @@ dist_status48icons_DATA= \ linphone-chat-new-message-and-writing.png \ linphone-call-status-incoming.png \ linphone-call-status-outgoing.png \ + linphone-call-status-missed.png \ linphone-contact-bookmarked.png \ linphone-contact-not-bookmarked.png @@ -39,12 +40,18 @@ dist_statussvgicons_DATA= \ svg/linphone-status-online.svg \ svg/linphone-status-away.svg \ svg/linphone-status-donotdisturb.svg \ - svg/linphone-status-offline.svg + svg/linphone-status-offline.svg \ + svg/linphone-call-status-incoming.svg \ + svg/linphone-call-status-missed.svg \ + svg/linphone-call-status-outgoing.svg \ + svg/linphone-chat-new-message-and-writing.svg \ + svg/linphone-chat-new-message.svg \ + svg/linphone-chat-nothing.svg \ + svg/linphone-chat-writing.svg actions48iconsdir=$(iconsdir)/48x48/actions dist_actions48icons_DATA= \ linphone-start-call2.png \ - linphone-show-dialer.png \ linphone-add-call.png \ linphone-start-call.png \ linphone-start-chat.png \ @@ -52,3 +59,11 @@ dist_actions48icons_DATA= \ linphone-hold-on.png \ linphone-hold-off.png +actionssvgiconsdir=$(iconsdir)/scalable/actions +dist_actionssvgiconsdir_DATA= \ + svg/linphone-start-call.svg \ + svg/linphone-add-call.svg \ + svg/linphone-hold-off.svg \ + svg/linphone-hold-on.svg \ + svg/linphone-start-call2.svg \ + svg/linphone-start-chat.svg diff --git a/pixmaps/linphone-add-call.png b/pixmaps/linphone-add-call.png index ac53a29e8..9c9edeef8 100644 Binary files a/pixmaps/linphone-add-call.png and b/pixmaps/linphone-add-call.png differ diff --git a/pixmaps/linphone-call-status-incoming.png b/pixmaps/linphone-call-status-incoming.png index 0091c0f62..58bf8633c 100644 Binary files a/pixmaps/linphone-call-status-incoming.png and b/pixmaps/linphone-call-status-incoming.png differ diff --git a/pixmaps/linphone-call-status-missed.png b/pixmaps/linphone-call-status-missed.png new file mode 100644 index 000000000..ba6bee6ee Binary files /dev/null and b/pixmaps/linphone-call-status-missed.png differ diff --git a/pixmaps/linphone-call-status-outgoing.png b/pixmaps/linphone-call-status-outgoing.png index 0c2c19abc..73587dc7a 100644 Binary files a/pixmaps/linphone-call-status-outgoing.png and b/pixmaps/linphone-call-status-outgoing.png differ diff --git a/pixmaps/linphone-chat-new-message-and-writing.png b/pixmaps/linphone-chat-new-message-and-writing.png index c43437c08..f64f525bb 100644 Binary files a/pixmaps/linphone-chat-new-message-and-writing.png and b/pixmaps/linphone-chat-new-message-and-writing.png differ diff --git a/pixmaps/linphone-chat-new-message.png b/pixmaps/linphone-chat-new-message.png index baa4701f1..61341af11 100644 Binary files a/pixmaps/linphone-chat-new-message.png and b/pixmaps/linphone-chat-new-message.png differ diff --git a/pixmaps/linphone-chat-nothing.png b/pixmaps/linphone-chat-nothing.png index 49cad5319..9f6e1adc2 100644 Binary files a/pixmaps/linphone-chat-nothing.png and b/pixmaps/linphone-chat-nothing.png differ diff --git a/pixmaps/linphone-chat-writing.png b/pixmaps/linphone-chat-writing.png index 9b94a34c3..74c1a8269 100644 Binary files a/pixmaps/linphone-chat-writing.png and b/pixmaps/linphone-chat-writing.png differ diff --git a/pixmaps/linphone-hold-off.png b/pixmaps/linphone-hold-off.png index 016115266..b008a6896 100644 Binary files a/pixmaps/linphone-hold-off.png and b/pixmaps/linphone-hold-off.png differ diff --git a/pixmaps/linphone-hold-on.png b/pixmaps/linphone-hold-on.png index c287c8a32..1590a63b0 100644 Binary files a/pixmaps/linphone-hold-on.png and b/pixmaps/linphone-hold-on.png differ diff --git a/pixmaps/linphone-show-dialer.png b/pixmaps/linphone-show-dialer.png deleted file mode 100644 index 8f8b98f25..000000000 Binary files a/pixmaps/linphone-show-dialer.png and /dev/null differ diff --git a/pixmaps/linphone-start-call.png b/pixmaps/linphone-start-call.png index fab8701f9..ade0e15a4 100644 Binary files a/pixmaps/linphone-start-call.png and b/pixmaps/linphone-start-call.png differ diff --git a/pixmaps/linphone-start-call2.png b/pixmaps/linphone-start-call2.png index 6569ffff7..097271ce2 100644 Binary files a/pixmaps/linphone-start-call2.png and b/pixmaps/linphone-start-call2.png differ diff --git a/pixmaps/linphone-start-chat.png b/pixmaps/linphone-start-chat.png index 224eddb57..15b050f6f 100644 Binary files a/pixmaps/linphone-start-chat.png and b/pixmaps/linphone-start-chat.png differ diff --git a/pixmaps/linphone-status-away.png b/pixmaps/linphone-status-away.png index 75727dc28..56c7fb367 100644 Binary files a/pixmaps/linphone-status-away.png and b/pixmaps/linphone-status-away.png differ diff --git a/pixmaps/linphone-status-donotdisturb.png b/pixmaps/linphone-status-donotdisturb.png index 0556ce197..d5a1391de 100644 Binary files a/pixmaps/linphone-status-donotdisturb.png and b/pixmaps/linphone-status-donotdisturb.png differ diff --git a/pixmaps/linphone-status-offline.png b/pixmaps/linphone-status-offline.png index 0cefa05ac..c4f236f55 100644 Binary files a/pixmaps/linphone-status-offline.png and b/pixmaps/linphone-status-offline.png differ diff --git a/pixmaps/linphone-status-online.png b/pixmaps/linphone-status-online.png index e56456499..7fb4a1276 100644 Binary files a/pixmaps/linphone-status-online.png and b/pixmaps/linphone-status-online.png differ diff --git a/pixmaps/linphone-stop-call.png b/pixmaps/linphone-stop-call.png index 7f9574f91..da1a2eab5 100644 Binary files a/pixmaps/linphone-stop-call.png and b/pixmaps/linphone-stop-call.png differ diff --git a/pixmaps/svg/callkeybackground.svg b/pixmaps/svg/callkeybackground.svg deleted file mode 100644 index 4d86f7fd4..000000000 --- a/pixmaps/svg/callkeybackground.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - diff --git a/pixmaps/svg/contact.svg b/pixmaps/svg/contact.svg deleted file mode 100644 index f094b7a0a..000000000 --- a/pixmaps/svg/contact.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/pixmaps/svg/dialer.svg b/pixmaps/svg/dialer.svg deleted file mode 100644 index fef344bc3..000000000 --- a/pixmaps/svg/dialer.svg +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/pixmaps/svg/history.svg b/pixmaps/svg/history.svg deleted file mode 100644 index 11ba3a203..000000000 --- a/pixmaps/svg/history.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/pixmaps/svg/linphone-add-call.svg b/pixmaps/svg/linphone-add-call.svg new file mode 100644 index 000000000..ed8da23bc --- /dev/null +++ b/pixmaps/svg/linphone-add-call.svg @@ -0,0 +1,89 @@ + + + + + + image/svg+xml + + options_add_call + Rectangle 250 Copy 19 + + + + + + options_add_call + Rectangle 250 Copy 19 + Created with Sketch. + + + + + + + + diff --git a/pixmaps/svg/linphone-call-status-incoming.svg b/pixmaps/svg/linphone-call-status-incoming.svg new file mode 100644 index 000000000..af9dd9bf6 --- /dev/null +++ b/pixmaps/svg/linphone-call-status-incoming.svg @@ -0,0 +1,80 @@ + + + + + + image/svg+xml + + + + + + + call_status_incoming + Created with Sketch. + + + + + + + diff --git a/pixmaps/svg/linphone-call-status-missed.svg b/pixmaps/svg/linphone-call-status-missed.svg new file mode 100644 index 000000000..abb146cf1 --- /dev/null +++ b/pixmaps/svg/linphone-call-status-missed.svg @@ -0,0 +1,86 @@ + + + + + + image/svg+xml + + call_status_missed + + + + + + call_status_missed + Created with Sketch. + + + + + + + + diff --git a/pixmaps/svg/linphone-call-status-outgoing.svg b/pixmaps/svg/linphone-call-status-outgoing.svg new file mode 100644 index 000000000..cc8c66efb --- /dev/null +++ b/pixmaps/svg/linphone-call-status-outgoing.svg @@ -0,0 +1,78 @@ + + + + + + image/svg+xml + + call_status_outgoing + + + + + + call_status_outgoing + Created with Sketch. + + + + + diff --git a/pixmaps/svg/linphone-chat-new-message-and-writing.svg b/pixmaps/svg/linphone-chat-new-message-and-writing.svg new file mode 100644 index 000000000..9cd538ea3 --- /dev/null +++ b/pixmaps/svg/linphone-chat-new-message-and-writing.svg @@ -0,0 +1,76 @@ + + + + + + image/svg+xml + + + + + + + chat_start_body_over + Created with Sketch. + + + + + + diff --git a/pixmaps/svg/linphone-chat-new-message.svg b/pixmaps/svg/linphone-chat-new-message.svg new file mode 100644 index 000000000..8ad456ca2 --- /dev/null +++ b/pixmaps/svg/linphone-chat-new-message.svg @@ -0,0 +1,69 @@ + + + + + + image/svg+xml + + + + + + + chat_start_body_over + Created with Sketch. + + + + diff --git a/pixmaps/svg/linphone-chat-nothing.svg b/pixmaps/svg/linphone-chat-nothing.svg new file mode 100644 index 000000000..4835b5255 --- /dev/null +++ b/pixmaps/svg/linphone-chat-nothing.svg @@ -0,0 +1,69 @@ + + + + + + image/svg+xml + + + + + + + chat_start_body_over + Created with Sketch. + + + + diff --git a/pixmaps/svg/linphone-chat-writing.svg b/pixmaps/svg/linphone-chat-writing.svg new file mode 100644 index 000000000..7183818a1 --- /dev/null +++ b/pixmaps/svg/linphone-chat-writing.svg @@ -0,0 +1,73 @@ + + + + + + image/svg+xml + + + + + + + chat_start_body_over + Created with Sketch. + + + + + + diff --git a/pixmaps/svg/linphone-hold-off.svg b/pixmaps/svg/linphone-hold-off.svg new file mode 100644 index 000000000..bd44bbf3a --- /dev/null +++ b/pixmaps/svg/linphone-hold-off.svg @@ -0,0 +1,66 @@ + + + + + + image/svg+xml + + pause_big_default + + + + + + pause_big_default + Created with Sketch. + + + diff --git a/pixmaps/svg/linphone-hold-on.svg b/pixmaps/svg/linphone-hold-on.svg new file mode 100644 index 000000000..b25a411fd --- /dev/null +++ b/pixmaps/svg/linphone-hold-on.svg @@ -0,0 +1,65 @@ + + + + + + image/svg+xml + + + + + + + pause_small_over_selected + Created with Sketch. + + + diff --git a/pixmaps/svg/linphone-start-call.svg b/pixmaps/svg/linphone-start-call.svg index e22391a76..b7783041a 100644 --- a/pixmaps/svg/linphone-start-call.svg +++ b/pixmaps/svg/linphone-start-call.svg @@ -1,7 +1,6 @@ - - image/svg+xml + + + + image/svg+xml + + + + + \ No newline at end of file + inkscape:current-layer="svg2" /> + + call_alt_start + Created with Sketch. + + + + diff --git a/pixmaps/svg/linphone-start-call2.svg b/pixmaps/svg/linphone-start-call2.svg new file mode 100644 index 000000000..4e6f22d9a --- /dev/null +++ b/pixmaps/svg/linphone-start-call2.svg @@ -0,0 +1,69 @@ + + + + + + image/svg+xml + + + + + + + call_start_body_over + Created with Sketch. + + + + diff --git a/pixmaps/svg/linphone-start-chat.svg b/pixmaps/svg/linphone-start-chat.svg new file mode 100644 index 000000000..aa71e6c0f --- /dev/null +++ b/pixmaps/svg/linphone-start-chat.svg @@ -0,0 +1,77 @@ + + + + + + image/svg+xml + + footer_chat + + + + + + footer_chat + Created with Sketch. + + + + + + diff --git a/pixmaps/svg/linphone-status-away.svg b/pixmaps/svg/linphone-status-away.svg index fe3d1238c..46beec033 100644 --- a/pixmaps/svg/linphone-status-away.svg +++ b/pixmaps/svg/linphone-status-away.svg @@ -1,7 +1,6 @@ - - image/svg+xml + + + + image/svg+xml + + statut_absent + + + + \ No newline at end of file + inkscape:current-layer="svg2" /> + + statut_absent + Created with Sketch. + + + diff --git a/pixmaps/svg/linphone-status-donotdisturb.svg b/pixmaps/svg/linphone-status-donotdisturb.svg index a1fc9701a..54e2ef8fe 100644 --- a/pixmaps/svg/linphone-status-donotdisturb.svg +++ b/pixmaps/svg/linphone-status-donotdisturb.svg @@ -1,7 +1,6 @@ - - image/svg+xml + + + + image/svg+xml + + + + + \ No newline at end of file + inkscape:current-layer="svg2" /> + + led_error + Created with Sketch. + + + + diff --git a/pixmaps/svg/linphone-status-offline.svg b/pixmaps/svg/linphone-status-offline.svg index cea91849c..890ee2f7f 100644 --- a/pixmaps/svg/linphone-status-offline.svg +++ b/pixmaps/svg/linphone-status-offline.svg @@ -1,7 +1,6 @@ - - image/svg+xml + + + + image/svg+xml + + + + + \ No newline at end of file + inkscape:current-layer="svg2" /> + + led_disconnected + Created with Sketch. + + + + diff --git a/pixmaps/svg/linphone-status-online.svg b/pixmaps/svg/linphone-status-online.svg index e22391a76..5f7149e4d 100644 --- a/pixmaps/svg/linphone-status-online.svg +++ b/pixmaps/svg/linphone-status-online.svg @@ -1,7 +1,6 @@ - - image/svg+xml + + + + image/svg+xml + + status_available + + + + \ No newline at end of file + inkscape:current-layer="svg2" /> + + status_available + Created with Sketch. + + + diff --git a/pixmaps/svg/linphone-stop-call.svg b/pixmaps/svg/linphone-stop-call.svg index edc8b847c..ab4fa3b28 100644 --- a/pixmaps/svg/linphone-stop-call.svg +++ b/pixmaps/svg/linphone-stop-call.svg @@ -1,7 +1,6 @@ - - image/svg+xml + + + + image/svg+xml + + call_hangup + + + + + + call_hangup + Created with Sketch. + + + \ No newline at end of file + style="fill:none;fill-rule:evenodd;stroke:#ff0000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /> + + diff --git a/pixmaps/svg/more.svg b/pixmaps/svg/more.svg deleted file mode 100644 index a9d1c50c3..000000000 --- a/pixmaps/svg/more.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - -