From 8b011be70b92552932e5d74d862008ab06a064fc Mon Sep 17 00:00:00 2001
From: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Date: Tue, 23 Oct 2018 09:58:18 -0500
Subject: Make Persona selection dialog look less busy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• No need for a horizontal line to be randomly there.
• Get rid of GtkFrames that enclose only one element.
  Seriously, they are cancer. Use them properly!
• … and while I’m here, use a stock label for the Search button.
  I noticed the associated help page not using the “Go” name.

Change-Id: Id196d8d970a219285c5cc606ab9b4327cdce2e91
Reviewed-on: https://gerrit.libreoffice.org/62238
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
---
 cui/uiconfig/ui/select_persona_dialog.ui | 201 +++++++++++--------------------
 1 file changed, 67 insertions(+), 134 deletions(-)

(limited to 'cui/uiconfig/ui')

diff --git a/cui/uiconfig/ui/select_persona_dialog.ui b/cui/uiconfig/ui/select_persona_dialog.ui
index ca746046f3df..36d80658a5d2 100644
--- a/cui/uiconfig/ui/select_persona_dialog.ui
+++ b/cui/uiconfig/ui/select_persona_dialog.ui
@@ -85,83 +85,46 @@
             <property name="expand">False</property>
             <property name="fill">True</property>
             <property name="pack_type">end</property>
-            <property name="position">4</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkFrame" id="frame1">
+          <object class="GtkBox" id="box4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
+            <property name="spacing">6</property>
             <child>
-              <object class="GtkAlignment" id="alignment5">
+              <object class="GtkEntry" id="search_term">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="top_padding">6</property>
-                <property name="left_padding">12</property>
-                <child>
-                  <object class="GtkBox" id="box3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkBox" id="box4">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkEntry" id="search_term">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="hexpand">True</property>
-                            <property name="primary_icon_activatable">False</property>
-                            <property name="secondary_icon_activatable">False</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="search_personas">
-                            <property name="label" translatable="yes" context="select_persona_dialog|search_personas">_Go</property>
-                            <property name="width_request">85</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="can_default">True</property>
-                            <property name="has_default">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="placeholder_text" translatable="yes" context="select_persona_dialog|search_term">Search term or address</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
             </child>
-            <child type="label">
-              <object class="GtkLabel" id="label1">
+            <child>
+              <object class="GtkButton" id="search_personas">
+                <property name="label" context="select_persona_dialog|search_personas">gtk-find</property>
+                <property name="width_request">85</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="select_persona_dialog|label1">Search Term or Firefox Theme URL</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+                <property name="use_stock">True</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
             </child>
           </object>
           <packing>
@@ -171,71 +134,52 @@
           </packing>
         </child>
         <child>
-          <object class="GtkFrame" id="frame4">
+          <object class="GtkBox" id="box6">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
+            <property name="spacing">6</property>
             <child>
-              <object class="GtkAlignment" id="alignment3">
+              <object class="GtkLabel" id="categories_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="top_padding">6</property>
-                <property name="left_padding">12</property>
-                <child>
-                  <object class="GtkBox" id="box6">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkComboBoxText" id="categoriesCB">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <items>
-                          <item id="abstract" translatable="yes" context="select_persona_dialog|categoriesCB">Abstract</item>
-                          <item id="causes" translatable="yes" context="select_persona_dialog|categoriesCB">Causes</item>
-                          <item id="fashion" translatable="yes" context="select_persona_dialog|categoriesCB">Fashion</item>
-                          <item id="film-and-tv" translatable="yes" context="select_persona_dialog|categoriesCB">Film and TV</item>
-                          <item id="firefox" translatable="yes" context="select_persona_dialog|categoriesCB">Firefox</item>
-                          <item id="foxkeh" translatable="yes" comments="https://addons.mozilla.org/en-US/firefox/themes/" context="select_persona_dialog|categoriesCB">Foxkeh</item>
-                          <item id="holiday" translatable="yes" context="select_persona_dialog|categoriesCB">Holiday</item>
-                          <item id="music" translatable="yes" context="select_persona_dialog|categoriesCB">Music</item>
-                          <item id="nature" translatable="yes" context="select_persona_dialog|categoriesCB">Nature</item>
-                          <item id="other" translatable="yes" context="select_persona_dialog|categoriesCB">Other</item>
-                          <item id="scenery" translatable="yes" context="select_persona_dialog|categoriesCB">Scenery</item>
-                          <item id="seasonal" translatable="yes" context="select_persona_dialog|categoriesCB">Seasonal</item>
-                          <item id="solid" translatable="yes" context="select_persona_dialog|categoriesCB">Solid</item>
-                          <item id="sports" translatable="yes" context="select_persona_dialog|categoriesCB">Sports</item>
-                          <item id="websites" translatable="yes" context="select_persona_dialog|categoriesCB">Websites</item>
-                          <item id="featured" translatable="yes" context="select_persona_dialog|categoriesCB">Featured</item>
-                        </items>
-                        <accessibility>
-                          <relation type="labelled-by" target="label6"/>
-                        </accessibility>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
+                <property name="label" context="select_persona_dialog|categories_label" translatable="yes">Ca_tegory:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">categoriesCB</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
             </child>
-            <child type="label">
-              <object class="GtkLabel" id="label6">
+            <child>
+              <object class="GtkComboBoxText" id="categoriesCB">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="select_persona_dialog|label6">Categories</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-                <accessibility>
-                  <relation type="label-for" target="categoriesCB"/>
-                </accessibility>
+                <items>
+                  <item id="abstract" translatable="yes" context="select_persona_dialog|categoriesCB">Abstract</item>
+                  <item id="causes" translatable="yes" context="select_persona_dialog|categoriesCB">Causes</item>
+                  <item id="fashion" translatable="yes" context="select_persona_dialog|categoriesCB">Fashion</item>
+                  <item id="film-and-tv" translatable="yes" context="select_persona_dialog|categoriesCB">Film and TV</item>
+                  <item id="firefox" translatable="yes" context="select_persona_dialog|categoriesCB">Firefox</item>
+                  <item id="foxkeh" translatable="yes" comments="https://addons.mozilla.org/en-US/firefox/themes/" context="select_persona_dialog|categoriesCB">Foxkeh</item>
+                  <item id="holiday" translatable="yes" context="select_persona_dialog|categoriesCB">Holiday</item>
+                  <item id="music" translatable="yes" context="select_persona_dialog|categoriesCB">Music</item>
+                  <item id="nature" translatable="yes" context="select_persona_dialog|categoriesCB">Nature</item>
+                  <item id="other" translatable="yes" context="select_persona_dialog|categoriesCB">Other</item>
+                  <item id="scenery" translatable="yes" context="select_persona_dialog|categoriesCB">Scenery</item>
+                  <item id="seasonal" translatable="yes" context="select_persona_dialog|categoriesCB">Seasonal</item>
+                  <item id="solid" translatable="yes" context="select_persona_dialog|categoriesCB">Solid</item>
+                  <item id="sports" translatable="yes" context="select_persona_dialog|categoriesCB">Sports</item>
+                  <item id="websites" translatable="yes" context="select_persona_dialog|categoriesCB">Websites</item>
+                  <item id="featured" translatable="yes" context="select_persona_dialog|categoriesCB">Featured</item>
+                </items>
               </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
             </child>
           </object>
           <packing>
@@ -244,17 +188,6 @@
             <property name="position">1</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkSeparator" id="separator1">
-            <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">2</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkGrid" id="grid1">
             <property name="width_request">624</property>
@@ -384,9 +317,9 @@
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
+            <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">3</property>
+            <property name="position">2</property>
           </packing>
         </child>
       </object>
-- 
cgit