[eog-plugins] postasa: Slight touch-ups on login dialog

[Felix Riemann <friemann src gnome org>]

commit 528e9121fae5970c799820e263f4b51510e3c3ff
Author: Felix Riemann <friemann gnome org>
Date:   Mon Jul 11 22:30:50 2011 +0200

    postasa: Slight touch-ups on login dialog
    
    Margins between widgets were pretty much non-existent.
    Remove useless title label, use the dialog's title instead.

 plugins/postasa/postasa-config.xml |  131 ++++++++++++++++++++++--------------
 1 files changed, 79 insertions(+), 52 deletions(-)
---
diff --git a/plugins/postasa/postasa-config.xml b/plugins/postasa/postasa-config.xml
index 4eee067..c452d51 100644
--- a/plugins/postasa/postasa-config.xml
+++ b/plugins/postasa/postasa-config.xml
@@ -1,42 +1,86 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy project-wide -->
   <object class="GtkDialog" id="postasa_login_dialog">
     <property name="height_request">150</property>
+    <property name="can_focus">False</property>
     <property name="border_width">5</property>
-    <property name="type_hint">normal</property>
-    <property name="has_separator">False</property>
+    <property name="title" translatable="yes">PicasaWeb Login</property>
+    <property name="resizable">False</property>
+    <property name="type_hint">dialog</property>
+    <property name="deletable">False</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog_vbox">
+      <object class="GtkBox" id="dialog_vbox">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
-        <child>
-          <object class="GtkVBox" id="login_box">
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="button_box">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
             <child>
-              <object class="GtkLabel" id="title">
+              <object class="GtkButton" id="cancel_button">
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
-                <property name="ypad">6</property>
-                <property name="label" translatable="yes">PicasaWeb Login</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
+              <object class="GtkButton" id="login_button">
+                <property name="label" translatable="yes">_Login</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_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkVBox" id="login_box">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">6</property>
+            <child>
               <object class="GtkHBox" id="username_hbox">
                 <property name="width_request">300</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">12</property>
                 <child>
                   <object class="GtkLabel" id="username_label">
                     <property name="width_request">60</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">Username</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">_Username:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">username_entry</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
@@ -45,9 +89,11 @@
                     <property name="width_request">240</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="invisible_char">&#x25CF;</property>
+                    <property name="invisible_char">â</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -62,13 +108,20 @@
               <object class="GtkHBox" id="password_hbox">
                 <property name="width_request">300</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">12</property>
                 <child>
                   <object class="GtkLabel" id="password_label">
                     <property name="width_request">60</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">Password</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">_Password:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">password_entry</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
@@ -78,10 +131,12 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="visibility">False</property>
-                    <property name="invisible_char">&#x25CF;</property>
+                    <property name="invisible_char">â</property>
                     <property name="invisible_char_set">True</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -95,9 +150,12 @@
             <child>
               <object class="GtkLabel" id="login_message">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="ypad">7</property>
               </object>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">3</property>
               </packing>
             </child>
@@ -108,43 +166,6 @@
             <property name="position">1</property>
           </packing>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="button_box">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="cancel_button">
-                <property name="label" translatable="yes">Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="login_button">
-                <property name="label" translatable="yes">Login</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
       </object>
     </child>
     <action-widgets>
@@ -152,4 +173,10 @@
       <action-widget response="-1">login_button</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkSizeGroup" id="entry_sizegroup">
+    <widgets>
+      <widget name="username_entry"/>
+      <widget name="password_entry"/>
+    </widgets>
+  </object>
 </interface>