Port from GTK3 to GTK4

1 files changed, 51 insertions, 53 deletions

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})