[gnome-initial-setup] Account page fixes

[Matthias Clasen <matthiasc src gnome org>]

commit 3df15a3ad496af4cdbede6130f115ea665158cd2
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Nov 5 22:39:51 2012 -0500

    Account page fixes
    
    Fix up lack of padding, shorten the 'Confirm Password' label,
    and fix up the focus chain.

 .../pages/account/gis-account-page.ui              |  174 +++++++++++++-------
 1 files changed, 113 insertions(+), 61 deletions(-)
---
diff --git a/gnome-initial-setup/pages/account/gis-account-page.ui b/gnome-initial-setup/pages/account/gis-account-page.ui
index 8c42dc9..2568096 100644
--- a/gnome-initial-setup/pages/account/gis-account-page.ui
+++ b/gnome-initial-setup/pages/account/gis-account-page.ui
@@ -1,104 +1,117 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkListStore" id="account-username-model">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
   </object>
   <object class="GtkListStore" id="enterprise-realms-model">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
+      <!-- column-name gobject -->
       <column type="GObject"/>
     </columns>
   </object>
   <object class="GtkBox" id="account-page">
-    <property name="name">account-page</property>
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <property name="halign">center</property>
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkLabel" id="account-title">
         <property name="visible">True</property>
-        <property name="label" translatable="yes">Choose How to Login</property>
-        <property name="hexpand">True</property>
+        <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="valign">start</property>
-        <property name="margin-bottom">18</property>
+        <property name="margin_bottom">18</property>
+        <property name="hexpand">True</property>
+        <property name="label" translatable="yes">Choose How to Login</property>
         <attributes>
           <attribute name="weight" value="bold"/>
           <attribute name="scale" value="1.2"/>
         </attributes>
       </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
     </child>
-
     <child>
       <object class="GtkBox" id="account-mode">
-        <property name="visible">False</property>
         <property name="can_focus">False</property>
         <property name="halign">center</property>
+        <property name="margin_bottom">12</property>
         <style>
           <class name="linked"/>
         </style>
         <child>
           <object class="GtkToggleButton" id="local-button">
             <property name="label" translatable="yes">_Local Account</property>
-            <property name="use_action_appearance">False</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="focus_on_click">False</property>
             <property name="use_underline">True</property>
+            <property name="focus_on_click">False</property>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkToggleButton" id="enterprise-button">
             <property name="label" translatable="yes">_Enterprise Login</property>
-            <property name="use_action_appearance">False</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="focus_on_click">False</property>
             <property name="use_underline">True</property>
+            <property name="focus_on_click">False</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>
-
     <child>
       <object class="GtkBox" id="local-area">
         <property name="visible">True</property>
-        <property name="margin">12</property>
+        <property name="can_focus">False</property>
         <child>
           <object class="GtkGrid" id="local-account-grid">
             <property name="visible">True</property>
-            <property name="row-spacing">6</property>
-            <property name="column-spacing">12</property>
-            <property name="margin-bottom">18</property>
+            <property name="can_focus">False</property>
+            <property name="row_spacing">6</property>
+            <property name="column_spacing">12</property>
             <child>
               <object class="GtkToggleButton" id="local-account-avatar-button">
                 <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
                 <child>
                   <object class="GtkImage" id="local-account-avatar-image">
                     <property name="visible">True</property>
-                    <property name="icon-name">avatar-default</property>
-                    <property name="pixel-size">64</property>
+                    <property name="can_focus">False</property>
+                    <property name="pixel_size">64</property>
+                    <property name="icon_name">avatar-default</property>
                   </object>
                 </child>
               </object>
               <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">1</property>
+                <property name="left_attach">2</property>
+                <property name="top_attach">0</property>
                 <property name="width">1</property>
                 <property name="height">2</property>
               </packing>
@@ -106,17 +119,18 @@
             <child>
               <object class="GtkLabel" id="account-fullname-label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">end</property>
                 <property name="label" translatable="yes">_Full Name</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">account-fullname-entry</property>
-                <property name="halign">end</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
               </object>
               <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
                 <property name="width">1</property>
                 <property name="height">1</property>
               </packing>
@@ -124,30 +138,31 @@
             <child>
               <object class="GtkEntry" id="account-fullname-entry">
                 <property name="visible">True</property>
+                <property name="can_focus">True</property>
                 <property name="halign">start</property>
               </object>
               <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">1</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="GtkLabel" id="account-username-label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">end</property>
                 <property name="label" translatable="yes">_Username</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">account-username-combo</property>
-                <property name="halign">end</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
               </object>
               <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">2</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
                 <property name="width">1</property>
                 <property name="height">1</property>
               </packing>
@@ -155,47 +170,54 @@
             <child>
               <object class="GtkComboBoxText" id="account-username-combo">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="has_entry">True</property>
                 <property name="entry_text_column">0</property>
-                <property name="model">account-username-model</property>
+                <child internal-child="entry">
+                  <object class="GtkEntry" id="comboboxtext-entry2">
+                    <property name="can_focus">True</property>
+                  </object>
+                </child>
               </object>
               <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">2</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="GtkCheckButton" id="account-password-check">
-                <property name="visible">True</property>
                 <property name="label" translatable="yes">_Require a password to use this account</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
+                <property name="xalign">0.5</property>
               </object>
               <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">3</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
                 <property name="width">2</property>
                 <property name="height">1</property>
               </packing>
             </child>
-
             <child>
               <object class="GtkLabel" id="account-password-label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">end</property>
                 <property name="label" translatable="yes">_Password</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">account-password-entry</property>
-                <property name="halign">end</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
               </object>
               <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">4</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">3</property>
                 <property name="width">1</property>
                 <property name="height">1</property>
               </packing>
@@ -203,31 +225,32 @@
             <child>
               <object class="GtkEntry" id="account-password-entry">
                 <property name="visible">True</property>
+                <property name="can_focus">True</property>
                 <property name="halign">start</property>
                 <property name="visibility">False</property>
               </object>
               <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">4</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>
-
             <child>
               <object class="GtkLabel" id="account-confirm-label">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">_Confirm Password</property>
+                <property name="can_focus">False</property>
+                <property name="halign">end</property>
+                <property name="label" translatable="yes">_Confirm</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">account-confirm-entry</property>
-                <property name="halign">end</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
               </object>
               <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">5</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">4</property>
                 <property name="width">1</property>
                 <property name="height">1</property>
               </packing>
@@ -235,38 +258,61 @@
             <child>
               <object class="GtkEntry" id="account-confirm-entry">
                 <property name="visible">True</property>
+                <property name="can_focus">True</property>
                 <property name="halign">start</property>
                 <property name="visibility">False</property>
               </object>
               <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">5</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">4</property>
                 <property name="width">1</property>
                 <property name="height">1</property>
               </packing>
             </child>
-
             <child>
               <object class="GtkCheckButton" id="account-admin-check">
-                <property name="visible">True</property>
                 <property name="label" translatable="yes">_Act as administrator of this computer</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
+                <property name="xalign">0.5</property>
               </object>
               <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">6</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">5</property>
                 <property name="width">2</property>
                 <property name="height">1</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
         </child>
       </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+      </packing>
     </child>
-
     <child>
       <object class="GtkGrid" id="enterprise-area">
-        <property name="visible">False</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
         <property name="row_spacing">10</property>
@@ -341,9 +387,9 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
+                <property name="model">enterprise-realms-model</property>
                 <property name="has_entry">True</property>
                 <property name="entry_text_column">0</property>
-                <property name="model">enterprise-realms-model</property>
                 <child internal-child="entry">
                   <object class="GtkEntry" id="enterprise-domain-entry">
                     <property name="can_focus">True</property>
@@ -353,6 +399,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -362,12 +409,13 @@
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Tip: Enterprise domain or realm name</property>
                 <attributes>
-                  <attribute name="scale" value="0.8"/>
+                  <attribute name="scale" value="0.80000000000000004"/>
                 </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
@@ -411,7 +459,11 @@
           </packing>
         </child>
       </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">3</property>
+      </packing>
     </child>
-
   </object>
 </interface>