Port from GTK3 to GTK4

1 files changed, 131 insertions, 170 deletions

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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+    <requires lib="gtk" version="4.0"/>
     <template class="DinoUiConferenceDetailsFragment">
         <property name="visible">True</property>
         <child>
             <object class="GtkOverlay">
-                <property name="visible">True</property>
-                <child>
+                <property name="child">
                     <object class="GtkGrid">
                         <property name="orientation">vertical</property>
-                        <property name="margin">20</property>
+                        <property name="margin-start">20</property>
+                        <property name="margin-end">20</property>
+                        <property name="margin-top">20</property>
+                        <property name="margin-bottom">20</property>
                         <property name="margin_end">40</property>
                         <property name="margin_start">40</property>
                         <property name="row-spacing">7</property>
                         <property name="column-spacing">10</property>
-                        <property name="visible">True</property>
                         <child>
                             <object class="GtkLabel">
-                                <property name="label" translatable="yes">Account</property>
+                                <property name="label" translatable="1">Account</property>
                                 <property name="xalign">1</property>
-                                <property name="visible">True</property>
                                 <style>
                                     <class name="dim-label"/>
                                 </style>
+                                <layout>
+                                    <property name="column">0</property>
+                                    <property name="row">0</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkStack" id="accounts_stack">
-                                <property name="visible">True</property>
                                 <child>
-                                    <object class="GtkButton" id="accounts_button">
-                                        <property name="relief">none</property>
-                                        <property name="visible">True</property>
-                                        <child>
-                                            <object class="GtkLabel" id="accounts_label">
-                                                <property name="xalign">0</property>
-                                                <property name="visible">True</property>
+                                    <object class="GtkStackPage">
+                                        <property name="name">label</property>
+                                        <property name="child">
+                                            <object class="GtkButton" id="accounts_button">
+                                                <property name="has-frame">False</property>
+                                                <child>
+                                                    <object class="GtkLabel" id="accounts_label">
+                                                        <property name="xalign">0</property>
+                                                    </object>
+                                                </child>
                                             </object>
-                                        </child>
+                                        </property>
                                     </object>
-                                    <packing>
-                                        <property name="name">label</property>
-                                    </packing>
                                 </child>
                                 <child>
-                                    <object class="DinoUiAccountComboBox" id="account_combobox">
-                                        <property name="hexpand">True</property>
-                                        <property name="width_request">200</property>
-                                        <property name="visible">True</property>
-                                    </object>
-                                    <packing>
+                                    <object class="GtkStackPage">
                                         <property name="name">entry</property>
-                                    </packing>
+                                        <property name="child">
+                                            <object class="DinoUiAccountComboBox" id="account_combobox">
+                                                <property name="hexpand">True</property>
+                                                <property name="width_request">200</property>
+                                                <property name="visible">True</property>
+                                            </object>
+                                        </property>
+                                    </object>
                                 </child>
+                                <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">
                                 <property name="label">JID</property>
                                 <property name="xalign">1</property>
-                                <property name="visible">True</property>
                                 <style>
                                     <class name="dim-label"/>
                                 </style>
+                                <layout>
+                                    <property name="column">0</property>
+                                    <property name="row">1</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkStack" id="jid_stack">
-                                <property name="visible">True</property>
                                 <child>
-                                    <object class="GtkButton" id="jid_button">
-                                        <property name="relief">none</property>
-                                        <property name="visible">True</property>
-                                        <child>
-                                            <object class="GtkLabel" id="jid_label">
-                                                <property name="xalign">0</property>
-                                                <property name="visible">True</property>
+                                    <object class="GtkStackPage">
+                                        <property name="name">label</property>
+                                        <property name="child">
+                                            <object class="GtkButton" id="jid_button">
+                                                <property name="has-frame">False</property>
+                                                <child>
+                                                    <object class="GtkLabel" id="jid_label">
+                                                        <property name="xalign">0</property>
+                                                    </object>
+                                                </child>
                                             </object>
-                                        </child>
+                                        </property>
                                     </object>
-                                    <packing>
-                                        <property name="name">label</property>
-                                    </packing>
                                 </child>
                                 <child>
-                                    <object class="GtkEntry" id="jid_entry">
-                                        <property name="hexpand">True</property>
-                                        <property name="width_request">200</property>
-                                        <property name="visible">True</property>
-                                    </object>
-                                    <packing>
+                                    <object class="GtkStackPage">
                                         <property name="name">entry</property>
-                                    </packing>
+                                        <property name="child">
+                                            <object class="GtkEntry" id="jid_entry">
+                                                <property name="hexpand">1</property>
+                                                <property name="width_request">200</property>
+                                            </object>
+                                        </property>
+                                    </object>
                                 </child>
+                                <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">
-                                <property name="label" translatable="yes">Nick</property>
+                                <property name="label" translatable="1">Nick</property>
                                 <property name="xalign">1</property>
-                                <property name="visible">True</property>
                                 <style>
                                     <class name="dim-label"/>
                                 </style>
+                                <layout>
+                                    <property name="column">0</property>
+                                    <property name="row">2</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">2</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkStack" id="nick_stack">
-                                <property name="visible">True</property>
                                 <child>
-                                    <object class="GtkButton" id="nick_button">
-                                        <property name="relief">none</property>
-                                        <property name="visible">True</property>
-                                        <child>
-                                            <object class="GtkLabel" id="nick_label">
-                                                <property name="xalign">0</property>
-                                                <property name="visible">True</property>
+                                    <object class="GtkStackPage">
+                                        <property name="name">label</property>
+                                        <property name="child">
+                                            <object class="GtkButton" id="nick_button">
+                                                <property name="has-frame">False</property>
+                                                <child>
+                                                    <object class="GtkLabel" id="nick_label">
+                                                        <property name="xalign">0</property>
+                                                    </object>
+                                                </child>
                                             </object>
-                                        </child>
+                                        </property>
                                     </object>
-                                    <packing>
-                                        <property name="name">label</property>
-                                    </packing>
                                 </child>
                                 <child>
-                                    <object class="GtkEntry" id="nick_entry">
-                                        <property name="hexpand">True</property>
-                                        <property name="width_request">200</property>
-                                        <property name="visible">True</property>
-                                    </object>
-                                    <packing>
+                                    <object class="GtkStackPage">
                                         <property name="name">entry</property>
-                                    </packing>
+                                        <property name="child">
+                                            <object class="GtkEntry" id="nick_entry">
+                                                <property name="hexpand">1</property>
+                                                <property name="width_request">200</property>
+                                            </object>
+                                        </property>
+                                    </object>
                                 </child>
+                                <layout>
+                                    <property name="column">1</property>
+                                    <property name="row">2</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">2</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkLabel" id="password_text_label">
-                                <property name="label" translatable="yes">Password</property>
+                                <property name="visible">0</property>
+                                <property name="label" translatable="1">Password</property>
                                 <property name="xalign">1</property>
                                 <style>
                                     <class name="dim-label"/>
                                 </style>
+                                <layout>
+                                    <property name="column">0</property>
+                                    <property name="row">3</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">3</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                         <child>
                             <object class="GtkStack" id="password_stack">
+                                <property name="visible">0</property>
                                 <child>
-                                    <object class="GtkButton" id="password_button">
-                                        <property name="relief">none</property>
-                                        <property name="visible">True</property>
-                                        <child>
-                                            <object class="GtkLabel" id="password_label">
-                                                <property name="xalign">0</property>
-                                                <property name="visible">True</property>
+                                    <object class="GtkStackPage">
+                                        <property name="name">label</property>
+                                        <property name="child">
+                                            <object class="GtkButton" id="password_button">
+                                                <property name="has-frame">False</property>
+                                                <child>
+                                                    <object class="GtkLabel" id="password_label">
+                                                        <property name="xalign">0</property>
+                                                    </object>
+                                                </child>
                                             </object>
-                                        </child>
+                                        </property>
                                     </object>
-                                    <packing>
-                                        <property name="name">label</property>
-                                    </packing>
                                 </child>
                                 <child>
-                                    <object class="GtkEntry" id="password_entry">
-                                        <property name="hexpand">True</property>
-                                        <property name="width_request">200</property>
-                                        <property name="visibility">False</property>
-                                        <property name="visible">True</property>
-                                    </object>
-                                    <packing>
+                                    <object class="GtkStackPage">
                                         <property name="name">entry</property>
-                                    </packing>
+                                        <property name="child">
+                                            <object class="GtkEntry" id="password_entry">
+                                                <property name="hexpand">1</property>
+                                                <property name="width_request">200</property>
+                                                <property name="visibility">0</property>
+                                            </object>
+                                        </property>
+                                    </object>
                                 </child>
+                                <layout>
+                                    <property name="column">1</property>
+                                    <property name="row">3</property>
+                                </layout>
                             </object>
-                            <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">3</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
                         </child>
                     </object>
-                    <packing>
-                        <property name="index">-1</property>
-                    </packing>
-                </child>
+                </property>
                 <child type="overlay">
                     <object class="GtkRevealer" id="notification_revealer">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="halign">center</property>
                         <property name="valign">start</property>
-                        <child>
+                        <property name="child">
                             <object class="GtkFrame" id="frame2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+<!--                                <property name="shadow_type">none</property>-->
                                 <style>
                                     <class name="app-notification"/>
                                 </style>
-                                <child>
+                                <property name="child">
                                     <object class="GtkBox" id="box2">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="spacing">20</property>
                                         <child>
-                                            <object class="GtkLabel" id="notification_label">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                            </object>
-                                            <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">0</property>
-                                            </packing>
+                                            <object class="GtkLabel" id="notification_label"/>
                                         </child>
                                         <child>
                                             <object class="GtkButton" id="notification_button">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="receives_default">True</property>
-                                                <property name="relief">none</property>
+                                                <property name="focusable">1</property>
+                                                <property name="receives_default">1</property>
+                                                <property name="has-frame">False</property>
                                                 <child>
                                                     <object class="GtkImage" id="image2">
-                                                        <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
                                                         <property name="icon_name">window-close-symbolic</property>
                                                     </object>
                                                 </child>
@@ -274,19 +240,14 @@
                                                     <class name="image-button"/>
                                                 </style>
                                             </object>
-                                            <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">1</property>
-                                            </packing>
                                         </child>
                                     </object>
-                                </child>
+                                </property>
                                 <child type="label_item">
                                     <placeholder/>
                                 </child>
                             </object>
-                        </child>
+                        </property>
                     </object>
                 </child>
             </object>