From d9b91206c0291fa8aa58df572292784a4f8ff878 Mon Sep 17 00:00:00 2001
From: fiaxh <git@mx.ax.lt>
Date: Sat, 28 Oct 2017 22:02:32 +0200
Subject: Keep MUC join dialog open until joined, show errors

---
 .../conference_details_fragment.ui                 | 376 ++++++++++++---------
 1 file changed, 223 insertions(+), 153 deletions(-)

(limited to 'main/data/add_conversation/conference_details_fragment.ui')

diff --git a/main/data/add_conversation/conference_details_fragment.ui b/main/data/add_conversation/conference_details_fragment.ui
index 3218e27e..120fbdb6 100644
--- a/main/data/add_conversation/conference_details_fragment.ui
+++ b/main/data/add_conversation/conference_details_fragment.ui
@@ -1,224 +1,294 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <template class="DinoUiAddConversationConferenceConferenceDetailsFragment">
+    <template class="DinoUiConferenceDetailsFragment">
         <property name="visible">True</property>
         <child>
-            <object class="GtkGrid">
-                <property name="orientation">vertical</property>
-                <property name="margin">20</property>
-                <property name="margin_right">40</property>
-                <property name="margin_left">40</property>
-                <property name="row-spacing">7</property>
-                <property name="column-spacing">10</property>
+            <object class="GtkOverlay">
                 <property name="visible">True</property>
                 <child>
-                    <object class="GtkLabel">
-                        <property name="label" translatable="yes">Account</property>
-                        <property name="xalign">1</property>
-                        <property name="visible">True</property>
-                        <style>
-                            <class name="dim-label"/>
-                        </style>
-                    </object>
-                    <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                    </packing>
-                </child>
-                <child>
-                    <object class="GtkStack" id="accounts_stack">
+                    <object class="GtkGrid">
+                        <property name="orientation">vertical</property>
+                        <property name="margin">20</property>
+                        <property name="margin_right">40</property>
+                        <property name="margin_left">40</property>
+                        <property name="row-spacing">7</property>
+                        <property name="column-spacing">10</property>
                         <property name="visible">True</property>
                         <child>
-                            <object class="GtkButton" id="accounts_button">
-                                <property name="relief">none</property>
+                            <object class="GtkLabel">
+                                <property name="label" translatable="yes">Account</property>
+                                <property name="xalign">1</property>
+                                <property name="visible">True</property>
+                                <style>
+                                    <class name="dim-label"/>
+                                </style>
+                            </object>
+                            <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">0</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
+                            </packing>
+                        </child>
+                        <child>
+                            <object class="GtkStack" id="accounts_stack">
                                 <property name="visible">True</property>
                                 <child>
-                                    <object class="GtkLabel" id="accounts_label">
-                                        <property name="xalign">0</property>
+                                    <object class="GtkButton" id="accounts_button">
+                                        <property name="relief">none</property>
+                                        <property name="visible">True</property>
+                                        <child>
+                                            <object class="GtkLabel" id="accounts_label">
+                                                <property name="xalign">0</property>
+                                                <property name="visible">True</property>
+                                            </object>
+                                        </child>
+                                    </object>
+                                    <packing>
+                                        <property name="name">label</property>
+                                    </packing>
+                                </child>
+                                <child>
+                                    <object class="DinoUiAccountComboBox" id="account_combobox">
+                                        <property name="hexpand">True</property>
+                                        <property name="width_request">200</property>
                                         <property name="visible">True</property>
                                     </object>
+                                    <packing>
+                                        <property name="name">entry</property>
+                                    </packing>
                                 </child>
                             </object>
                             <packing>
-                                <property name="name">label</property>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">0</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
                             </packing>
                         </child>
                         <child>
-                            <object class="DinoUiAccountComboBox" id="account_combobox">
-                                <property name="hexpand">True</property>
-                                <property name="width_request">200</property>
+                            <object class="GtkLabel">
+                                <property name="label">JID</property>
+                                <property name="xalign">1</property>
                                 <property name="visible">True</property>
+                                <style>
+                                    <class name="dim-label"/>
+                                </style>
                             </object>
                             <packing>
-                                <property name="name">entry</property>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">1</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
                             </packing>
                         </child>
-                    </object>
-                    <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                    </packing>
-                </child>
-                <child>
-                    <object class="GtkLabel">
-                        <property name="label">JID</property>
-                        <property name="xalign">1</property>
-                        <property name="visible">True</property>
-                        <style>
-                            <class name="dim-label"/>
-                        </style>
-                    </object>
-                    <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                    </packing>
-                </child>
-                <child>
-                    <object class="GtkStack" id="jid_stack">
-                        <property name="visible">True</property>
                         <child>
-                            <object class="GtkButton" id="jid_button">
-                                <property name="relief">none</property>
+                            <object class="GtkStack" id="jid_stack">
                                 <property name="visible">True</property>
                                 <child>
-                                    <object class="GtkLabel" id="jid_label">
-                                        <property name="xalign">0</property>
+                                    <object class="GtkButton" id="jid_button">
+                                        <property name="relief">none</property>
+                                        <property name="visible">True</property>
+                                        <child>
+                                            <object class="GtkLabel" id="jid_label">
+                                                <property name="xalign">0</property>
+                                                <property name="visible">True</property>
+                                            </object>
+                                        </child>
+                                    </object>
+                                    <packing>
+                                        <property name="name">label</property>
+                                    </packing>
+                                </child>
+                                <child>
+                                    <object class="GtkEntry" id="jid_entry">
+                                        <property name="hexpand">True</property>
+                                        <property name="width_request">200</property>
                                         <property name="visible">True</property>
                                     </object>
+                                    <packing>
+                                        <property name="name">entry</property>
+                                    </packing>
                                 </child>
                             </object>
                             <packing>
-                                <property name="name">label</property>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">1</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
                             </packing>
                         </child>
                         <child>
-                            <object class="GtkEntry" id="jid_entry">
-                                <property name="hexpand">True</property>
-                                <property name="width_request">200</property>
+                            <object class="GtkLabel">
+                                <property name="label" translatable="yes">Nick</property>
+                                <property name="xalign">1</property>
                                 <property name="visible">True</property>
+                                <style>
+                                    <class name="dim-label"/>
+                                </style>
                             </object>
                             <packing>
-                                <property name="name">entry</property>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">2</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
                             </packing>
                         </child>
-                    </object>
-                    <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                    </packing>
-                </child>
-                <child>
-                    <object class="GtkLabel">
-                        <property name="label" translatable="yes">Nick</property>
-                        <property name="xalign">1</property>
-                        <property name="visible">True</property>
-                        <style>
-                            <class name="dim-label"/>
-                        </style>
-                    </object>
-                    <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                    </packing>
-                </child>
-                <child>
-                    <object class="GtkStack" id="nick_stack">
-                        <property name="visible">True</property>
                         <child>
-                            <object class="GtkButton" id="nick_button">
-                                <property name="relief">none</property>
+                            <object class="GtkStack" id="nick_stack">
                                 <property name="visible">True</property>
                                 <child>
-                                    <object class="GtkLabel" id="nick_label">
-                                        <property name="xalign">0</property>
+                                    <object class="GtkButton" id="nick_button">
+                                        <property name="relief">none</property>
+                                        <property name="visible">True</property>
+                                        <child>
+                                            <object class="GtkLabel" id="nick_label">
+                                                <property name="xalign">0</property>
+                                                <property name="visible">True</property>
+                                            </object>
+                                        </child>
+                                    </object>
+                                    <packing>
+                                        <property name="name">label</property>
+                                    </packing>
+                                </child>
+                                <child>
+                                    <object class="GtkEntry" id="nick_entry">
+                                        <property name="hexpand">True</property>
+                                        <property name="width_request">200</property>
                                         <property name="visible">True</property>
                                     </object>
+                                    <packing>
+                                        <property name="name">entry</property>
+                                    </packing>
                                 </child>
                             </object>
                             <packing>
-                                <property name="name">label</property>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">2</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
                             </packing>
                         </child>
                         <child>
-                            <object class="GtkEntry" id="nick_entry">
-                                <property name="hexpand">True</property>
-                                <property name="width_request">200</property>
-                                <property name="visible">True</property>
+                            <object class="GtkLabel" id="password_text_label">
+                                <property name="label" translatable="yes">Password</property>
+                                <property name="xalign">1</property>
+                                <style>
+                                    <class name="dim-label"/>
+                                </style>
                             </object>
                             <packing>
-                                <property name="name">entry</property>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">3</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
                             </packing>
                         </child>
-                    </object>
-                    <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">2</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                    </packing>
-                </child>
-                <child>
-                    <object class="GtkLabel">
-                        <property name="label" translatable="yes">Password</property>
-                        <property name="xalign">1</property>
-                        <property name="visible">True</property>
-                        <style>
-                            <class name="dim-label"/>
-                        </style>
-                    </object>
-                    <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">3</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                    </packing>
-                </child>
-                <child>
-                    <object class="GtkStack" id="password_stack">
-                        <property name="visible">True</property>
                         <child>
-                            <object class="GtkButton" id="password_button">
-                                <property name="relief">none</property>
-                                <property name="visible">True</property>
+                            <object class="GtkStack" id="password_stack">
+                                <child>
+                                    <object class="GtkButton" id="password_button">
+                                        <property name="relief">none</property>
+                                        <property name="visible">True</property>
+                                        <child>
+                                            <object class="GtkLabel" id="password_label">
+                                                <property name="xalign">0</property>
+                                                <property name="visible">True</property>
+                                            </object>
+                                        </child>
+                                    </object>
+                                    <packing>
+                                        <property name="name">label</property>
+                                    </packing>
+                                </child>
                                 <child>
-                                    <object class="GtkLabel" id="password_label">
-                                        <property name="xalign">0</property>
+                                    <object class="GtkEntry" id="password_entry">
+                                        <property name="hexpand">True</property>
+                                        <property name="width_request">200</property>
+                                        <property name="visibility">False</property>
                                         <property name="visible">True</property>
                                     </object>
+                                    <packing>
+                                        <property name="name">entry</property>
+                                    </packing>
                                 </child>
                             </object>
                             <packing>
-                                <property name="name">label</property>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">3</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
                             </packing>
                         </child>
+                    </object>
+                    <packing>
+                        <property name="index">-1</property>
+                    </packing>
+                </child>
+                <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>
-                            <object class="GtkEntry" id="password_entry">
-                                <property name="hexpand">True</property>
-                                <property name="width_request">200</property>
-                                <property name="visibility">False</property>
+                            <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>
+                                <style>
+                                    <class name="app-notification"/>
+                                </style>
+                                <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>
+                                                <property name="label" translatable="yes">This is an app-notification. Click the button to dismiss</property>
+                                            </object>
+                                            <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">0</property>
+                                            </packing>
+                                        </child>
+                                        <child>
+                                            <object class="GtkButton" id="notification_button">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">True</property>
+                                                <property name="relief">none</property>
+                                                <child>
+                                                    <object class="GtkImage" id="image2">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">False</property>
+                                                        <property name="icon_name">window-close-symbolic</property>
+                                                    </object>
+                                                </child>
+                                                <style>
+                                                    <class name="image-button"/>
+                                                </style>
+                                            </object>
+                                            <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">1</property>
+                                            </packing>
+                                        </child>
+                                    </object>
+                                </child>
+                                <child type="label_item">
+                                    <placeholder/>
+                                </child>
                             </object>
-                            <packing>
-                                <property name="name">entry</property>
-                            </packing>
                         </child>
                     </object>
-                    <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">3</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                    </packing>
                 </child>
             </object>
         </child>
-- 
cgit v1.2.3-54-g00ecf