Port from GTK3 to GTK4

1 files changed, 45 insertions, 58 deletions

diff --git a/main/data/contact_details_dialog.ui b/main/data/contact_details_dialog.ui
index 4058bc77..322cd2df 100644
--- a/main/data/contact_details_dialog.ui
+++ b/main/data/contact_details_dialog.ui
@@ -1,122 +1,109 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+    <requires lib="gtk" version="4.0"/>
     <template class="DinoUiContactDetailsDialog">
+        <property name="title">Conversation Details</property>
         <property name="modal">True</property>
         <child type="titlebar">
             <object class="GtkHeaderBar">
-                <property name="title">Conversation Details</property>
-                <property name="show_close_button">True</property>
-                <property name="visible">True</property>
             </object>
         </child>
-        <child internal-child="vbox">
+        <child internal-child="content_area">
             <object class="GtkBox">
-                <property name="expand">True</property>
-                <property name="visible">True</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
                 <child>
                     <object class="GtkScrolledWindow">
-                        <property name="propagate_natural_height">True</property>
+                        <property name="propagate_natural_height">1</property>
                         <property name="max_content_height">500</property>
                         <property name="hscrollbar_policy">never</property>
-                        <property name="expand">True</property>
-                        <property name="visible">True</property>
-                        <child>
+                        <property name="hexpand">1</property>
+                        <property name="vexpand">1</property>
+                        <property name="child">
                             <object class="GtkBox">
                                 <property name="orientation">vertical</property>
-                                <property name="visible">True</property>
                                 <child>
                                     <object class="GtkGrid">
                                         <property name="margin-top">20</property>
                                         <property name="margin-bottom">12</property>
-                                        <property name="margin-right">100</property>
-                                        <property name="margin-left">100</property>
+                                        <property name="margin-end">100</property>
+                                        <property name="margin-start">100</property>
                                         <property name="column-spacing">10</property>
-                                        <property name="visible">True</property>
                                         <child>
                                             <object class="DinoUiAvatarImage" id="avatar">
                                                 <property name="height">50</property>
                                                 <property name="width">50</property>
                                                 <property name="visible">True</property>
                                                 <property name="allow_gray">False</property>
+                                                <layout>
+                                                    <property name="column">0</property>
+                                                    <property name="row">0</property>
+                                                    <property name="row-span">2</property>
+                                                </layout>
                                             </object>
-                                            <packing>
-                                                <property name="left_attach">0</property>
-                                                <property name="top_attach">0</property>
-                                                <property name="width">1</property>
-                                                <property name="height">2</property>
-                                            </packing>
                                         </child>
                                         <child>
                                             <object class="DinoUiUtilEntryLabelHybrid" id="name_hybrid">
                                                 <property name="xalign">0</property>
-                                                <property name="expand">True</property>
+                                                <property name="hexpand">True</property>
                                                 <property name="visible">True</property>
+                                                <layout>
+                                                    <property name="column">1</property>
+                                                    <property name="row">0</property>
+                                                </layout>
                                             </object>
-                                            <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="top_attach">0</property>
-                                                <property name="width">1</property>
-                                                <property name="height">1</property>
-                                            </packing>
                                         </child>
                                         <child>
                                             <object class="GtkLabel" id="name_label">
                                                 <property name="xalign">0</property>
-                                                <property name="expand">True</property>
-                                                <property name="visible">True</property>
+                                                <property name="hexpand">1</property>
                                                 <attributes>
-                                                    <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+                                                    <attribute name="weight" value="PANGO_WEIGHT_BOLD"></attribute>
                                                 </attributes>
+                                                <layout>
+                                                    <property name="column">1</property>
+                                                    <property name="row">0</property>
+                                                </layout>
                                             </object>
-                                            <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="top_attach">0</property>
-                                                <property name="width">1</property>
-                                                <property name="height">1</property>
-                                            </packing>
                                         </child>
                                         <child>
                                             <object class="GtkLabel" id="jid_label">
                                                 <property name="xalign">0</property>
                                                 <property name="yalign">0</property>
-                                                <property name="selectable">True</property>
-                                                <property name="expand">True</property>
-                                                <property name="visible">True</property>
+                                                <property name="selectable">1</property>
+                                                <property name="hexpand">1</property>
+                                                <layout>
+                                                    <property name="column">1</property>
+                                                    <property name="row">1</property>
+                                                </layout>
                                             </object>
-                                            <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="top_attach">1</property>
-                                                <property name="width">1</property>
-                                                <property name="height">1</property>
-                                            </packing>
                                         </child>
                                         <child>
                                             <object class="GtkLabel" id="account_label">
                                                 <property name="xalign">1</property>
                                                 <property name="yalign">1</property>
-                                                <property name="margin">5</property>
-                                                <property name="expand">True</property>
-                                                <property name="visible">True</property>
+                                                <property name="margin-start">5</property>
+                                                <property name="margin-end">5</property>
+                                                <property name="margin-top">5</property>
+                                                <property name="margin-bottom">5</property>
+                                                <property name="hexpand">1</property>
+                                                <layout>
+                                                    <property name="column">2</property>
+                                                    <property name="row">1</property>
+                                                </layout>
                                             </object>
-                                            <packing>
-                                                <property name="left_attach">2</property>
-                                                <property name="top_attach">1</property>
-                                                <property name="width">1</property>
-                                                <property name="height">1</property>
-                                            </packing>
                                         </child>
                                     </object>
                                 </child>
                                 <child>
                                     <object class="GtkBox" id="main_box">
                                         <property name="orientation">vertical</property>
-                                        <property name="margin-right">100</property>
-                                        <property name="margin-left">100</property>
-                                        <property name="visible">True</property>
+                                        <property name="margin-end">100</property>
+                                        <property name="margin-start">100</property>
                                     </object>
                                 </child>
                             </object>
-                        </child>
+                        </property>
                     </object>
                 </child>
             </object>