From 7e7dcedaf31ee35499875491c9f569c575d28435 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Mon, 14 Feb 2022 14:55:59 +0100 Subject: Port from GTK3 to GTK4 --- main/CMakeLists.txt | 104 ++- main/data/add_conversation/add_contact_dialog.ui | 112 +-- main/data/add_conversation/add_groupchat_dialog.ui | 198 ++--- .../conference_details_fragment.ui | 301 +++---- main/data/add_conversation/list_row.ui | 89 +- main/data/add_conversation/select_jid_fragment.ui | 80 +- main/data/call_widget.ui | 11 +- main/data/chat_input.ui | 57 +- main/data/contact_details_dialog.ui | 103 +-- main/data/conversation_content_view/view.ui | 175 ++-- main/data/conversation_item_widget.ui | 73 ++ main/data/conversation_list_titlebar_csd.ui | 25 +- main/data/conversation_row.ui | 14 +- main/data/conversation_view.ui | 105 +-- main/data/emojichooser.ui | 410 ---------- main/data/file_default_widget.ui | 191 ++--- main/data/file_send_overlay.ui | 56 +- main/data/global_search.ui | 246 +++--- main/data/icons/dino-changes-allowed-symbolic.svg | 10 - main/data/icons/dino-changes-prevent-symbolic.svg | 67 -- main/data/icons/dino-device-desktop-symbolic.svg | 5 - main/data/icons/dino-device-phone-symbolic.svg | 6 - main/data/icons/dino-double-tick-symbolic.svg | 7 - main/data/icons/dino-emoticon-symbolic.svg | 4 - main/data/icons/dino-file-document-symbolic.svg | 6 - main/data/icons/dino-file-download-symbolic.svg | 5 - main/data/icons/dino-file-image-symbolic.svg | 6 - main/data/icons/dino-file-music-symbolic.svg | 7 - main/data/icons/dino-file-symbolic.svg | 4 - main/data/icons/dino-file-table-symbolic.svg | 10 - main/data/icons/dino-file-video-symbolic.svg | 5 - main/data/icons/dino-microphone-off-symbolic.svg | 1 - main/data/icons/dino-microphone-symbolic.svg | 1 - main/data/icons/dino-phone-hangup-symbolic.svg | 1 - main/data/icons/dino-phone-in-talk-symbolic.svg | 1 - main/data/icons/dino-phone-missed-symbolic.svg | 1 - main/data/icons/dino-phone-ring-symbolic.svg | 1 - main/data/icons/dino-phone-symbolic.svg | 1 - main/data/icons/dino-security-high-symbolic.svg | 5 - main/data/icons/dino-tick-symbolic.svg | 6 - main/data/icons/dino-video-off-symbolic.svg | 1 - main/data/icons/dino-video-symbolic.svg | 1 - main/data/icons/im.dino.Dino-symbolic.svg | 6 - .../icons/scalable/apps/im.dino.Dino-symbolic.svg | 6 + .../devices/dino-device-desktop-symbolic.svg | 5 + .../devices/dino-device-phone-symbolic.svg | 6 + .../devices/dino-phone-hangup-symbolic.svg | 1 + .../devices/dino-phone-in-talk-symbolic.svg | 1 + .../devices/dino-phone-missed-symbolic.svg | 1 + .../scalable/devices/dino-phone-ring-symbolic.svg | 1 + .../icons/scalable/devices/dino-phone-symbolic.svg | 1 + .../scalable/emotes/dino-emoticon-symbolic.svg | 4 + .../mimetypes/dino-file-document-symbolic.svg | 6 + .../mimetypes/dino-file-download-symbolic.svg | 5 + .../mimetypes/dino-file-image-symbolic.svg | 6 + .../mimetypes/dino-file-music-symbolic.svg | 7 + .../scalable/mimetypes/dino-file-symbolic.svg | 4 + .../mimetypes/dino-file-table-symbolic.svg | 10 + .../mimetypes/dino-file-video-symbolic.svg | 5 + .../status/dino-changes-allowed-symbolic.svg | 10 + .../status/dino-changes-prevent-symbolic.svg | 67 ++ .../scalable/status/dino-double-tick-symbolic.svg | 7 + .../status/dino-microphone-off-symbolic.svg | 1 + .../scalable/status/dino-microphone-symbolic.svg | 1 + .../status/dino-security-high-symbolic.svg | 5 + .../icons/scalable/status/dino-tick-symbolic.svg | 6 + .../scalable/status/dino-video-off-symbolic.svg | 1 + .../icons/scalable/status/dino-video-symbolic.svg | 1 + main/data/manage_accounts/account_row.ui | 14 +- main/data/manage_accounts/add_account_dialog.ui | 906 +++++++++------------ main/data/manage_accounts/dialog.ui | 212 ++--- main/data/menu_encryption.ui | 33 +- main/data/message_item_widget_edit_mode.ui | 14 +- main/data/occupant_list.ui | 17 +- main/data/occupant_list_item.ui | 64 +- main/data/search_autocomplete.ui | 5 +- main/data/settings_dialog.ui | 70 +- main/data/theme.css | 47 +- main/data/unified_main_content.ui | 189 ++--- main/data/unified_window_placeholder.ui | 22 +- main/src/emojichooser.c | 823 ------------------- main/src/emojichooser.h | 36 - main/src/main.vala | 2 +- .../ui/add_conversation/add_conference_dialog.vala | 71 +- .../ui/add_conversation/add_groupchat_dialog.vala | 11 +- .../conference_details_fragment.vala | 48 +- main/src/ui/add_conversation/conference_list.vala | 37 +- main/src/ui/add_conversation/list_row.vala | 21 +- main/src/ui/add_conversation/roster_list.vala | 40 +- .../ui/add_conversation/select_contact_dialog.vala | 20 +- .../ui/add_conversation/select_jid_fragment.vala | 74 +- main/src/ui/application.vala | 24 +- main/src/ui/avatar_image.vala | 23 +- .../src/ui/call_window/audio_settings_popover.vala | 56 +- main/src/ui/call_window/call_bottom_bar.vala | 64 +- .../call_connection_details_window.vala | 8 +- .../src/ui/call_window/call_encryption_button.vala | 50 +- main/src/ui/call_window/call_window.vala | 58 +- .../src/ui/call_window/call_window_controller.vala | 43 +- main/src/ui/call_window/participant_widget.vala | 71 +- .../src/ui/call_window/video_settings_popover.vala | 30 +- main/src/ui/chat_input/chat_input_controller.vala | 15 +- main/src/ui/chat_input/chat_text_view.vala | 55 +- main/src/ui/chat_input/edit_history.vala | 77 -- main/src/ui/chat_input/encryption_button.vala | 43 +- .../src/ui/chat_input/occupants_tab_completer.vala | 14 +- main/src/ui/chat_input/smiley_converter.vala | 8 +- main/src/ui/chat_input/view.vala | 30 +- main/src/ui/contact_details/blocking_provider.vala | 2 +- main/src/ui/contact_details/dialog.vala | 43 +- .../contact_details/muc_config_form_provider.vala | 2 +- .../ui/contact_details/permissions_provider.vala | 4 +- main/src/ui/contact_details/settings_provider.vala | 2 +- .../conversation_item_factory.vala | 36 + .../ui/conversation_content_view/call_widget.vala | 37 +- .../chat_state_populator.vala | 6 +- .../conversation_item_skeleton.vala | 265 +++--- .../conversation_view.vala | 133 ++- .../date_separator_populator.vala | 8 +- .../file_default_widget.vala | 78 +- .../file_image_widget.vala | 25 +- .../ui/conversation_content_view/file_widget.vala | 45 +- .../message_item_widget.vala | 229 ++++++ .../conversation_content_view/message_widget.vala | 217 ++--- .../subscription_notification.vala | 10 +- .../conversation_list_item_factory.vala | 245 ++++++ .../conversation_list/conversation_list_model.vala | 141 ++++ .../conversation_list/conversation_list_row.vala | 41 + main/src/ui/conversation_list_titlebar.vala | 18 +- .../conversation_selector.vala | 54 +- .../conversation_selector_row.vala | 6 +- main/src/ui/conversation_titlebar/call_entry.vala | 69 +- .../conversation_titlebar.vala | 69 +- main/src/ui/conversation_titlebar/menu_entry.vala | 44 +- .../ui/conversation_titlebar/occupants_entry.vala | 42 +- .../src/ui/conversation_titlebar/search_entry.vala | 20 +- main/src/ui/conversation_view.vala | 37 +- main/src/ui/conversation_view_controller.vala | 184 +++-- main/src/ui/file_send_overlay.vala | 46 +- main/src/ui/global_search.vala | 140 ++-- main/src/ui/main_window.vala | 107 ++- main/src/ui/main_window_controller.vala | 97 ++- .../src/ui/manage_accounts/add_account_dialog.vala | 65 +- main/src/ui/manage_accounts/dialog.vala | 48 +- main/src/ui/occupant_menu/list.vala | 53 +- main/src/ui/occupant_menu/list_row.vala | 19 +- main/src/ui/occupant_menu/view.vala | 44 +- main/src/ui/util/data_forms.vala | 10 +- main/src/ui/util/helper.vala | 45 +- main/src/ui/util/label_hybrid.vala | 66 +- main/src/ui/util/scaling_image.vala | 89 +- main/src/ui/util/size_request_box.vala | 6 +- main/src/ui/util/sizing_bin.vala | 38 +- main/vapi/emojichooser.vapi | 7 - 154 files changed, 4090 insertions(+), 5033 deletions(-) create mode 100644 main/data/conversation_item_widget.ui delete mode 100644 main/data/emojichooser.ui delete mode 100644 main/data/icons/dino-changes-allowed-symbolic.svg delete mode 100644 main/data/icons/dino-changes-prevent-symbolic.svg delete mode 100644 main/data/icons/dino-device-desktop-symbolic.svg delete mode 100644 main/data/icons/dino-device-phone-symbolic.svg delete mode 100644 main/data/icons/dino-double-tick-symbolic.svg delete mode 100644 main/data/icons/dino-emoticon-symbolic.svg delete mode 100644 main/data/icons/dino-file-document-symbolic.svg delete mode 100644 main/data/icons/dino-file-download-symbolic.svg delete mode 100644 main/data/icons/dino-file-image-symbolic.svg delete mode 100644 main/data/icons/dino-file-music-symbolic.svg delete mode 100644 main/data/icons/dino-file-symbolic.svg delete mode 100644 main/data/icons/dino-file-table-symbolic.svg delete mode 100644 main/data/icons/dino-file-video-symbolic.svg delete mode 100644 main/data/icons/dino-microphone-off-symbolic.svg delete mode 100644 main/data/icons/dino-microphone-symbolic.svg delete mode 100644 main/data/icons/dino-phone-hangup-symbolic.svg delete mode 100644 main/data/icons/dino-phone-in-talk-symbolic.svg delete mode 100644 main/data/icons/dino-phone-missed-symbolic.svg delete mode 100644 main/data/icons/dino-phone-ring-symbolic.svg delete mode 100644 main/data/icons/dino-phone-symbolic.svg delete mode 100644 main/data/icons/dino-security-high-symbolic.svg delete mode 100644 main/data/icons/dino-tick-symbolic.svg delete mode 100644 main/data/icons/dino-video-off-symbolic.svg delete mode 100644 main/data/icons/dino-video-symbolic.svg delete mode 100644 main/data/icons/im.dino.Dino-symbolic.svg create mode 100644 main/data/icons/scalable/apps/im.dino.Dino-symbolic.svg create mode 100644 main/data/icons/scalable/devices/dino-device-desktop-symbolic.svg create mode 100644 main/data/icons/scalable/devices/dino-device-phone-symbolic.svg create mode 100644 main/data/icons/scalable/devices/dino-phone-hangup-symbolic.svg create mode 100644 main/data/icons/scalable/devices/dino-phone-in-talk-symbolic.svg create mode 100644 main/data/icons/scalable/devices/dino-phone-missed-symbolic.svg create mode 100644 main/data/icons/scalable/devices/dino-phone-ring-symbolic.svg create mode 100644 main/data/icons/scalable/devices/dino-phone-symbolic.svg create mode 100644 main/data/icons/scalable/emotes/dino-emoticon-symbolic.svg create mode 100644 main/data/icons/scalable/mimetypes/dino-file-document-symbolic.svg create mode 100644 main/data/icons/scalable/mimetypes/dino-file-download-symbolic.svg create mode 100644 main/data/icons/scalable/mimetypes/dino-file-image-symbolic.svg create mode 100644 main/data/icons/scalable/mimetypes/dino-file-music-symbolic.svg create mode 100644 main/data/icons/scalable/mimetypes/dino-file-symbolic.svg create mode 100644 main/data/icons/scalable/mimetypes/dino-file-table-symbolic.svg create mode 100644 main/data/icons/scalable/mimetypes/dino-file-video-symbolic.svg create mode 100644 main/data/icons/scalable/status/dino-changes-allowed-symbolic.svg create mode 100644 main/data/icons/scalable/status/dino-changes-prevent-symbolic.svg create mode 100644 main/data/icons/scalable/status/dino-double-tick-symbolic.svg create mode 100644 main/data/icons/scalable/status/dino-microphone-off-symbolic.svg create mode 100644 main/data/icons/scalable/status/dino-microphone-symbolic.svg create mode 100644 main/data/icons/scalable/status/dino-security-high-symbolic.svg create mode 100644 main/data/icons/scalable/status/dino-tick-symbolic.svg create mode 100644 main/data/icons/scalable/status/dino-video-off-symbolic.svg create mode 100644 main/data/icons/scalable/status/dino-video-symbolic.svg delete mode 100644 main/src/emojichooser.c delete mode 100644 main/src/emojichooser.h delete mode 100644 main/src/ui/chat_input/edit_history.vala create mode 100644 main/src/ui/conversation_content/conversation_item_factory.vala create mode 100644 main/src/ui/conversation_content_view/message_item_widget.vala create mode 100644 main/src/ui/conversation_list/conversation_list_item_factory.vala create mode 100644 main/src/ui/conversation_list/conversation_list_model.vala create mode 100644 main/src/ui/conversation_list/conversation_list_row.vala delete mode 100644 main/vapi/emojichooser.vapi (limited to 'main') diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 2326253c..4a952396 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -8,48 +8,50 @@ find_packages(MAIN_PACKAGES REQUIRED GLib GModule GObject - GTK3 + GTK4 ICU - Gspell ) set(RESOURCE_LIST icons/dino-account-plus-symbolic.svg - icons/dino-changes-allowed-symbolic.svg - icons/dino-changes-prevent-symbolic.svg icons/dino-conversation-list-placeholder-arrow.svg - icons/dino-double-tick-symbolic.svg - icons/dino-emoticon-symbolic.svg icons/dino-qr-code-symbolic.svg - icons/dino-security-high-symbolic.svg - icons/dino-microphone-off-symbolic.svg - icons/dino-microphone-symbolic.svg icons/dino-party-popper-symbolic.svg - icons/dino-phone-hangup-symbolic.svg - icons/dino-phone-in-talk-symbolic.svg - icons/dino-phone-missed-symbolic.svg - icons/dino-phone-ring-symbolic.svg - icons/dino-phone-symbolic.svg icons/dino-status-away.svg icons/dino-status-chat.svg icons/dino-status-dnd.svg icons/dino-status-online.svg icons/im.dino.Dino.svg - icons/im.dino.Dino-symbolic.svg - icons/dino-tick-symbolic.svg - icons/dino-video-off-symbolic.svg - icons/dino-video-symbolic.svg - - icons/dino-device-desktop-symbolic.svg - icons/dino-device-phone-symbolic.svg - - icons/dino-file-document-symbolic.svg - icons/dino-file-download-symbolic.svg - icons/dino-file-image-symbolic.svg - icons/dino-file-music-symbolic.svg - icons/dino-file-symbolic.svg - icons/dino-file-table-symbolic.svg - icons/dino-file-video-symbolic.svg + + icons/scalable/apps/im.dino.Dino-symbolic.svg + + icons/scalable/devices/dino-device-desktop-symbolic.svg + icons/scalable/devices/dino-device-phone-symbolic.svg + icons/scalable/devices/dino-phone-hangup-symbolic.svg + icons/scalable/devices/dino-phone-in-talk-symbolic.svg + icons/scalable/devices/dino-phone-missed-symbolic.svg + icons/scalable/devices/dino-phone-ring-symbolic.svg + icons/scalable/devices/dino-phone-symbolic.svg + + icons/scalable/emotes/dino-emoticon-symbolic.svg + + icons/scalable/mimetypes/dino-file-document-symbolic.svg + icons/scalable/mimetypes/dino-file-download-symbolic.svg + icons/scalable/mimetypes/dino-file-image-symbolic.svg + icons/scalable/mimetypes/dino-file-music-symbolic.svg + icons/scalable/mimetypes/dino-file-symbolic.svg + icons/scalable/mimetypes/dino-file-table-symbolic.svg + icons/scalable/mimetypes/dino-file-video-symbolic.svg + + icons/scalable/status/dino-changes-allowed-symbolic.svg + icons/scalable/status/dino-changes-prevent-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-security-high-symbolic.svg + icons/scalable/status/dino-tick-symbolic.svg + icons/scalable/status/dino-video-off-symbolic.svg + icons/scalable/status/dino-video-symbolic.svg add_conversation/add_contact_dialog.ui add_conversation/add_groupchat_dialog.ui @@ -60,13 +62,13 @@ set(RESOURCE_LIST call_widget.ui chat_input.ui contact_details_dialog.ui + conversation_item_widget.ui conversation_list_titlebar.ui conversation_list_titlebar_csd.ui conversation_row.ui conversation_view.ui file_default_widget.ui file_send_overlay.ui - emojichooser.ui global_search.ui conversation_content_view/item_metadata_header.ui conversation_content_view/view.ui @@ -101,11 +103,11 @@ compile_gresources( unset(MAIN_EXTRA_OPTIONS) unset(MAIN_EXTRA_PACKAGES) -find_package(GDK3) -if(GDK3_WITH_X11) - set(MAIN_EXTRA_OPTIONS ${MAIN_EXTRA_OPTIONS} -D GDK3_WITH_X11) - set(MAIN_EXTRA_PACKAGES ${MAIN_EXTRA_PACKAGES} gdk-x11-3.0) -endif(GDK3_WITH_X11) +# find_package(GDK3) +# if(GDK3_WITH_X11) +# set(MAIN_EXTRA_OPTIONS ${MAIN_EXTRA_OPTIONS} -D GDK3_WITH_X11) +# set(MAIN_EXTRA_PACKAGES ${MAIN_EXTRA_PACKAGES} gdk-x11-3.0) +# endif(GDK3_WITH_X11) set(MAIN_EXTRA_OPTIONS ${MAIN_EXTRA_OPTIONS} --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi) vala_precompile(MAIN_VALA_C @@ -145,13 +147,23 @@ SOURCES src/ui/call_window/participant_widget.vala src/ui/call_window/video_settings_popover.vala + src/ui/conversation_content_view/call_widget.vala + src/ui/conversation_content_view/chat_state_populator.vala + src/ui/conversation_content_view/content_populator.vala + src/ui/conversation_content_view/conversation_item_skeleton.vala + src/ui/conversation_content_view/conversation_view.vala + src/ui/conversation_content_view/date_separator_populator.vala + src/ui/conversation_content_view/file_default_widget.vala + src/ui/conversation_content_view/file_image_widget.vala + src/ui/conversation_content_view/file_widget.vala + src/ui/conversation_content_view/message_widget.vala + src/ui/conversation_content_view/subscription_notification.vala + src/ui/chat_input/chat_input_controller.vala src/ui/chat_input/chat_text_view.vala - src/ui/chat_input/edit_history.vala src/ui/chat_input/encryption_button.vala src/ui/chat_input/occupants_tab_completer.vala src/ui/chat_input/smiley_converter.vala - src/ui/chat_input/spell_checker.vala src/ui/chat_input/view.vala src/ui/contact_details/blocking_provider.vala @@ -160,20 +172,8 @@ SOURCES src/ui/contact_details/dialog.vala src/ui/contact_details/muc_config_form_provider.vala - src/ui/conversation_selector/conversation_selector_row.vala src/ui/conversation_selector/conversation_selector.vala - - src/ui/conversation_content_view/call_widget.vala - src/ui/conversation_content_view/chat_state_populator.vala - src/ui/conversation_content_view/content_populator.vala - src/ui/conversation_content_view/conversation_item_skeleton.vala - src/ui/conversation_content_view/conversation_view.vala - src/ui/conversation_content_view/date_separator_populator.vala - src/ui/conversation_content_view/file_default_widget.vala - src/ui/conversation_content_view/file_image_widget.vala - src/ui/conversation_content_view/file_widget.vala - src/ui/conversation_content_view/message_widget.vala - src/ui/conversation_content_view/subscription_notification.vala + src/ui/conversation_selector/conversation_selector_row.vala src/ui/conversation_titlebar/call_entry.vala src/ui/conversation_titlebar/menu_entry.vala @@ -197,12 +197,10 @@ SOURCES src/ui/util/sizing_bin.vala src/ui/util/size_request_box.vala src/ui/util/scaling_image.vala - src/ui/util/preview_file_chooser_native.vala CUSTOM_VAPIS ${CMAKE_BINARY_DIR}/exports/xmpp-vala.vapi ${CMAKE_BINARY_DIR}/exports/qlite.vapi ${CMAKE_BINARY_DIR}/exports/dino_internal.vapi - vapi/emojichooser.vapi PACKAGES ${MAIN_PACKAGES} ${MAIN_EXTRA_PACKAGES} @@ -213,7 +211,7 @@ OPTIONS ) add_definitions(${VALA_CFLAGS} -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" -DLOCALE_INSTALL_DIR=\"${LOCALE_INSTALL_DIR}\") -add_executable(dino ${MAIN_VALA_C} ${MAIN_GRESOURCES_TARGET} src/emojichooser.c) +add_executable(dino ${MAIN_VALA_C} ${MAIN_GRESOURCES_TARGET}) add_dependencies(dino ${GETTEXT_PACKAGE}-translations) target_include_directories(dino PRIVATE src) target_link_libraries(dino libdino ${MAIN_PACKAGES}) diff --git a/main/data/add_conversation/add_contact_dialog.ui b/main/data/add_conversation/add_contact_dialog.ui index 6185c5ba..1abc9a7a 100644 --- a/main/data/add_conversation/add_contact_dialog.ui +++ b/main/data/add_conversation/add_contact_dialog.ui @@ -1,128 +1,102 @@ + - + \ No newline at end of file diff --git a/main/data/add_conversation/add_groupchat_dialog.ui b/main/data/add_conversation/add_groupchat_dialog.ui index 29638f53..5acd6891 100644 --- a/main/data/add_conversation/add_groupchat_dialog.ui +++ b/main/data/add_conversation/add_groupchat_dialog.ui @@ -1,201 +1,165 @@ + - + \ No newline at end of file diff --git a/main/data/add_conversation/conference_details_fragment.ui b/main/data/add_conversation/conference_details_fragment.ui index a4f6f5d3..0fdf2b8e 100644 --- a/main/data/add_conversation/conference_details_fragment.ui +++ b/main/data/add_conversation/conference_details_fragment.ui @@ -1,272 +1,238 @@ +