From 7e7dcedaf31ee35499875491c9f569c575d28435 Mon Sep 17 00:00:00 2001
From: fiaxh <git@lightrise.org>
Date: Mon, 14 Feb 2022 14:55:59 +0100
Subject: Port from GTK3 to GTK4

---
 main/data/manage_accounts/add_account_dialog.ui | 906 +++++++++++-------------
 1 file changed, 407 insertions(+), 499 deletions(-)

(limited to 'main/data/manage_accounts/add_account_dialog.ui')

diff --git a/main/data/manage_accounts/add_account_dialog.ui b/main/data/manage_accounts/add_account_dialog.ui
index ad141b4a..d37a98f5 100644
--- a/main/data/manage_accounts/add_account_dialog.ui
+++ b/main/data/manage_accounts/add_account_dialog.ui
@@ -1,640 +1,548 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+    <requires lib="gtk" version="4.0"/>
     <template class="DinoUiManageAccountsAddAccountDialog">
         <property name="default_width">400</property>
         <property name="modal">True</property>
-        <child internal-child="vbox">
+        <child internal-child="content_area">
             <object class="GtkBox">
-                <property name="visible">True</property>
                 <child>
                     <object class="GtkOverlay">
-                        <property name="visible">True</property>
-                        <child>
+                        <property name="child">
                             <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="GtkStack" id="stack">
                                         <property name="transition_type">slide-left</property>
-                                        <property name="expand">True</property>
-                                        <property name="visible">True</property>
+                                        <property name="hexpand">1</property>
+                                        <property name="vexpand">1</property>
                                         <child>
-                                            <object class="GtkBox" id="sign_in_jid_box">
-                                                <property name="orientation">vertical</property>
-                                                <property name="margin">20</property>
-                                                <property name="margin-start">50</property>
-                                                <property name="margin-end">50</property>
-                                                <property name="spacing">20</property>
-                                                <property name="visible">True</property>
-                                                <child>
-                                                    <object class="GtkLabel">
-                                                        <property name="label" translatable="yes">Sign in</property>
-                                                        <property name="visible">True</property>
-                                                        <attributes>
-                                                            <attribute name="scale" value="1.3"/>
-                                                        </attributes>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkBox" id="info_grid">
+                                            <object class="GtkStackPage">
+                                                <property name="name">login_jid</property>
+                                                <property name="child">
+                                                    <object class="GtkBox" id="sign_in_jid_box">
                                                         <property name="orientation">vertical</property>
-                                                        <property name="visible">True</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-start">50</property>
+                                                        <property name="margin-end">50</property>
+                                                        <property name="spacing">20</property>
                                                         <child>
                                                             <object class="GtkLabel">
-                                                                <property name="label">JID</property>
-                                                                <property name="xalign">0</property>
-                                                                <property name="visible">True</property>
+                                                                <property name="label" translatable="1">Sign in</property>
                                                                 <attributes>
-                                                                    <attribute name="scale" value="0.9"/>
+                                                                    <attribute name="scale" value="1.3"></attribute>
                                                                 </attributes>
                                                             </object>
                                                         </child>
                                                         <child>
-                                                            <object class="GtkEntry" id="jid_entry">
-                                                                <property name="activates_default">True</property>
-                                                                <property name="hexpand">True</property>
-                                                                <property name="width_request">200</property>
-                                                                <property name="visible">True</property>
+                                                            <object class="GtkBox" id="info_grid">
+                                                                <property name="orientation">vertical</property>
+                                                                <child>
+                                                                    <object class="GtkLabel">
+                                                                        <property name="label">JID</property>
+                                                                        <property name="xalign">0</property>
+                                                                        <attributes>
+                                                                            <attribute name="scale" value="0.9"></attribute>
+                                                                        </attributes>
+                                                                    </object>
+                                                                </child>
+                                                                <child>
+                                                                    <object class="GtkEntry" id="jid_entry">
+                                                                        <property name="activates_default">1</property>
+                                                                        <property name="hexpand">1</property>
+                                                                        <property name="width_request">200</property>
+                                                                    </object>
+                                                                </child>
+                                                                <child>
+                                                                    <object class="GtkLabel" id="sign_in_jid_error_label">
+                                                                        <property name="xalign">0</property>
+                                                                        <property name="margin-top">7</property>
+                                                                        <attributes>
+                                                                            <attribute name="scale" value="0.9"></attribute>
+                                                                        </attributes>
+                                                                    </object>
+                                                                </child>
                                                             </object>
                                                         </child>
                                                         <child>
-                                                            <object class="GtkLabel" id="sign_in_jid_error_label">
-                                                                <property name="xalign">0</property>
-                                                                <property name="margin-top">7</property>
-                                                                <property name="visible">True</property>
+                                                            <object class="GtkBox">
+                                                                <child>
+                                                                    <object class="GtkButton" id="sign_in_jid_serverlist_button">
+                                                                        <property name="label" translatable="1">Create account</property>
+                                                                    </object>
+                                                                </child>
+                                                                <child>
+                                                                    <object class="GtkButton" id="sign_in_jid_continue_button">
+                                                                        <property name="halign">end</property>
+                                                                        <property name="hexpand">True</property>
+                                                                        <property name="sensitive">0</property>
+                                                                        <style>
+                                                                            <class name="text-button"/>
+                                                                            <class name="suggested-action"/>
+                                                                        </style>
+                                                                        <child>
+                                                                            <object class="GtkStack" id="sign_in_jid_continue_stack">
+                                                                                <child>
+                                                                                    <object class="GtkStackPage">
+                                                                                        <property name="name">label</property>
+                                                                                        <property name="child">
+                                                                                            <object class="GtkLabel">
+                                                                                                <property name="label" translatable="1">Next</property>
+                                                                                            </object>
+                                                                                        </property>
+                                                                                    </object>
+                                                                                </child>
+                                                                                <child>
+                                                                                    <object class="GtkStackPage">
+                                                                                        <property name="name">spinner</property>
+                                                                                        <property name="child">
+                                                                                            <object class="GtkSpinner">
+                                                                                                <property name="spinning">True</property>
+                                                                                            </object>
+                                                                                        </property>
+                                                                                    </object>
+                                                                                </child>
+                                                                            </object>
+                                                                        </child>
+                                                                    </object>
+                                                                </child>
+                                                            </object>
+                                                        </child>
+                                                    </object>
+                                                </property>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkStackPage">
+                                                <property name="name">tls_error</property>
+                                                <property name="child">
+                                                    <object class="GtkBox" id="sign_in_tls_box">
+                                                        <property name="orientation">vertical</property>
+                                                        <property name="margin-top">30</property>
+                                                        <property name="margin-bottom">20</property>
+                                                        <property name="margin-start">50</property>
+                                                        <property name="margin-end">50</property>
+                                                        <property name="spacing">20</property>
+                                                        <child>
+                                                            <object class="GtkImage">
+                                                                <property name="icon-name">channel-insecure-symbolic</property>
+                                                                <property name="pixel-size">72</property>
+                                                                <property name="margin-top">10</property>
+                                                                <style>
+                                                                    <class name="dim-label"/>
+                                                                </style>
+                                                            </object>
+                                                        </child>
+                                                        <child>
+                                                            <object class="GtkLabel">
+                                                                <property name="label" translatable="1">Could not establish a secure connection</property>
                                                                 <attributes>
-                                                                    <attribute name="scale" value="0.9"/>
+                                                                    <attribute name="scale" value="1.1"></attribute>
                                                                 </attributes>
                                                             </object>
                                                         </child>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkBox">
-                                                        <property name="orientation">horizontal</property>
-                                                        <property name="visible">True</property>
                                                         <child>
-                                                            <object class="GtkButton" id="sign_in_jid_serverlist_button">
-                                                                <property name="label" translatable="yes">Create account</property>
-                                                                <property name="visible">True</property>
+                                                            <object class="GtkLabel" id="sign_in_tls_label">
+                                                                <property name="justify">fill</property>
+                                                                <property name="wrap">1</property>
+                                                                <property name="use-markup">1</property>
+                                                                <property name="hexpand">1</property>
                                                             </object>
-                                                            <packing>
-                                                                <property name="pack_type">start</property>
-                                                            </packing>
                                                         </child>
                                                         <child>
-                                                            <object class="GtkButton" id="sign_in_jid_continue_button">
-                                                                <property name="sensitive">False</property>
-                                                                <property name="can_default">True</property>
-                                                                <property name="visible">True</property>
-                                                                <style>
-                                                                    <class name="text-button"/>
-                                                                    <class name="suggested-action"/>
-                                                                </style>
+                                                            <object class="GtkBox">
                                                                 <child>
-                                                                    <object class="GtkStack" id="sign_in_jid_continue_stack">
-                                                                        <property name="visible">True</property>
-                                                                        <child>
-                                                                            <object class="GtkLabel">
-                                                                                <property name="label" translatable="yes">Next</property>
-                                                                                <property name="visible">True</property>
-                                                                            </object>
-                                                                            <packing>
-                                                                                <property name="name">label</property>
-                                                                            </packing>
-                                                                        </child>
-                                                                        <child>
-                                                                            <object class="GtkSpinner">
-                                                                                <property name="active">True</property>
-                                                                                <property name="visible">True</property>
-                                                                            </object>
-                                                                            <packing>
-                                                                                <property name="name">spinner</property>
-                                                                            </packing>
-                                                                        </child>
+                                                                    <object class="GtkButton" id="sign_in_tls_back_button">
+                                                                        <property name="label" translatable="1">Back</property>
                                                                     </object>
-
                                                                 </child>
                                                             </object>
-                                                            <packing>
-                                                                <property name="pack_type">end</property>
-                                                            </packing>
                                                         </child>
                                                     </object>
-                                                </child>
+                                                </property>
                                             </object>
-                                            <packing>
-                                                <property name="name">login_jid</property>
-                                            </packing>
                                         </child>
                                         <child>
-                                            <object class="GtkBox" id="sign_in_tls_box">
-                                                <property name="orientation">vertical</property>
-                                                <property name="margin-top">30</property>
-                                                <property name="margin-bottom">20</property>
-                                                <property name="margin-start">50</property>
-                                                <property name="margin-end">50</property>
-                                                <property name="spacing">20</property>
-                                                <property name="visible">True</property>
-                                                <child>
-                                                    <object class="GtkImage">
-                                                        <property name="visible">True</property>
-                                                        <property name="icon-name">channel-insecure-symbolic</property>
-                                                        <property name="icon-size">4</property>
-                                                        <property name="pixel-size">72</property>
-                                                        <property name="margin-top">10</property>
-                                                        <style>
-                                                            <class name="dim-label"/>
-                                                        </style>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkLabel">
-                                                        <property name="label" translatable="yes">Could not establish a secure connection</property>
-                                                        <property name="visible">True</property>
-                                                        <attributes>
-                                                            <attribute name="scale" value="1.1"/>
-                                                        </attributes>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkLabel" id="sign_in_tls_label">
-                                                        <property name="justify">fill</property>
-                                                        <property name="wrap">True</property>
-                                                        <property name="use-markup">True</property>
-                                                        <property name="hexpand">True</property>
-                                                        <property name="visible">True</property>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkBox">
-                                                        <property name="orientation">horizontal</property>
-                                                        <property name="visible">True</property>
+                                            <object class="GtkStackPage">
+                                                <property name="name">login_password</property>
+                                                <property name="child">
+                                                    <object class="GtkBox" id="sign_in_password_box">
+                                                        <property name="orientation">vertical</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-start">50</property>
+                                                        <property name="margin-end">50</property>
+                                                        <property name="spacing">20</property>
+                                                        <child>
+                                                            <object class="GtkLabel" id="sign_in_password_title">
+                                                                <attributes>
+                                                                    <attribute name="scale" value="1.3"></attribute>
+                                                                </attributes>
+                                                            </object>
+                                                        </child>
+                                                        <child>
+                                                            <object class="GtkBox">
+                                                                <property name="orientation">vertical</property>
+                                                                <child>
+                                                                    <object class="GtkLabel">
+                                                                        <property name="label" translatable="1">Password</property>
+                                                                        <property name="xalign">0</property>
+                                                                        <property name="margin-top">7</property>
+                                                                        <attributes>
+                                                                            <attribute name="scale" value="0.9"></attribute>
+                                                                        </attributes>
+                                                                    </object>
+                                                                </child>
+                                                                <child>
+                                                                    <object class="GtkEntry" id="password_entry">
+                                                                        <property name="activates_default">1</property>
+                                                                        <property name="hexpand">1</property>
+                                                                        <property name="input_purpose">password</property>
+                                                                        <property name="width_request">200</property>
+                                                                        <property name="visibility">0</property>
+                                                                    </object>
+                                                                </child>
+                                                                <child>
+                                                                    <object class="GtkLabel" id="sign_in_password_error_label">
+                                                                        <property name="xalign">0</property>
+                                                                        <property name="margin-top">7</property>
+                                                                        <attributes>
+                                                                            <attribute name="scale" value="0.9"></attribute>
+                                                                        </attributes>
+                                                                    </object>
+                                                                </child>
+                                                            </object>
+                                                        </child>
                                                         <child>
-                                                            <object class="GtkButton" id="sign_in_tls_back_button">
-                                                                <property name="label" translatable="yes">Back</property>
-                                                                <property name="visible">True</property>
+                                                            <object class="GtkBox">
+                                                                <child>
+                                                                    <object class="GtkButton" id="sign_in_password_back_button">
+                                                                        <property name="label" translatable="1">Back</property>
+                                                                    </object>
+                                                                </child>
+                                                                <child>
+                                                                    <object class="GtkButton" id="sign_in_password_continue_button">
+                                                                        <property name="halign">end</property>
+                                                                        <property name="hexpand">True</property>
+                                                                        <property name="sensitive">0</property>
+                                                                        <style>
+                                                                            <class name="text-button"/>
+                                                                            <class name="suggested-action"/>
+                                                                        </style>
+                                                                        <child>
+                                                                            <object class="GtkStack" id="sign_in_password_continue_stack">
+                                                                                <child>
+                                                                                    <object class="GtkStackPage">
+                                                                                        <property name="name">label</property>
+                                                                                        <property name="child">
+                                                                                            <object class="GtkLabel">
+                                                                                                <property name="label" translatable="1">Connect</property>
+                                                                                            </object>
+                                                                                        </property>
+                                                                                    </object>
+                                                                                </child>
+                                                                                <child>
+                                                                                    <object class="GtkStackPage">
+                                                                                        <property name="name">spinner</property>
+                                                                                        <property name="child">
+                                                                                            <object class="GtkSpinner">
+                                                                                                <property name="spinning">True</property>
+                                                                                            </object>
+                                                                                        </property>
+                                                                                    </object>
+                                                                                </child>
+                                                                            </object>
+                                                                        </child>
+                                                                    </object>
+                                                                </child>
                                                             </object>
-                                                            <packing>
-                                                                <property name="pack_type">start</property>
-                                                            </packing>
                                                         </child>
                                                     </object>
-                                                </child>
+                                                </property>
                                             </object>
-                                            <packing>
-                                                <property name="name">tls_error</property>
-                                            </packing>
                                         </child>
                                         <child>
-                                            <object class="GtkBox" id="sign_in_password_box">
-                                                <property name="orientation">vertical</property>
-                                                <property name="margin">20</property>
-                                                <property name="margin-start">50</property>
-                                                <property name="margin-end">50</property>
-                                                <property name="spacing">20</property>
-                                                <property name="visible">True</property>
-                                                <child>
-                                                    <object class="GtkLabel" id="sign_in_password_title">
-                                                        <property name="visible">True</property>
-                                                        <attributes>
-                                                            <attribute name="scale" value="1.3"/>
-                                                        </attributes>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkBox">
+                                            <object class="GtkStackPage">
+                                                <property name="name">server</property>
+                                                <property name="child">
+                                                    <object class="GtkBox" id="create_account_box">
                                                         <property name="orientation">vertical</property>
-                                                        <property name="visible">True</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-start">50</property>
+                                                        <property name="margin-end">50</property>
+                                                        <child>
+                                                            <object class="GtkLabel">
+                                                                <property name="label" translatable="1">Create account</property>
+                                                                <property name="margin-bottom">20</property>
+                                                                <attributes>
+                                                                    <attribute name="scale" value="1.3"></attribute>
+                                                                </attributes>
+                                                            </object>
+                                                        </child>
                                                         <child>
                                                             <object class="GtkLabel">
-                                                                <property name="label" translatable="yes">Password</property>
                                                                 <property name="xalign">0</property>
-                                                                <property name="margin-top">7</property>
-                                                                <property name="visible">True</property>
+                                                                <property name="label" translatable="1">Choose a public server</property>
                                                                 <attributes>
-                                                                    <attribute name="scale" value="0.9"/>
+                                                                    <attribute name="weight" value="PANGO_WEIGHT_BOLD"></attribute>
                                                                 </attributes>
                                                             </object>
                                                         </child>
                                                         <child>
-                                                            <object class="GtkEntry" id="password_entry">
-                                                                <property name="activates_default">True</property>
-                                                                <property name="hexpand">True</property>
-                                                                <property name="input_purpose">password</property>
-                                                                <property name="width_request">200</property>
-                                                                <property name="visible">True</property>
-                                                                <property name="visibility">False</property>
+                                                            <object class="GtkFrame">
+                                                                <property name="child">
+                                                                    <object class="GtkScrolledWindow">
+                                                                        <property name="max_content_height">300</property>
+                                                                        <property name="propagate_natural_height">1</property>
+                                                                        <property name="hscrollbar_policy">never</property>
+                                                                        <property name="child">
+                                                                            <object class="GtkListBox" id="server_list_box"/>
+                                                                        </property>
+                                                                    </object>
+                                                                </property>
                                                             </object>
                                                         </child>
                                                         <child>
-                                                            <object class="GtkLabel" id="sign_in_password_error_label">
+                                                            <object class="GtkLabel">
                                                                 <property name="xalign">0</property>
-                                                                <property name="margin-top">7</property>
-                                                                <property name="visible">True</property>
+                                                                <property name="margin-top">20</property>
+                                                                <property name="label" translatable="1">Or specify a server address</property>
                                                                 <attributes>
-                                                                    <attribute name="scale" value="0.9"/>
+                                                                    <attribute name="weight" value="PANGO_WEIGHT_BOLD"></attribute>
                                                                 </attributes>
                                                             </object>
                                                         </child>
-                                                        <!--<child>-->
-                                                            <!--<object class="GtkLabel">-->
-                                                                <!--<property name="label" translatable="yes">Local alias</property>-->
-                                                                <!--<property name="xalign">0</property>-->
-                                                                <!--<property name="margin-top">7</property>-->
-                                                                <!--<property name="visible">True</property>-->
-                                                                <!--<attributes>-->
-                                                                    <!--<attribute name="scale" value="0.9"/>-->
-                                                                <!--</attributes>-->
-                                                            <!--</object>-->
-                                                        <!--</child>-->
-                                                        <!--<child>-->
-                                                            <!--<object class="GtkEntry" id="alias_entry">-->
-                                                                <!--<property name="activates_default">True</property>-->
-                                                                <!--<property name="hexpand">True</property>-->
-                                                                <!--<property name="width_request">200</property>-->
-                                                                <!--<property name="visible">True</property>-->
-                                                            <!--</object>-->
-                                                        <!--</child>-->
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkBox">
-                                                        <property name="orientation">horizontal</property>
-                                                        <property name="visible">True</property>
                                                         <child>
-                                                            <object class="GtkButton" id="sign_in_password_back_button">
-                                                                <property name="label" translatable="yes">Back</property>
-                                                                <property name="visible">True</property>
+                                                            <object class="GtkEntry" id="server_entry">
+                                                                <property name="activates_default">1</property>
                                                             </object>
-                                                            <packing>
-                                                                <property name="pack_type">start</property>
-                                                            </packing>
                                                         </child>
                                                         <child>
-                                                            <object class="GtkButton" id="sign_in_password_continue_button">
-                                                                <property name="sensitive">False</property>
-                                                                <property name="can_default">True</property>
-                                                                <property name="visible">True</property>
-                                                                <style>
-                                                                    <class name="text-button"/>
-                                                                    <class name="suggested-action"/>
-                                                                </style>
+                                                            <object class="GtkBox">
+                                                                <property name="margin-top">30</property>
                                                                 <child>
-                                                                    <object class="GtkStack" id="sign_in_password_continue_stack">
-                                                                        <property name="visible">True</property>
-                                                                        <child>
-                                                                            <object class="GtkLabel">
-                                                                                <property name="label" translatable="yes">Connect</property>
-                                                                                <property name="visible">True</property>
-                                                                            </object>
-                                                                            <packing>
-                                                                                <property name="name">label</property>
-                                                                            </packing>
-                                                                        </child>
+                                                                    <object class="GtkButton" id="login_button">
+                                                                        <property name="label" translatable="1">Sign in instead</property>
+                                                                    </object>
+                                                                </child>
+                                                                <child>
+                                                                    <object class="GtkButton" id="select_server_continue">
+                                                                        <property name="halign">end</property>
+                                                                        <property name="hexpand">True</property>
+                                                                        <property name="sensitive">0</property>
+                                                                        <style>
+                                                                            <class name="text-button"/>
+                                                                            <class name="suggested-action"/>
+                                                                        </style>
                                                                         <child>
-                                                                            <object class="GtkSpinner">
-                                                                                <property name="active">True</property>
-                                                                                <property name="visible">True</property>
+                                                                            <object class="GtkStack" id="select_server_continue_stack">
+                                                                                <child>
+                                                                                    <object class="GtkStackPage">
+                                                                                        <property name="name">label</property>
+                                                                                        <property name="child">
+                                                                                            <object class="GtkLabel">
+                                                                                                <property name="label" translatable="1">Next</property>
+                                                                                            </object>
+                                                                                        </property>
+                                                                                    </object>
+                                                                                </child>
+                                                                                <child>
+                                                                                    <object class="GtkStackPage">
+                                                                                        <property name="name">spinner</property>
+                                                                                        <property name="child">
+                                                                                            <object class="GtkSpinner">
+                                                                                                <property name="spinning">True</property>
+                                                                                            </object>
+                                                                                        </property>
+                                                                                    </object>
+                                                                                </child>
                                                                             </object>
-                                                                            <packing>
-                                                                                <property name="name">spinner</property>
-                                                                            </packing>
                                                                         </child>
                                                                     </object>
-
                                                                 </child>
                                                             </object>
-                                                            <packing>
-                                                                <property name="pack_type">end</property>
-                                                            </packing>
                                                         </child>
                                                     </object>
-                                                </child>
+                                                </property>
                                             </object>
-                                            <packing>
-                                                <property name="name">login_password</property>
-                                            </packing>
                                         </child>
                                         <child>
-                                            <object class="GtkBox" id="create_account_box">
-                                                <property name="orientation">vertical</property>
-                                                <property name="margin">20</property>
-                                                <property name="margin-start">50</property>
-                                                <property name="margin-end">50</property>
-                                                <property name="visible">True</property>
-                                                <child>
-                                                    <object class="GtkLabel">
-                                                        <property name="label" translatable="yes">Create account</property>
+                                            <object class="GtkStackPage">
+                                                <property name="name">form</property>
+                                                <property name="child">
+                                                    <object class="GtkBox" id="register_box">
+                                                        <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="visible">True</property>
-                                                        <attributes>
-                                                            <attribute name="scale" value="1.3"/>
-                                                        </attributes>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkLabel">
-                                                        <property name="visible">True</property>
-                                                        <property name="xalign">0</property>
-                                                        <property name="label" translatable="yes">Choose a public server</property>
-                                                        <attributes>
-                                                            <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
-                                                        </attributes>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkFrame">
-                                                        <property name="visible">True</property>
+                                                        <property name="margin-start">50</property>
+                                                        <property name="margin-end">50</property>
+                                                        <property name="orientation">vertical</property>
                                                         <child>
-                                                            <object class="GtkScrolledWindow">
-                                                                <property name="max_content_height">300</property>
-                                                                <property name="propagate_natural_height">True</property>
-                                                                <property name="hscrollbar_policy">never</property>
-                                                                <property name="visible">True</property>
-                                                                <child>
-                                                                    <object class="GtkListBox" id="server_list_box">
-                                                                        <property name="visible">True</property>
-                                                                    </object>
-                                                                </child>
+                                                            <object class="GtkLabel" id="register_title">
+                                                                <property name="margin-bottom">10</property>
+                                                                <attributes>
+                                                                    <attribute name="scale" value="1.3"></attribute>
+                                                                </attributes>
                                                             </object>
                                                         </child>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkLabel">
-                                                        <property name="visible">True</property>
-                                                        <property name="xalign">0</property>
-                                                        <property name="margin-top">20</property>
-                                                        <property name="label" translatable="yes">Or specify a server address</property>
-                                                        <attributes>
-                                                            <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
-                                                        </attributes>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkEntry" id="server_entry">
-                                                        <property name="activates_default">True</property>
-                                                        <property name="can_default">True</property>
-                                                        <property name="visible">True</property>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkBox">
-                                                        <property name="visible">True</property>
-                                                        <property name="margin-top">30</property>
-                                                        <property name="orientation">horizontal</property>
                                                         <child>
-                                                            <object class="GtkButton" id="login_button">
-                                                                <property name="label" translatable="yes">Sign in instead</property>
-                                                                <property name="visible">True</property>
+                                                            <object class="GtkBox" id="form_box">
+                                                                <property name="orientation">vertical</property>
                                                             </object>
-                                                            <packing>
-                                                                <property name="pack_type">start</property>
-                                                            </packing>
                                                         </child>
                                                         <child>
-                                                            <object class="GtkButton" id="select_server_continue">
-                                                                <property name="sensitive">False</property>
-                                                                <property name="can_default">True</property>
-                                                                <property name="visible">True</property>
-                                                                <style>
-                                                                    <class name="text-button"/>
-                                                                    <class name="suggested-action"/>
-                                                                </style>
+                                                            <object class="GtkBox">
+                                                                <property name="margin-top">30</property>
                                                                 <child>
-                                                                    <object class="GtkStack" id="select_server_continue_stack">
-                                                                        <property name="visible">True</property>
-                                                                        <child>
-                                                                            <object class="GtkLabel">
-                                                                                <property name="label" translatable="yes">Next</property>
-                                                                                <property name="visible">True</property>
-                                                                            </object>
-                                                                            <packing>
-                                                                                <property name="name">label</property>
-                                                                            </packing>
-                                                                        </child>
+                                                                    <object class="GtkButton" id="register_form_back">
+                                                                        <property name="label" translatable="1">Pick another server</property>
+                                                                    </object>
+                                                                </child>
+                                                                <child>
+                                                                    <object class="GtkButton" id="register_form_continue">
+                                                                        <property name="halign">end</property>
+                                                                        <property name="hexpand">True</property>
+                                                                        <style>
+                                                                            <class name="text-button"/>
+                                                                            <class name="suggested-action"/>
+                                                                        </style>
                                                                         <child>
-                                                                            <object class="GtkSpinner">
-                                                                                <property name="active">True</property>
-                                                                                <property name="visible">True</property>
+                                                                            <object class="GtkStack" id="register_form_continue_stack">
+                                                                                <child>
+                                                                                    <object class="GtkStackPage">
+                                                                                        <property name="name">label</property>
+                                                                                        <property name="child">
+                                                                                            <object class="GtkLabel" id="register_form_continue_label">
+                                                                                                <property name="label" translatable="1">Next</property>
+                                                                                            </object>
+                                                                                        </property>
+                                                                                    </object>
+                                                                                </child>
+                                                                                <child>
+                                                                                    <object class="GtkStackPage">
+                                                                                        <property name="name">spinner</property>
+                                                                                        <property name="child">
+                                                                                            <object class="GtkSpinner">
+                                                                                                <property name="spinning">True</property>
+                                                                                            </object>
+                                                                                        </property>
+                                                                                    </object>
+                                                                                </child>
                                                                             </object>
-                                                                            <packing>
-                                                                                <property name="name">spinner</property>
-                                                                            </packing>
                                                                         </child>
                                                                     </object>
-
                                                                 </child>
                                                             </object>
-                                                            <packing>
-                                                                <property name="pack_type">end</property>
-                                                            </packing>
                                                         </child>
                                                     </object>
-                                                </child>
+                                                </property>
                                             </object>
-                                            <packing>
-                                                <property name="name">server</property>
-                                            </packing>
                                         </child>
                                         <child>
-                                            <object class="GtkBox" id="register_box">
-                                                <property name="margin">20</property>
-                                                <property name="margin-start">50</property>
-                                                <property name="margin-end">50</property>
-                                                <property name="orientation">vertical</property>
-                                                <property name="visible">True</property>
-                                                <child>
-                                                    <object class="GtkLabel" id="register_title">
+                                            <object class="GtkStackPage">
+                                                <property name="name">success</property>
+                                                <property name="child">
+                                                    <object class="GtkBox" id="success_box">
+                                                        <property name="margin-start">50</property>
+                                                        <property name="margin-end">50</property>
+                                                        <property name="margin-top">50</property>
+                                                        <property name="margin-bottom">50</property>
+                                                        <property name="margin-top">10</property>
                                                         <property name="margin-bottom">10</property>
-                                                        <property name="visible">True</property>
-                                                        <attributes>
-                                                            <attribute name="scale" value="1.3"/>
-                                                        </attributes>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkBox" id="form_box">
                                                         <property name="orientation">vertical</property>
-                                                        <property name="visible">True</property>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkBox">
-                                                        <property name="visible">True</property>
-                                                        <property name="margin-top">30</property>
-                                                        <property name="orientation">horizontal</property>
+                                                        <property name="valign">center</property>
                                                         <child>
-                                                            <object class="GtkButton" id="register_form_back">
-                                                                <property name="label" translatable="yes">Pick another server</property>
-                                                                <property name="visible">True</property>
+                                                            <object class="GtkImage">
+                                                                <property name="icon-name">dino-party-popper-symbolic</property>
+                                                                <property name="pixel-size">72</property>
+                                                                <property name="margin-bottom">10</property>
+                                                                <style>
+                                                                    <class name="dim-label"/>
+                                                                </style>
                                                             </object>
-                                                            <packing>
-                                                                <property name="pack_type">start</property>
-                                                            </packing>
                                                         </child>
                                                         <child>
-                                                            <object class="GtkButton" id="register_form_continue">
-                                                                <property name="can_default">True</property>
-                                                                <property name="visible">True</property>
+                                                            <object class="GtkLabel">
+                                                                <property name="label" translatable="1">All set up!</property>
+                                                                <attributes>
+                                                                    <attribute name="weight" value="PANGO_WEIGHT_BOLD"></attribute>
+                                                                    <attribute name="scale" value="1.3"></attribute>
+                                                                </attributes>
                                                                 <style>
-                                                                    <class name="text-button"/>
-                                                                    <class name="suggested-action"/>
+                                                                    <class name="dim-label"/>
                                                                 </style>
-                                                                <child>
-                                                                    <object class="GtkStack" id="register_form_continue_stack">
-                                                                        <property name="visible">True</property>
-                                                                        <child>
-                                                                            <object class="GtkLabel" id="register_form_continue_label">
-                                                                                <property name="label" translatable="yes">Next</property>
-                                                                                <property name="visible">True</property>
-                                                                            </object>
-                                                                            <packing>
-                                                                                <property name="name">label</property>
-                                                                            </packing>
-                                                                        </child>
-                                                                        <child>
-                                                                            <object class="GtkSpinner">
-                                                                                <property name="active">True</property>
-                                                                                <property name="visible">True</property>
-                                                                            </object>
-                                                                            <packing>
-                                                                                <property name="name">spinner</property>
-                                                                            </packing>
-                                                                        </child>
-                                                                    </object>
-                                                                </child>
                                                             </object>
-                                                            <packing>
-                                                                <property name="pack_type">end</property>
-                                                            </packing>
                                                         </child>
-                                                    </object>
-                                                </child>
-                                            </object>
-                                            <packing>
-                                                <property name="name">form</property>
-                                            </packing>
-                                        </child>
-                                        <child>
-                                            <object class="GtkBox" id="success_box">
-                                                <property name="margin">50</property>
-                                                <property name="margin-top">10</property>
-                                                <property name="margin-bottom">10</property>
-                                                <property name="orientation">vertical</property>
-                                                <property name="valign">center</property>
-                                                <property name="visible">True</property>
-                                                <child>
-                                                    <object class="GtkImage">
-                                                        <property name="visible">True</property>
-                                                        <property name="icon-name">dino-party-popper-symbolic</property>
-                                                        <property name="icon-size">4</property>
-                                                        <property name="pixel-size">72</property>
-                                                        <property name="margin-bottom">10</property>
-                                                        <style>
-                                                            <class name="dim-label"/>
-                                                        </style>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkLabel">
-                                                        <property name="label" translatable="yes">All set up!</property>
-                                                        <property name="xalign">0.5</property>
-                                                        <property name="yalign">0.5</property>
-                                                        <property name="visible">True</property>
-                                                        <attributes>
-                                                            <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
-                                                            <attribute name="scale" value="1.3"/>
-                                                        </attributes>
-                                                        <style>
-                                                            <class name="dim-label"/>
-                                                        </style>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkLabel" id="success_description">
-                                                        <property name="wrap">True</property>
-                                                        <property name="margin">5</property>
-                                                        <property name="xalign">0.5</property>
-                                                        <property name="yalign">0.5</property>
-                                                        <property name="use-markup">True</property>
-                                                        <property name="justify">center</property>
-                                                        <property name="visible">True</property>
-                                                        <style>
-                                                            <class name="dim-label"/>
-                                                        </style>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkBox">
-                                                        <property name="orientation">horizontal</property>
-                                                        <property name="halign">center</property>
-                                                        <property name="margin-top">20</property>
-                                                        <property name="visible">True</property>
                                                         <child>
-                                                            <object class="GtkButton" id="success_continue_button">
-                                                                <property name="can_default">True</property>
-                                                                <property name="label" translatable="yes">Finish</property>
-                                                                <property name="visible">True</property>
+                                                            <object class="GtkLabel" id="success_description">
+                                                                <property name="wrap">1</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="use-markup">1</property>
+                                                                <property name="justify">center</property>
                                                                 <style>
-                                                                    <class name="text-button"/>
-                                                                    <class name="suggested-action"/>
+                                                                    <class name="dim-label"/>
                                                                 </style>
                                                             </object>
                                                         </child>
+                                                        <child>
+                                                            <object class="GtkBox">
+                                                                <property name="halign">center</property>
+                                                                <property name="margin-top">20</property>
+                                                                <child>
+                                                                    <object class="GtkButton" id="success_continue_button">
+                                                                        <property name="label" translatable="1">Finish</property>
+                                                                        <style>
+                                                                            <class name="text-button"/>
+                                                                            <class name="suggested-action"/>
+                                                                        </style>
+                                                                    </object>
+                                                                </child>
+                                                            </object>
+                                                        </child>
                                                     </object>
-                                                </child>
+                                                </property>
                                             </object>
-                                            <packing>
-                                                <property name="name">success</property>
-                                            </packing>
                                         </child>
                                     </object>
                                 </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>
                                             </object>
-                                        </child>
+                                        </property>
                                         <child type="label_item">
                                             <placeholder/>
                                         </child>
                                     </object>
-                                </child>
+                                </property>
                             </object>
                         </child>
                     </object>
@@ -642,4 +550,4 @@
             </object>
         </child>
     </template>
-</interface>
+</interface>
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf