[seahorse/wip/nielsdg/cleanup-empty-state: 1/3] KeyManager: remove "first-time-box"

[Niels De Graef <nielsdg src gnome org>]

commit 334f25b9c0846637e6d9b5ecf5506f14d522636e
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Sat Jan 12 16:23:26 2019 +0100

    KeyManager: remove "first-time-box"
    
    It was unused, and we're going to make something better :-)

 src/seahorse-key-manager.ui | 306 +++++++++-----------------------------------
 1 file changed, 58 insertions(+), 248 deletions(-)
---
diff --git a/src/seahorse-key-manager.ui b/src/seahorse-key-manager.ui
index 3066bd10..1d1ccdc3 100644
--- a/src/seahorse-key-manager.ui
+++ b/src/seahorse-key-manager.ui
@@ -322,281 +322,87 @@
       </object>
     </child>
     <child>
-      <object class="GtkBox">
+      <object class="GtkPaned" id="sidebar_panes">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <property name="can_focus">False</property>
+        <property name="vexpand">True</property>
+        <property name="can_focus">True</property>
         <child>
-          <object class="GtkPaned" id="sidebar_panes">
+          <object class="GtkScrolledWindow" id="sidebar_area">
             <property name="visible">True</property>
-            <property name="vexpand">True</property>
-            <property name="can_focus">True</property>
+            <property name="can_focus">False</property>
+            <property name="hscrollbar-policy">never</property>
+            <property name="shadow-type">out</property>
+            <property name="width-request">170</property>
+            <style>
+              <class name="sidebar"/>
+            </style>
+          </object>
+          <packing>
+            <property name="shrink">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="orientation">vertical</property>
             <child>
-              <object class="GtkScrolledWindow" id="sidebar_area">
+              <object class="GtkSearchBar">
                 <property name="visible">True</property>
+                <property name="search-mode-enabled" bind-source="show_search_button" bind-property="active" 
bind-flags="bidirectional|sync-create" />
                 <property name="can_focus">False</property>
-                <property name="hscrollbar-policy">never</property>
-                <property name="shadow-type">out</property>
-                <property name="width-request">170</property>
-                <style>
-                  <class name="sidebar"/>
-                </style>
+                <child>
+                  <object class="GtkSearchEntry" id="filter_entry">
+                    <property name="visible">True</property>
+                    <property name="width_chars">30</property>
+                    <property name="placeholder_text" translatable="yes">Filter</property>
+                  </object>
+                </child>
               </object>
-              <packing>
-                <property name="shrink">False</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkBox">
+              <object class="GtkScrolledWindow" id="key-list-scroll-area">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar-policy">never</property>
                 <child>
-                  <object class="GtkSearchBar">
+                  <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="search-mode-enabled" bind-source="show_search_button" 
bind-property="active" bind-flags="bidirectional|sync-create" />
                     <property name="can_focus">False</property>
+                    <property name="orientation">horizontal</property>
+                    <property name="margin-top">24</property>
+                    <property name="margin-bottom">24</property>
                     <child>
-                      <object class="GtkSearchEntry" id="filter_entry">
+                      <object class="GtkBox">
                         <property name="visible">True</property>
-                        <property name="width_chars">30</property>
-                        <property name="placeholder_text" translatable="yes">Filter</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
                       </object>
                     </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkScrolledWindow" id="key-list-scroll-area">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hscrollbar-policy">never</property>
                     <child>
                       <object class="GtkBox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="orientation">horizontal</property>
-                        <property name="margin-top">24</property>
-                        <property name="margin-bottom">24</property>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="hexpand">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="hexpand">True</property>
-                          </object>
-                          <packing>
-                            <property name="pack_type">end</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkFrame">
-                            <property name="visible">True</property>
-                            <property name="hexpand">True</property>
-                            <property name="margin-start">18</property>
-                            <property name="margin-end">18</property>
-                            <child>
-                              <object class="GtkTreeView" id="key_list">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="enable-grid-lines">horizontal</property>
-                                <child internal-child="selection">
-                                  <object class="GtkTreeSelection" id="treeview-selection"/>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
+                        <property name="hexpand">True</property>
                       </object>
+                      <packing>
+                        <property name="pack_type">end</property>
+                      </packing>
                     </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkAlignment" id="alignment5">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="yscale">0</property>
                     <child>
-                      <object class="GtkBox" id="first-time-box">
-                        <property name="can_focus">False</property>
-                        <property name="orientation">vertical</property>
-                        <property name="border_width">12</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkLabel" id="label17">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="xpad">6</property>
-                            <property name="label" translatable="yes">First time options:</property>
-                            <attributes>
-                             <attribute name="scale" value="1.2"/>
-                             <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkHSeparator" id="hseparator3">
-                            <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">1</property>
-                          </packing>
-                        </child>
+                      <object class="GtkFrame">
+                        <property name="visible">True</property>
+                        <property name="hexpand">True</property>
+                        <property name="margin-start">18</property>
+                        <property name="margin-end">18</property>
                         <child>
-                          <object class="GtkGrid" id="table2">
+                          <object class="GtkTreeView" id="key_list">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="border_width">6</property>
-                            <property name="column_spacing">12</property>
-                            <property name="row_spacing">6</property>
-                            <child>
-                              <object class="GtkButton" id="help-button">
-                                <property name="label">gtk-help</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="can_default">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="use_stock">True</property>
-                                <signal name="clicked" handler="on_widget_help" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="top_attach">0</property>
-                                <property name="left_attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label18">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">To get started with encryption you 
will need keys.</property>
-                                <property name="wrap">True</property>
-                              </object>
-                              <packing>
-                                <property name="top_attach">0</property>
-                                <property name="left_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label19">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Import existing keys from a 
file:</property>
-                              </object>
-                              <packing>
-                                <property name="top_attach">1</property>
-                                <property name="left_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="import_button">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="can_default">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="action-name">win.import-file</property>
-                                <child>
-                                  <object class="GtkAlignment" id="alignment6">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xscale">0</property>
-                                    <property name="yscale">0</property>
-                                    <child>
-                                      <object class="GtkBox" id="hbox4">
-                                        <property name="visible">True</property>
-                                        <property name="orientation">horizontal</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="spacing">2</property>
-                                        <child>
-                                          <object class="GtkImage" id="image2">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="stock">gtk-open</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">False</property>
-                                            <property name="position">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label20">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">_Import</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">False</property>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="top_attach">1</property>
-                                <property name="left_attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label21">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Generate a new key of your own: 
</property>
-                              </object>
-                              <packing>
-                                <property name="top_attach">2</property>
-                                <property name="left_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="new_button">
-                                <property name="label">gtk-new</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="use_stock">True</property>
-                                <property name="action-name">win.new-item</property>
-                              </object>
-                              <packing>
-                                <property name="top_attach">2</property>
-                                <property name="left_attach">1</property>
-                              </packing>
+                            <property name="can_focus">True</property>
+                            <property name="enable-grid-lines">horizontal</property>
+                            <child internal-child="selection">
+                              <object class="GtkTreeSelection" id="treeview-selection"/>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -604,10 +410,14 @@
                 </child>
               </object>
               <packing>
-                <property name="shrink">False</property>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
               </packing>
             </child>
           </object>
+          <packing>
+            <property name="shrink">False</property>
+          </packing>
         </child>
       </object>
     </child>