From 21ae42762d8a57da5cb1ec40b46e7510fc3121ad Mon Sep 17 00:00:00 2001
From: fiaxh <git@lightrise.org>
Date: Thu, 20 Jun 2024 12:05:20 +0200
Subject: Redesign and rewrite accounts and settings dialog into a combined one

---
 plugins/omemo/CMakeLists.txt | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'plugins/omemo/CMakeLists.txt')

diff --git a/plugins/omemo/CMakeLists.txt b/plugins/omemo/CMakeLists.txt
index 7ecaa0b8..9e290390 100644
--- a/plugins/omemo/CMakeLists.txt
+++ b/plugins/omemo/CMakeLists.txt
@@ -3,8 +3,10 @@ find_package(Gettext)
 include(${GETTEXT_USE_FILE})
 gettext_compile(${GETTEXT_PACKAGE} SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/po TARGET_NAME ${GETTEXT_PACKAGE}-translations)
 
+find_package(Adwaita REQUIRED)
 find_package(Qrencode REQUIRED)
 find_packages(OMEMO_PACKAGES REQUIRED
+    Adwaita
     Gee
     GLib
     GModule
@@ -19,6 +21,7 @@ find_package(SignalProtocol 2.3.2 REQUIRED)
 
 set(RESOURCE_LIST
     contact_details_dialog.ui
+    encryption_preferences_entry.ui
     manage_key_dialog.ui
 )
 
@@ -31,6 +34,13 @@ compile_gresources(
     PREFIX /im/dino/Dino/omemo
     SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data
 )
+set(OMEMO_DEFINITIONS)
+if(Adwaita_VERSION VERSION_GREATER_EQUAL "1.2")
+    set(OMEMO_DEFINITIONS ${OMEMO_DEFINITIONS} Adw_1_2)
+endif()
+
+message(STATUS ${Adwaita_VERSION})
+message(STATUS ${Adw_1_2})
 
 vala_precompile(OMEMO_VALA_C
 SOURCES
@@ -65,7 +75,6 @@ SOURCES
     src/signal/store.vala
     src/signal/util.vala
 
-    src/ui/account_settings_entry.vala
     src/ui/bad_messages_populator.vala
     src/ui/call_encryption_entry.vala
     src/ui/contact_details_provider.vala
@@ -73,6 +82,7 @@ SOURCES
     src/ui/device_notification_populator.vala
     src/ui/own_notifications.vala
     src/ui/encryption_list_entry.vala
+    src/ui/encryption_preferences_entry.vala
     src/ui/manage_key_dialog.vala
     src/ui/util.vala
 CUSTOM_VAPIS
@@ -86,6 +96,8 @@ PACKAGES
     ${OMEMO_PACKAGES}
 GRESOURCES
     ${OMEMO_GRESOURCES_XML}
+DEFINITIONS
+    ${OMEMO_DEFINITIONS}
 GENERATE_VAPI
     omemo
 GENERATE_HEADER
-- 
cgit v1.2.3-70-g09d2


From 984ae3f5b89081f97696cd5051167a18159aa60b Mon Sep 17 00:00:00 2001
From: fiaxh <git@lightrise.org>
Date: Thu, 20 Jun 2024 18:39:25 +0200
Subject: Settings dialog: Fix account subpage for Adwaita < 1.4, other fixes

fixes #1592
---
 main/data/gresource.xml                                              | 1 +
 main/data/preferences_window_account.ui                              | 3 +--
 main/src/ui/main_window_controller.vala                              | 2 +-
 main/src/windows/preferences_window/account_preferences_subpage.vala | 4 ++++
 plugins/omemo/CMakeLists.txt                                         | 3 ---
 5 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'plugins/omemo/CMakeLists.txt')

diff --git a/main/data/gresource.xml b/main/data/gresource.xml
index 30d0e288..ddf7ccf9 100644
--- a/main/data/gresource.xml
+++ b/main/data/gresource.xml
@@ -11,6 +11,7 @@
     <file>chat_input.ui</file>
     <file>conversation_content_view/item_metadata_header.ui</file>
     <file>conversation_content_view/view.ui</file>
+    <file>conversation_details.css</file>
     <file>conversation_details.ui</file>
     <file>conversation_item_widget.ui</file>
     <file>conversation_list_titlebar.ui</file>
diff --git a/main/data/preferences_window_account.ui b/main/data/preferences_window_account.ui
index 4280422d..e0fa4f76 100644
--- a/main/data/preferences_window_account.ui
+++ b/main/data/preferences_window_account.ui
@@ -4,11 +4,10 @@
   <template class="DinoUiAccountPreferencesSubpage">
     <property name="orientation">vertical</property>
     <child>
-      <object class="AdwHeaderBar">
+      <object class="AdwHeaderBar" id="headerbar">
         <style>
           <class name="flat"/>
         </style>
-        <property name="show-title">False</property>
         <child>
           <object class="GtkButton" id="back_button">
             <property name="icon-name">go-previous-symbolic</property>
diff --git a/main/src/ui/main_window_controller.vala b/main/src/ui/main_window_controller.vala
index 7a3ebcb2..2e270663 100644
--- a/main/src/ui/main_window_controller.vala
+++ b/main/src/ui/main_window_controller.vala
@@ -69,7 +69,7 @@ public class MainWindowController : Object {
             dialog.set_transient_for(app.get_active_window());
             dialog.present();
         });
-        window.accounts_placeholder.primary_button.clicked.connect(() => { app.activate_action("accounts", null); });
+        window.accounts_placeholder.primary_button.clicked.connect(() => { app.activate_action("preferences", null); });
         window.conversation_selector.conversation_selected.connect((conversation) => select_conversation(conversation));
 
 //        ConversationListModel list_model = new ConversationListModel(stream_interactor);
diff --git a/main/src/windows/preferences_window/account_preferences_subpage.vala b/main/src/windows/preferences_window/account_preferences_subpage.vala
index 462fc8e1..01cf5584 100644
--- a/main/src/windows/preferences_window/account_preferences_subpage.vala
+++ b/main/src/windows/preferences_window/account_preferences_subpage.vala
@@ -8,6 +8,7 @@ using Gdk;
 [GtkTemplate (ui = "/im/dino/Dino/preferences_window_account.ui")]
 public class Dino.Ui.AccountPreferencesSubpage : Gtk.Box {
 
+    [GtkChild] public unowned Adw.HeaderBar headerbar;
     [GtkChild] public unowned Button back_button;
     [GtkChild] public unowned AvatarPicture avatar;
     [GtkChild] public unowned Adw.ActionRow xmpp_address;
@@ -30,6 +31,9 @@ public class Dino.Ui.AccountPreferencesSubpage : Gtk.Box {
     private ulong alias_entry_changed = 0;
 
     construct {
+#if Adw_1_4
+        headerbar.show_title = false;
+#endif
         button_container.layout_manager = new NaturalDirectionBoxLayout((BoxLayout)button_container.layout_manager);
         back_button.clicked.connect(() => {
             var window = (Adw.PreferencesWindow) this.get_root();
diff --git a/plugins/omemo/CMakeLists.txt b/plugins/omemo/CMakeLists.txt
index 9e290390..a8920d72 100644
--- a/plugins/omemo/CMakeLists.txt
+++ b/plugins/omemo/CMakeLists.txt
@@ -39,9 +39,6 @@ if(Adwaita_VERSION VERSION_GREATER_EQUAL "1.2")
     set(OMEMO_DEFINITIONS ${OMEMO_DEFINITIONS} Adw_1_2)
 endif()
 
-message(STATUS ${Adwaita_VERSION})
-message(STATUS ${Adw_1_2})
-
 vala_precompile(OMEMO_VALA_C
 SOURCES
     src/dtls_srtp_verification_draft.vala
-- 
cgit v1.2.3-70-g09d2