From fa731a46235e7d6b46450f339539247d3671514b Mon Sep 17 00:00:00 2001
From: fiaxh <git@mx.ax.lt>
Date: Fri, 16 Nov 2018 16:27:31 +0100
Subject: Split login jid/password into two steps with checks

---
 main/data/manage_accounts/add_account_dialog.ui | 294 ++++++++++++++++++++++--
 1 file changed, 275 insertions(+), 19 deletions(-)

(limited to 'main/data/manage_accounts')

diff --git a/main/data/manage_accounts/add_account_dialog.ui b/main/data/manage_accounts/add_account_dialog.ui
index 52f91481..bdf0837b 100644
--- a/main/data/manage_accounts/add_account_dialog.ui
+++ b/main/data/manage_accounts/add_account_dialog.ui
@@ -19,16 +19,16 @@
                                         <property name="expand">True</property>
                                         <property name="visible">True</property>
                                         <child>
-                                            <object class="GtkBox" id="sign_in_box">
+                                            <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="margin-bottom">10</property>
                                                         <property name="visible">True</property>
                                                         <attributes>
                                                             <attribute name="scale" value="1.3"/>
@@ -58,8 +58,7 @@
                                                             </object>
                                                         </child>
                                                         <child>
-                                                            <object class="GtkLabel">
-                                                                <property name="label" translatable="yes">Password</property>
+                                                            <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>
@@ -68,19 +67,149 @@
                                                                 </attributes>
                                                             </object>
                                                         </child>
+                                                    </object>
+                                                </child>
+                                                <child>
+                                                    <object class="GtkBox">
+                                                        <property name="orientation">horizontal</property>
+                                                        <property name="visible">True</property>
                                                         <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>
+                                                            <object class="GtkButton" id="sign_in_jid_serverlist_button">
+                                                                <property name="label" translatable="yes">Create account</property>
                                                                 <property name="visible">True</property>
-                                                                <property name="visibility">False</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>
+                                                                <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>
+
+                                                                </child>
+                                                            </object>
+                                                            <packing>
+                                                                <property name="pack_type">end</property>
+                                                            </packing>
                                                         </child>
+                                                    </object>
+                                                </child>
+                                            </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>
+                                                        <child>
+                                                            <object class="GtkButton" id="sign_in_tls_back_button">
+                                                                <property name="label" translatable="yes">Back</property>
+                                                                <property name="visible">True</property>
+                                                            </object>
+                                                            <packing>
+                                                                <property name="pack_type">start</property>
+                                                            </packing>
+                                                        </child>
+                                                    </object>
+                                                </child>
+                                            </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="label">Sign in</property>
+                                                        <property name="visible">True</property>
+                                                        <attributes>
+                                                            <attribute name="scale" value="1.3"/>
+                                                        </attributes>
+                                                    </object>
+                                                </child>
+                                                <child>
+                                                    <object class="GtkBox">
+                                                        <property name="orientation">vertical</property>
+                                                        <property name="visible">True</property>
                                                         <child>
                                                             <object class="GtkLabel">
-                                                                <property name="label" translatable="yes">Local alias</property>
+                                                                <property name="label" translatable="yes">Password</property>
                                                                 <property name="xalign">0</property>
                                                                 <property name="margin-top">7</property>
                                                                 <property name="visible">True</property>
@@ -90,23 +219,53 @@
                                                             </object>
                                                         </child>
                                                         <child>
-                                                            <object class="GtkEntry" id="alias_entry">
+                                                            <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>
+                                                        </child>
+                                                        <child>
+                                                            <object class="GtkLabel" id="sign_in_password_error_label">
+                                                                <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="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="margin-top">20</property>
                                                         <property name="visible">True</property>
                                                         <child>
-                                                            <object class="GtkButton" id="serverlist_button">
-                                                                <property name="label" translatable="yes">Create account</property>
+                                                            <object class="GtkButton" id="sign_in_password_back_button">
+                                                                <property name="label" translatable="yes">Back</property>
                                                                 <property name="visible">True</property>
                                                             </object>
                                                             <packing>
@@ -114,14 +273,38 @@
                                                             </packing>
                                                         </child>
                                                         <child>
-                                                            <object class="GtkButton" id="sign_in_continue">
-                                                                <property name="can_default">True</property>
-                                                                <property name="label" translatable="yes">Save</property>
+                                                            <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>
+                                                                <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>
+                                                                        <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>
@@ -131,7 +314,7 @@
                                                 </child>
                                             </object>
                                             <packing>
-                                                <property name="name">login</property>
+                                                <property name="name">login_password</property>
                                             </packing>
                                         </child>
                                         <child>
@@ -335,6 +518,79 @@
                                                 <property name="name">form</property>
                                             </packing>
                                         </child>
+                                        <child>
+                                            <object class="GtkBox" id="success_box">
+                                                <property name="margin">50</property>
+                                                <property name="margin-top">5</property>
+                                                <property name="margin-bottom">5</property>
+                                                <property name="orientation">vertical</property>
+                                                <property name="spacing">10</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="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>
+                                                                <style>
+                                                                    <class name="text-button"/>
+                                                                    <class name="suggested-action"/>
+                                                                </style>
+                                                            </object>
+                                                        </child>
+                                                    </object>
+                                                </child>
+                                            </object>
+                                            <packing>
+                                                <property name="name">success</property>
+                                            </packing>
+                                        </child>
                                     </object>
                                 </child>
                             </object>
-- 
cgit v1.2.3-54-g00ecf