Port from GTK3 to GTK4

2 files changed, 165 insertions, 219 deletions

diff --git a/plugins/omemo/data/contact_details_dialog.ui b/plugins/omemo/data/contact_details_dialog.ui
index 62aded6b..fdb9f1cf 100644
--- a/plugins/omemo/data/contact_details_dialog.ui
+++ b/plugins/omemo/data/contact_details_dialog.ui
@@ -1,28 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+    <requires lib="gtk" version="4.0"/>
     <template class="DinoPluginsOmemoContactDetailsDialog">
         <property name="modal">True</property>
         <property name="resizable">False</property>
-        <child internal-child="vbox">
+        <child internal-child="content_area">
             <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="margin">12</property>
+                <property name="margin-start">12</property>
+                <property name="margin-end">12</property>
+                <property name="margin-top">12</property>
+                <property name="margin-bottom">12</property>
                 <property name="spacing">12</property>
                 <child>
                     <object class="GtkFrame">
-                        <property name="visible">True</property>
-                        <child>
+                        <property name="child">
                             <object class="GtkListBox">
-                                <property name="visible">True</property>
                                 <property name="selection-mode">none</property>
                                 <child>
                                     <object class="GtkListBoxRow">
-                                        <property name="visible">True</property>
-                                        <property name="activatable">False</property>
-                                        <child>
+                                        <property name="activatable">0</property>
+                                        <property name="child">
                                             <object class="GtkBox">
-                                                <property name="visible">True</property>
-                                                <property name="orientation">horizontal</property>
                                                 <property name="margin-start">20</property>
                                                 <property name="margin-end">20</property>
                                                 <property name="margin-top">14</property>
@@ -30,27 +28,25 @@
                                                 <property name="spacing">40</property>
                                                 <child>
                                                     <object class="GtkBox">
-                                                        <property name="visible">True</property>
                                                         <property name="orientation">vertical</property>
-                                                        <property name="hexpand">True</property>
+                                                        <property name="hexpand">1</property>
                                                         <child>
                                                             <object class="GtkLabel" id="automatically_accept_new_label">
-                                                                <property name="visible">True</property>
                                                                 <property name="halign">start</property>
                                                                 <attributes>
-                                                                    <attribute name="scale" value="1.1"/>
+                                                                    <attribute name="scale" value="1.1"></attribute>
                                                                 </attributes>
                                                             </object>
                                                         </child>
                                                         <child>
                                                             <object class="GtkLabel" id="automatically_accept_new_descr">
-                                                                <property name="visible">True</property>
                                                                 <property name="max_width_chars">1</property>
-                                                                <property name="expand">True</property>
+                                                                <property name="hexpand">1</property>
+                                                                <property name="vexpand">1</property>
                                                                 <property name="xalign">0</property>
-                                                                <property name="wrap">True</property>
+                                                                <property name="wrap">1</property>
                                                                 <attributes>
-                                                                    <attribute name="scale" value="0.8"/>
+                                                                    <attribute name="scale" value="0.8"></attribute>
                                                                 </attributes>
                                                                 <style>
                                                                     <class name="dim-label"/>
@@ -61,92 +57,73 @@
                                                 </child>
                                                 <child>
                                                     <object class="GtkSwitch" id="auto_accept_switch">
-                                                        <property name="visible">True</property>
                                                         <property name="halign">end</property>
                                                         <property name="valign">center</property>
                                                     </object>
                                                 </child>
                                             </object>
-                                        </child>
+                                        </property>
                                     </object>
                                 </child>
                             </object>
-                        </child>
+                        </property>
                     </object>
                 </child>
                 <child>
                     <object class="GtkBox" id="own_fingerprint_container">
-                        <property name="visible">False</property>
+                        <property name="visible">0</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">2</property>
                         <child>
                             <object class="GtkLabel" id="own_key_label">
-                                <property name="visible">True</property>
                                 <property name="halign">start</property>
                                 <attributes>
-                                    <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+                                    <attribute name="weight" value="PANGO_WEIGHT_BOLD"></attribute>
                                 </attributes>
                             </object>
                         </child>
                         <child>
                             <object class="GtkFrame">
-                                <property name="visible">True</property>
-                                <child>
+                                <property name="child">
                                     <object class="GtkListBox">
-                                        <property name="visible">True</property>
                                         <property name="selection-mode">none</property>
                                         <child>
                                             <object class="GtkListBoxRow">
-                                                <property name="visible">True</property>
-                                                <property name="activatable">False</property>
-                                                <property name="hexpand">True</property>
-                                                <child>
+                                                <property name="activatable">0</property>
+                                                <property name="hexpand">1</property>
+                                                <property name="child">
                                                     <object class="GtkBox">
-                                                        <property name="visible">True</property>
                                                         <property name="margin-start">20</property>
                                                         <property name="margin-end">20</property>
                                                         <property name="margin-top">14</property>
                                                         <property name="spacing">40</property>
                                                         <property name="margin-bottom">14</property>
-                                                        <property name="orientation">horizontal</property>
-                                                        <property name="hexpand">True</property>
+                                                        <property name="hexpand">1</property>
                                                         <child>
                                                             <object class="GtkLabel" id="own_fingerprint_label">
-                                                                <property name="visible">True</property>
                                                                 <property name="halign">start</property>
                                                                 <property name="justify">right</property>
-                                                                <property name="hexpand">True</property>
+                                                                <property name="hexpand">1</property>
                                                             </object>
                                                         </child>
                                                         <child>
                                                             <object class="GtkBox">
-                                                                <property name="visible">True</property>
-                                                                <property name="orientation">horizontal</property>
-                                                                <property name="hexpand">True</property>
+                                                                <property name="hexpand">1</property>
                                                                 <property name="spacing">5</property>
                                                                 <child>
-                                                                    <object class="GtkButton" id="show_qrcode_button">
-                                                                        <property name="visible">True</property>
+                                                                    <object class="GtkMenuButton" id="show_qrcode_button">
+                                                                        <property name="icon-name">dino-qr-code-symbolic</property>
                                                                         <property name="halign">start</property>
-                                                                        <property name="hexpand">True</property>
-                                                                        <child>
-                                                                            <object class="GtkImage">
-                                                                                <property name="visible">True</property>
-                                                                                <property name="icon-name">dino-qr-code-symbolic</property>
-                                                                                <property name="icon-size">1</property>
-                                                                            </object>
-                                                                        </child>
+                                                                        <property name="hexpand">1</property>
                                                                     </object>
                                                                 </child>
                                                                 <child>
                                                                     <object class="GtkButton" id="copy_button">
-                                                                        <property name="visible">True</property>
                                                                         <property name="halign">end</property>
-                                                                        <property name="hexpand">True</property>
+                                                                        <property name="hexpand">1</property>
                                                                         <child>
                                                                             <object class="GtkImage">
-                                                                                <property name="visible">True</property>
-                                                                                <property name="icon-size">1</property>
+                                                                                <property name="icon-size">normal</property>
                                                                                 <property name="icon-name">edit-copy-symbolic</property>
                                                                             </object>
                                                                         </child>
@@ -155,114 +132,99 @@
                                                             </object>
                                                         </child>
                                                     </object>
-                                                </child>
+                                                </property>
                                             </object>
                                         </child>
                                     </object>
-                                </child>
+                                </property>
                             </object>
                         </child>
                     </object>
                 </child>
                 <child>
                     <object class="GtkBox" id="new_keys_container">
-                        <property name="visible">False</property>
+                        <property name="visible">0</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">2</property>
                         <child>
                             <object class="GtkLabel" id="new_keys_label">
-                                <property name="visible">True</property>
                                 <property name="halign">start</property>
                                 <attributes>
-                                    <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+                                    <attribute name="weight" value="PANGO_WEIGHT_BOLD"></attribute>
                                 </attributes>
                             </object>
                         </child>
                         <child>
                             <object class="GtkFrame">
-                                <property name="visible">True</property>
-                                <child>
+                                <property name="child">
                                     <object class="GtkScrolledWindow">
                                         <property name="hscrollbar_policy">never</property>
-                                        <property name="vscrollbar_policy">automatic</property>
-                                        <property name="visible">True</property>
-                                        <property name="propagate_natural_height">True</property>
-                                        <child>
+                                        <property name="propagate_natural_height">1</property>
+                                        <property name="child">
                                             <object class="GtkListBox" id="new_keys_listbox">
-                                                <property name="visible">True</property>
                                                 <property name="selection-mode">none</property>
                                             </object>
-                                        </child>
+                                        </property>
                                     </object>
-                                </child>
+                                </property>
                             </object>
                         </child>
                     </object>
                 </child>
                 <child>
                     <object class="GtkBox" id="keys_container">
-                        <property name="visible">False</property>
+                        <property name="visible">0</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">2</property>
                         <child>
                             <object class="GtkLabel" id="associated_keys_label">
-                                <property name="visible">True</property>
                                 <property name="halign">start</property>
                                 <attributes>
-                                    <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+                                    <attribute name="weight" value="PANGO_WEIGHT_BOLD"></attribute>
                                 </attributes>
                             </object>
                         </child>
                         <child>
                             <object class="GtkFrame">
-                                <property name="visible">True</property>
-                                <child>
+                                <property name="child">
                                     <object class="GtkScrolledWindow">
                                         <property name="hscrollbar_policy">never</property>
-                                        <property name="vscrollbar_policy">automatic</property>
-                                        <property name="visible">True</property>
-                                        <property name="propagate_natural_height">True</property>
-                                        <child>
+                                        <property name="propagate_natural_height">1</property>
+                                        <property name="child">
                                             <object class="GtkListBox" id="keys_listbox">
-                                                <property name="visible">True</property>
                                                 <property name="selection-mode">none</property>
                                             </object>
-                                        </child>
+                                        </property>
                                     </object>
-                                </child>
+                                </property>
                             </object>
                         </child>
                     </object>
                 </child>
                 <child>
                     <object class="GtkExpander" id="inactive_keys_expander">
-                        <property name="visible">False</property>
+                        <property name="visible">0</property>
                         <child type="label">
                             <object class="GtkLabel" id="inactive_expander_label">
-                                <property name="visible">True</property>
                                 <attributes>
-                                    <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+                                    <attribute name="weight" value="PANGO_WEIGHT_BOLD"></attribute>
                                 </attributes>
                             </object>
                         </child>
                         <child>
                             <object class="GtkFrame">
-                                <property name="visible">True</property>
                                 <property name="margin-top">2</property>
-                                <child>
+                                <property name="child">
                                     <object class="GtkScrolledWindow">
                                         <property name="hscrollbar_policy">never</property>
-                                        <property name="vscrollbar_policy">automatic</property>
-                                        <property name="visible">True</property>
-                                        <property name="propagate_natural_height">True</property>
-                                        <child>
+                                        <property name="propagate_natural_height">1</property>
+                                        <property name="child">
                                             <object class="GtkListBox" id="inactive_keys_listbox">
-                                                <property name="visible">True</property>
                                                 <property name="selection-mode">none</property>
                                             </object>
-                                        </child>
+                                        </property>
                                     </object>
-                                </child>
+                                </property>
                             </object>
                         </child>
                     </object>
@@ -271,19 +233,18 @@
         </child>
     </template>
     <object class="GtkPopover" id="qrcode_popover">
-        <property name="visible">False</property>
-        <property name="relative-to">show_qrcode_button</property>
         <property name="position">left</property>
-        <property name="modal">True</property>
-        <child>
+        <property name="child">
             <object class="GtkBox">
                 <property name="visible">True</property>
+                <property name="margin-start">10</property>
+                <property name="margin-end">10</property>
+                <property name="margin-top">10</property>
+                <property name="margin-bottom">10</property>
                 <child>
-                    <object class="GtkImage" id="qrcode_image">
-                        <property name="visible">True</property>
-                    </object>
+                    <object class="GtkImage" id="qrcode_image"/>
                 </child>
             </object>
-        </child>
+        </property>
     </object>
 </interface>
diff --git a/plugins/omemo/data/manage_key_dialog.ui b/plugins/omemo/data/manage_key_dialog.ui
index dcec4c90..37f158da 100644
--- a/plugins/omemo/data/manage_key_dialog.ui
+++ b/plugins/omemo/data/manage_key_dialog.ui
@@ -1,164 +1,149 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+    <requires lib="gtk" version="4.0"/>
     <template class="DinoPluginsOmemoManageKeyDialog">
         <property name="modal">True</property>
         <property name="resizable">False</property>
         <child type="titlebar">
             <object class="GtkHeaderBar" id="headerbar">
-                <property name="visible">True</property>
-                <property name="show_close_button">False</property>
+                <property name="show_title_buttons">0</property>
                 <child>
-                    <object class="GtkButton" id="cancel_button">
-                        <property name="sensitive">True</property>
-                        <property name="visible">True</property>
-                    </object>
-                    <packing>
-                        <property name="pack_type">start</property>
-                    </packing>
+                    <object class="GtkButton" id="cancel_button"/>
                 </child>
-                <child>
+                <child type="end">
                     <object class="GtkButton" id="ok_button">
-                        <property name="has_default">True</property>
-                        <property name="can_default">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="visible">True</property>
+                        <property name="sensitive">0</property>
                         <style>
                             <class name="suggested-action"/>
                         </style>
                     </object>
-                    <packing>
-                        <property name="pack_type">end</property>
-                    </packing>
                 </child>
             </object>
         </child>
-        <child internal-child="vbox">
+        <child internal-child="content_area">
             <object class="GtkBox">
-                <property name="visible">True</property>
                 <child>
                     <object class="GtkStack" id="manage_stack">
-                        <property name="visible">True</property>
                         <property name="transition-type">slide-left-right</property>
                         <child>
-                            <object class="GtkBox" id="main_screen">
-                                <property name="visible">True</property>
-                                <property name="margin">12</property>
-                                <property name="spacing">12</property>
-                                <property name="orientation">vertical</property>
-                                <property name="valign">center</property>
-                                <child>
-                                    <object class="GtkLabel" id="main_desc_label">
-                                        <property name="visible">True</property>
-                                        <property name="wrap">True</property>
-                                        <property name="xalign">0</property>
-                                        <property name="max-width-chars">1</property>
-                                    </object>
-                                </child>
-                                <child>
-                                    <object class="GtkFrame">
-                                        <property name="visible">True</property>
+                            <object class="GtkStackPage">
+                                <property name="name">main</property>
+                                <property name="child">
+                                    <object class="GtkBox" id="main_screen">
+                                        <property name="margin-start">12</property>
+                                        <property name="margin-end">12</property>
+                                        <property name="margin-top">12</property>
+                                        <property name="margin-bottom">12</property>
+                                        <property name="spacing">12</property>
+                                        <property name="orientation">vertical</property>
+                                        <property name="valign">center</property>
+                                        <child>
+                                            <object class="GtkLabel" id="main_desc_label">
+                                                <property name="wrap">1</property>
+                                                <property name="xalign">0</property>
+                                                <property name="max-width-chars">1</property>
+                                            </object>
+                                        </child>
                                         <child>
-                                            <object class="GtkListBox" id="main_action_list">
-                                                <property name="visible">True</property>
-                                                <property name="selection-mode">none</property>
+                                            <object class="GtkFrame">
+                                                <property name="child">
+                                                    <object class="GtkListBox" id="main_action_list">
+                                                        <property name="selection-mode">none</property>
+                                                    </object>
+                                                </property>
                                             </object>
                                         </child>
                                     </object>
-                                </child>
+                                </property>
                             </object>
-                            <packing>
-                                <property name="name">main</property>
-                            </packing>
                         </child>
                         <child>
-                            <object class="GtkBox" id="verify_screen">
-                                <property name="visible">True</property>
-                                <property name="margin">12</property>
-                                <property name="spacing">12</property>
-                                <property name="orientation">vertical</property>
-                                <property name="valign">center</property>
-                                <child>
-                                    <object class="GtkLabel" id="compare_fingerprint_label">
-                                        <property name="visible">True</property>
-                                        <property name="wrap">True</property>
-                                        <property name="xalign">0.5</property>
-                                        <property name="max-width-chars">45</property>
-                                    </object>
-                                </child>
-                                <child>
-                                    <object class="GtkBox">
-                                        <property name="visible">True</property>
-                                        <property name="orientation">vertical</property>
-                                        <property name="margin-left">12</property>
-                                        <property name="margin-right">12</property>
+                            <object class="GtkStackPage">
+                                <property name="name">verify</property>
+                                <property name="child">
+                                    <object class="GtkBox" id="verify_screen">
+                                        <property name="margin-start">12</property>
+                                        <property name="margin-end">12</property>
+                                        <property name="margin-top">12</property>
+                                        <property name="margin-bottom">12</property>
                                         <property name="spacing">12</property>
-                                        <property name="hexpand">False</property>
-                                        <property name="halign">center</property>
-                                        <child>
-                                            <object class="GtkLabel" id="verify_label">
-                                                <property name="visible">True</property>
-                                                <property name="margin-top">12</property>
-                                                <property name="margin-bottom">12</property>
-                                                <property name="justify">right</property>
-                                            </object>
-                                        </child>
+                                        <property name="orientation">vertical</property>
+                                        <property name="valign">center</property>
                                         <child>
-                                            <object class="GtkButton" id="verify_no_button">
-                                                <property name="visible">True</property>
-                                                <property name="hexpand">True</property>
+                                            <object class="GtkLabel" id="compare_fingerprint_label">
+                                                <property name="wrap">1</property>
+                                                <property name="max-width-chars">45</property>
                                             </object>
                                         </child>
                                         <child>
-                                            <object class="GtkButton" id="verify_yes_button">
-                                                <property name="visible">True</property>
-                                                <property name="hexpand">True</property>
+                                            <object class="GtkBox">
+                                                <property name="orientation">vertical</property>
+                                                <property name="margin-start">12</property>
+                                                <property name="margin-end">12</property>
+                                                <property name="spacing">12</property>
+                                                <property name="hexpand">0</property>
+                                                <property name="halign">center</property>
+                                                <child>
+                                                    <object class="GtkLabel" id="verify_label">
+                                                        <property name="margin-top">12</property>
+                                                        <property name="margin-bottom">12</property>
+                                                        <property name="justify">right</property>
+                                                    </object>
+                                                </child>
+                                                <child>
+                                                    <object class="GtkButton" id="verify_no_button">
+                                                        <property name="hexpand">1</property>
+                                                    </object>
+                                                </child>
+                                                <child>
+                                                    <object class="GtkButton" id="verify_yes_button">
+                                                        <property name="hexpand">1</property>
+                                                    </object>
+                                                </child>
                                             </object>
                                         </child>
                                     </object>
-                                </child>
+                                </property>
                             </object>
-                            <packing>
-                                <property name="name">verify</property>
-                            </packing>
                         </child>
                         <child>
-                            <object class="GtkBox" id="confirm_screen">
-                                <property name="visible">True</property>
-                                <property name="margin">12</property>
-                                <property name="spacing">12</property>
-                                <property name="orientation">vertical</property>
-                                <property name="valign">center</property>
-                                <child>
-                                    <object class="GtkImage" id="confirm_image">
-                                        <property name="visible">True</property>
-                                    </object>
-                                </child>
-                                <child>
-                                    <object class="GtkLabel" id="confirm_title_label">
-                                        <property name="visible">True</property>
-                                        <attributes>
-                                            <attribute name="scale" value="1.1"/>
-                                        </attributes>
-                                    </object>
-                                </child>
-                                <child>
-                                    <object class="GtkLabel" id="confirm_desc_label">
-                                        <property name="visible">True</property>
-                                        <property name="justify">center</property>
-                                        <property name="wrap">True</property>
-                                        <property name="max-width-chars">40</property>
-                                        <attributes>
-                                            <attribute name="scale" value="0.8"/>
-                                        </attributes>
-                                        <style>
-                                            <class name="dim-label"/>
-                                        </style>
+                            <object class="GtkStackPage">
+                                <property name="name">confirm</property>
+                                <property name="child">
+                                    <object class="GtkBox" id="confirm_screen">
+                                        <property name="margin-start">12</property>
+                                        <property name="margin-end">12</property>
+                                        <property name="margin-top">12</property>
+                                        <property name="margin-bottom">12</property>
+                                        <property name="spacing">12</property>
+                                        <property name="orientation">vertical</property>
+                                        <property name="valign">center</property>
+                                        <child>
+                                            <object class="GtkImage" id="confirm_image"/>
+                                        </child>
+                                        <child>
+                                            <object class="GtkLabel" id="confirm_title_label">
+                                                <attributes>
+                                                    <attribute name="scale" value="1.1"></attribute>
+                                                </attributes>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkLabel" id="confirm_desc_label">
+                                                <property name="justify">center</property>
+                                                <property name="wrap">1</property>
+                                                <property name="max-width-chars">40</property>
+                                                <attributes>
+                                                    <attribute name="scale" value="0.8"></attribute>
+                                                </attributes>
+                                                <style>
+                                                    <class name="dim-label"/>
+                                                </style>
+                                            </object>
+                                        </child>
                                     </object>
-                                </child>
+                                </property>
                             </object>
-                            <packing>
-                                <property name="name">confirm</property>
-                            </packing>
                         </child>
                     </object>
                 </child>