From 14fc267e83595a499ad1f2ca27c9192b0c9ec430 Mon Sep 17 00:00:00 2001
From: Samuel Hand <samuel.d.hand@gmail.com>
Date: Tue, 7 Aug 2018 01:06:59 +0100
Subject: Minor UI improvements: use a stack for the key management dialog

---
 plugins/omemo/data/manage_key_dialog.ui | 176 ++++++++++++++++++--------------
 1 file changed, 97 insertions(+), 79 deletions(-)

(limited to 'plugins/omemo/data')

diff --git a/plugins/omemo/data/manage_key_dialog.ui b/plugins/omemo/data/manage_key_dialog.ui
index cd14e16c..1c07d971 100644
--- a/plugins/omemo/data/manage_key_dialog.ui
+++ b/plugins/omemo/data/manage_key_dialog.ui
@@ -39,114 +39,132 @@
             <object class="GtkBox">
                 <property name="visible">True</property>
                 <child>
-                    <object class="GtkBox" id="main_screen">
+                    <object class="GtkStack" id="manage_stack">
                         <property name="visible">True</property>
-                        <property name="margin">12</property>
-                        <property name="spacing">12</property>
-                        <property name="orientation">vertical</property>
+                        <property name="transition-type">slide-left-right</property>
                         <child>
-                            <object class="GtkLabel" id="main_desc">
-                                <property name="visible">True</property>
-                                <property name="wrap">True</property>
-                                <property name="xalign">0</property>
-                                <property name="max-width-chars">1</property>
-                            </object>
-                        </child>
-                        <child>
-                            <object class="GtkFrame">
+                            <object class="GtkBox" id="main_screen">
                                 <property name="visible">True</property>
+                                <property name="margin">12</property>
+                                <property name="spacing">12</property>
+                                <property name="orientation">vertical</property>
+                                <property name="valign">center</property>
                                 <child>
-                                    <object class="GtkListBox" id="main_action_list">
+                                    <object class="GtkLabel" id="main_desc">
                                         <property name="visible">True</property>
-                                        <property name="selection-mode">none</property>
+                                        <property name="wrap">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="max-width-chars">1</property>
+                                    </object>
+                                </child>
+                                <child>
+                                    <object class="GtkFrame">
+                                        <property name="visible">True</property>
+                                        <child>
+                                            <object class="GtkListBox" id="main_action_list">
+                                                <property name="visible">True</property>
+                                                <property name="selection-mode">none</property>
+                                            </object>
+                                        </child>
                                     </object>
                                 </child>
                             </object>
+                            <packing>
+                                <property name="name">main</property>
+                            </packing>
                         </child>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkBox" id="confirm_screen">
-                        <property name="visible">False</property>
-                        <property name="margin">12</property>
-                        <property name="spacing">12</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                            <object class="GtkImage" id="confirm_image">
-                                <property name="visible">True</property>
-                            </object>
-                        </child>
-                        <child>
-                            <object class="GtkLabel" id="confirm_title">
-                                <property name="visible">True</property>
-                                <attributes>
-                                    <attribute name="scale" value="1.1"/>
-                                </attributes>
-                            </object>
-                        </child>
-                        <child>
-                            <object class="GtkLabel" id="confirm_desc">
-                                <property name="visible">True</property>
-                                <property name="justify">center</property>
-                                <property name="wrap">True</property>
-                                <property name="max-width-chars">40</property>
-                                <attributes>
-                                    <attribute name="scale" value="0.8"/>
-                                </attributes>
-                                <style>
-                                    <class name="dim-label"/>
-                                </style>
-                            </object>
-                        </child>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkBox" id="verify_screen">
-                        <property name="visible">False</property>
-                        <property name="margin">12</property>
-                        <property name="spacing">12</property>
-                        <property name="orientation">vertical</property>
                         <child>
-                            <object class="GtkLabel">
+                            <object class="GtkBox" id="verify_screen">
                                 <property name="visible">True</property>
-                                <property name="label">Compare the fingerprint, character by character, with the one shown on your contacts device.</property>
-                                <property name="wrap">True</property>
-                                <property name="xalign">0</property>
-                                <property name="max-width-chars">45</property>
+                                <property name="margin">12</property>
+                                <property name="spacing">12</property>
+                                <property name="orientation">vertical</property>
+                                <property name="valign">center</property>
+                                <child>
+                                    <object class="GtkLabel">
+                                        <property name="visible">True</property>
+                                        <property name="label">Compare the fingerprint, character by character, with the one shown on your contacts device.</property>
+                                        <property name="wrap">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="max-width-chars">45</property>
+                                    </object>
+                                </child>
+                                <child>
+                                    <object class="GtkBox">
+                                        <property name="visible">True</property>
+                                        <property name="orientation">vertical</property>
+                                        <property name="margin-left">12</property>
+                                        <property name="margin-right">12</property>
+                                        <property name="spacing">12</property>
+                                        <property name="hexpand">False</property>
+                                        <property name="halign">center</property>
+                                        <child>
+                                            <object class="GtkLabel" id="verify_label">
+                                                <property name="visible">True</property>
+                                                <property name="margin-top">12</property>
+                                                <property name="margin-bottom">12</property>
+                                                <property name="justify">right</property>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkButton" id="verify_no">
+                                                <property name="visible">True</property>
+                                                <property name="hexpand">True</property>
+                                                <property name="label">Not Matching</property>
+                                            </object>
+                                        </child>
+                                        <child>
+                                            <object class="GtkButton" id="verify_yes">
+                                                <property name="visible">True</property>
+                                                <property name="hexpand">True</property>
+                                                <property name="label">Matching</property>
+                                            </object>
+                                        </child>
+                                    </object>
+                                </child>
                             </object>
+                            <packing>
+                                <property name="name">verify</property>
+                            </packing>
                         </child>
                         <child>
-                            <object class="GtkBox">
+                            <object class="GtkBox" id="confirm_screen">
                                 <property name="visible">True</property>
-                                <property name="orientation">vertical</property>
-                                <property name="margin-left">12</property>
-                                <property name="margin-right">12</property>
+                                <property name="margin">12</property>
                                 <property name="spacing">12</property>
-                                <property name="hexpand">False</property>
-                                <property name="halign">center</property>
+                                <property name="orientation">vertical</property>
+                                <property name="valign">center</property>
                                 <child>
-                                    <object class="GtkLabel" id="verify_label">
+                                    <object class="GtkImage" id="confirm_image">
                                         <property name="visible">True</property>
-                                        <property name="margin-top">12</property>
-                                        <property name="margin-bottom">12</property>
-                                        <property name="justify">right</property>
                                     </object>
                                 </child>
                                 <child>
-                                    <object class="GtkButton" id="verify_no">
+                                    <object class="GtkLabel" id="confirm_title">
                                         <property name="visible">True</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="label">Not Matching</property>
+                                        <attributes>
+                                            <attribute name="scale" value="1.1"/>
+                                        </attributes>
                                     </object>
                                 </child>
                                 <child>
-                                    <object class="GtkButton" id="verify_yes">
+                                    <object class="GtkLabel" id="confirm_desc">
                                         <property name="visible">True</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="label">Matching</property>
+                                        <property name="justify">center</property>
+                                        <property name="wrap">True</property>
+                                        <property name="max-width-chars">40</property>
+                                        <attributes>
+                                            <attribute name="scale" value="0.8"/>
+                                        </attributes>
+                                        <style>
+                                            <class name="dim-label"/>
+                                        </style>
                                     </object>
                                 </child>
                             </object>
+                            <packing>
+                                <property name="name">confirm</property>
+                            </packing>
                         </child>
                     </object>
                 </child>
-- 
cgit v1.2.3-54-g00ecf