diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 1a66597c..f78a1191 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -17,9 +17,7 @@ find_packages(MAIN_PACKAGES REQUIRED set(RESOURCE_LIST dino-conversation-list-placeholder-arrow.svg - icons/scalable/actions/dino-account-plus-symbolic.svg icons/scalable/actions/dino-emoticon-add-symbolic.svg - icons/scalable/actions/dino-emoticon-symbolic.svg icons/scalable/actions/dino-qr-code-symbolic.svg icons/scalable/apps/im.dino.Dino.svg @@ -42,8 +40,6 @@ set(RESOURCE_LIST icons/scalable/mimetypes/dino-file-video-symbolic.svg icons/scalable/status/dino-double-tick-symbolic.svg - icons/scalable/status/dino-microphone-off-symbolic.svg - icons/scalable/status/dino-microphone-symbolic.svg icons/scalable/status/dino-party-popper-symbolic.svg icons/scalable/status/dino-security-high-symbolic.svg icons/scalable/status/dino-status-away.svg diff --git a/main/data/chat_input.ui b/main/data/chat_input.ui index ccc47e8e..cde00b22 100644 --- a/main/data/chat_input.ui +++ b/main/data/chat_input.ui @@ -51,7 +51,7 @@ - dino-emoticon-symbolic + emoji-people-symbolic False 2 start diff --git a/main/data/file_default_widget.ui b/main/data/file_default_widget.ui index 77ddebd1..bc89df1b 100644 --- a/main/data/file_default_widget.ui +++ b/main/data/file_default_widget.ui @@ -80,7 +80,7 @@ - open-menu-symbolic + view-more-symbolic 0 False @@ -90,4 +90,4 @@ - \ No newline at end of file + diff --git a/main/data/gresource.xml b/main/data/gresource.xml index 6d9febab..603d7fd0 100644 --- a/main/data/gresource.xml +++ b/main/data/gresource.xml @@ -20,9 +20,7 @@ file_default_widget.ui file_send_overlay.ui global_search.ui - icons/scalable/actions/dino-account-plus-symbolic.svg icons/scalable/actions/dino-emoticon-add-symbolic.svg - icons/scalable/actions/dino-emoticon-symbolic.svg icons/scalable/actions/dino-qr-code-symbolic.svg icons/scalable/apps/im.dino.Dino-symbolic.svg icons/scalable/apps/im.dino.Dino.svg @@ -41,8 +39,6 @@ icons/scalable/mimetypes/dino-file-table-symbolic.svg icons/scalable/mimetypes/dino-file-video-symbolic.svg icons/scalable/status/dino-double-tick-symbolic.svg - icons/scalable/status/dino-microphone-off-symbolic.svg - icons/scalable/status/dino-microphone-symbolic.svg icons/scalable/status/dino-party-popper-symbolic.svg icons/scalable/status/dino-security-high-symbolic.svg icons/scalable/status/dino-status-away.svg @@ -72,3 +68,4 @@ unified_window_placeholder.ui + diff --git a/main/data/icons/scalable/actions/dino-account-plus-symbolic.svg b/main/data/icons/scalable/actions/dino-account-plus-symbolic.svg deleted file mode 100644 index cf743afa..00000000 --- a/main/data/icons/scalable/actions/dino-account-plus-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/main/data/icons/scalable/actions/dino-emoticon-add-symbolic.svg b/main/data/icons/scalable/actions/dino-emoticon-add-symbolic.svg index 51cc75c6..649bd9de 100644 --- a/main/data/icons/scalable/actions/dino-emoticon-add-symbolic.svg +++ b/main/data/icons/scalable/actions/dino-emoticon-add-symbolic.svg @@ -1,5 +1,8 @@ - - - + + + + + + diff --git a/main/data/icons/scalable/actions/dino-emoticon-symbolic.svg b/main/data/icons/scalable/actions/dino-emoticon-symbolic.svg deleted file mode 100644 index 5656303d..00000000 --- a/main/data/icons/scalable/actions/dino-emoticon-symbolic.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/main/data/icons/scalable/devices/dino-phone-hangup-symbolic.svg b/main/data/icons/scalable/devices/dino-phone-hangup-symbolic.svg index ecd230ac..542533ba 100644 --- a/main/data/icons/scalable/devices/dino-phone-hangup-symbolic.svg +++ b/main/data/icons/scalable/devices/dino-phone-hangup-symbolic.svg @@ -1 +1,38 @@ - \ No newline at end of file + + + + + + + + diff --git a/main/data/icons/scalable/devices/dino-phone-in-talk-symbolic.svg b/main/data/icons/scalable/devices/dino-phone-in-talk-symbolic.svg index 351035da..905eb1ac 100644 --- a/main/data/icons/scalable/devices/dino-phone-in-talk-symbolic.svg +++ b/main/data/icons/scalable/devices/dino-phone-in-talk-symbolic.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + + + diff --git a/main/data/icons/scalable/devices/dino-phone-missed-symbolic.svg b/main/data/icons/scalable/devices/dino-phone-missed-symbolic.svg index 228f073e..ca8e6978 100644 --- a/main/data/icons/scalable/devices/dino-phone-missed-symbolic.svg +++ b/main/data/icons/scalable/devices/dino-phone-missed-symbolic.svg @@ -1 +1,5 @@ - \ No newline at end of file + + + + + diff --git a/main/data/icons/scalable/devices/dino-phone-ring-symbolic.svg b/main/data/icons/scalable/devices/dino-phone-ring-symbolic.svg index 06b8dcbf..13b32842 100644 --- a/main/data/icons/scalable/devices/dino-phone-ring-symbolic.svg +++ b/main/data/icons/scalable/devices/dino-phone-ring-symbolic.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + diff --git a/main/data/icons/scalable/devices/dino-phone-symbolic.svg b/main/data/icons/scalable/devices/dino-phone-symbolic.svg index 0020dddc..14c2225b 100644 --- a/main/data/icons/scalable/devices/dino-phone-symbolic.svg +++ b/main/data/icons/scalable/devices/dino-phone-symbolic.svg @@ -1 +1,8 @@ - \ No newline at end of file + + + + + + + + diff --git a/main/data/icons/scalable/status/dino-microphone-off-symbolic.svg b/main/data/icons/scalable/status/dino-microphone-off-symbolic.svg deleted file mode 100644 index 7e5b853d..00000000 --- a/main/data/icons/scalable/status/dino-microphone-off-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/main/data/icons/scalable/status/dino-microphone-symbolic.svg b/main/data/icons/scalable/status/dino-microphone-symbolic.svg deleted file mode 100644 index fbf0784a..00000000 --- a/main/data/icons/scalable/status/dino-microphone-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/main/data/icons/scalable/status/dino-video-off-symbolic.svg b/main/data/icons/scalable/status/dino-video-off-symbolic.svg index d438e065..6bfa690a 100644 --- a/main/data/icons/scalable/status/dino-video-off-symbolic.svg +++ b/main/data/icons/scalable/status/dino-video-off-symbolic.svg @@ -1 +1,5 @@ - \ No newline at end of file + + + + + diff --git a/main/data/icons/scalable/status/dino-video-symbolic.svg b/main/data/icons/scalable/status/dino-video-symbolic.svg index 60a1c742..2896c22d 100644 --- a/main/data/icons/scalable/status/dino-video-symbolic.svg +++ b/main/data/icons/scalable/status/dino-video-symbolic.svg @@ -1 +1,5 @@ - \ No newline at end of file + + + + + diff --git a/main/data/message_item_widget_edit_mode.ui b/main/data/message_item_widget_edit_mode.ui index 907dbbf0..e1ca4bc4 100644 --- a/main/data/message_item_widget_edit_mode.ui +++ b/main/data/message_item_widget_edit_mode.ui @@ -27,7 +27,7 @@ - dino-emoticon-symbolic + emoji-people-symbolic 1 diff --git a/main/src/ui/call_window/call_bottom_bar.vala b/main/src/ui/call_window/call_bottom_bar.vala index dfa2e4c6..641a4def 100644 --- a/main/src/ui/call_window/call_bottom_bar.vala +++ b/main/src/ui/call_window/call_bottom_bar.vala @@ -113,11 +113,11 @@ public class Dino.Ui.CallBottomBar : Gtk.Box { public void on_audio_enabled_changed() { if (audio_enabled) { - audio_image.icon_name = "dino-microphone-symbolic"; + audio_image.icon_name = "audio-input-microphone-symbolic"; audio_button.add_css_class("white-button"); audio_button.remove_css_class("transparent-white-button"); } else { - audio_image.icon_name = "dino-microphone-off-symbolic"; + audio_image.icon_name = "microphone-disabled-symbolic"; audio_button.remove_css_class("white-button"); audio_button.add_css_class("transparent-white-button"); } @@ -145,4 +145,4 @@ public class Dino.Ui.CallBottomBar : Gtk.Box { return (video_settings_button.popover != null && video_settings_button.popover.visible) || (audio_settings_button.popover != null && audio_settings_button.popover.visible); } -} \ No newline at end of file +} diff --git a/main/src/ui/call_window/participant_widget.vala b/main/src/ui/call_window/participant_widget.vala index bed64c30..0940bc9e 100644 --- a/main/src/ui/call_window/participant_widget.vala +++ b/main/src/ui/call_window/participant_widget.vala @@ -17,8 +17,8 @@ namespace Dino.Ui { public Box title_box = new Box(Orientation.VERTICAL, 0) { valign=Align.CENTER, hexpand=true }; public MenuButton encryption_button = new MenuButton() { opacity=0, has_frame=false, height_request=30, width_request=30, margin_end=5 }; public CallEncryptionButtonController encryption_button_controller; - public MenuButton menu_button = new MenuButton() { icon_name="open-menu-symbolic", has_frame=false }; - public Button invite_button = new Button.from_icon_name("dino-account-plus") { has_frame=false }; + public MenuButton menu_button = new MenuButton() { icon_name="view-more-symbolic", has_frame=false }; + public Button invite_button = new Button.from_icon_name("contact-new-symbolic") { has_frame=false }; public bool shows_video = false; public string? participant_name; @@ -140,4 +140,4 @@ namespace Dino.Ui { invite_button.visible = may_show_invite_button && is_highest_row && is_start_row; } } -} \ No newline at end of file +} diff --git a/main/src/ui/conversation_content_view/file_image_widget.vala b/main/src/ui/conversation_content_view/file_image_widget.vala index 505c46a0..43c3b74d 100644 --- a/main/src/ui/conversation_content_view/file_image_widget.vala +++ b/main/src/ui/conversation_content_view/file_image_widget.vala @@ -48,7 +48,7 @@ public class FileImageWidget : Box { string? mime_type = file_info.get_content_type(); MenuButton button = new MenuButton(); - button.icon_name = "open-menu"; + button.icon_name = "view-more"; Menu menu_model = new Menu(); menu_model.append(_("Open"), "file.open"); menu_model.append(_("Save as…"), "file.save_as"); diff --git a/main/src/ui/conversation_titlebar/menu_entry.vala b/main/src/ui/conversation_titlebar/menu_entry.vala index 7b484219..d0b9fbcd 100644 --- a/main/src/ui/conversation_titlebar/menu_entry.vala +++ b/main/src/ui/conversation_titlebar/menu_entry.vala @@ -11,7 +11,7 @@ class MenuEntry : Plugins.ConversationTitlebarEntry, Object { StreamInteractor stream_interactor; private Conversation? conversation; - Button button = new Button() { icon_name="open-menu-symbolic" }; + Button button = new Button() { icon_name="view-more-symbolic" }; public MenuEntry(StreamInteractor stream_interactor) { this.stream_interactor = stream_interactor;