1 files changed, 97 insertions, 63 deletions
diff --git a/capplets/about-me/mate-about-me-password.ui b/capplets/about-me/mate-about-me-password.ui
index 35de4cfa..380b6e42 100644
--- a/capplets/about-me/mate-about-me-password.ui
+++ b/capplets/about-me/mate-about-me-password.ui
@@ -1,28 +1,81 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
 <interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.14"/>
+ <!-- interface-license-type gplv2 -->
+ <!-- interface-name mate-about-me-password -->
+ <!-- interface-copyright MATE Developers -->
+ <!-- interface-authors Wolfgang Ulbrich -->
 <object class="GtkDialog" id="change-password">
+ <property name="can_focus">False</property>
 <property name="border_width">6</property>
 <property name="title" translatable="yes">Change password</property>
 <property name="resizable">False</property>
 <property name="type_hint">dialog</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">6</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action-area">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="cancel-button">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">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="change-password-button">
+ <property name="label" translatable="yes">Change pa_ssword</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">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">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
 <child>
- <object class="GtkHBox" id="container-hbox">
+ <object class="GtkBox" id="container-hbox">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">6</property>
 <property name="spacing">12</property>
 <child>
 <object class="GtkImage" id="dialog-image">
 <property name="visible">True</property>
- <property name="yalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
 <property name="icon_name">gtk-dialog-authentication</property>
- <property name="icon-size">6</property>
+ <property name="icon_size">6</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -31,14 +84,16 @@
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="main-vbox">
+ <object class="GtkBox" id="main-vbox">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <property name="spacing">6</property>
 <child>
 <object class="GtkLabel" id="header-label">
 <property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
 <property name="label" translatable="yes">Change your password</property>
 <attributes>
 <attribute name="weight" value="bold"/>
@@ -54,8 +109,9 @@
 <child>
 <object class="GtkLabel" id="description-label">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="valign">start</property>
 <property name="label" translatable="yes">To change your password, enter your current password in the field below and click &lt;b&gt;Authenticate&lt;/b&gt;.
 After you have authenticated, enter your new password, retype it for verification and click &lt;b&gt;Change password&lt;/b&gt;.</property>
 <property name="use_markup">True</property>
@@ -68,19 +124,22 @@ After you have authenticated, enter your new password, retype it for verificatio
 </packing>
 </child>
 <child>
- <object class="GtkHBox" id="entry-hbox">
+ <object class="GtkBox" id="entry-hbox">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">6</property>
 <child>
- <object class="GtkVBox" id="entry-labels-vbox">
+ <object class="GtkBox" id="entry-labels-vbox">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <property name="spacing">6</property>
 <property name="homogeneous">True</property>
 <child>
 <object class="GtkLabel" id="current-password-label">
 <property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
 <property name="label" translatable="yes">Current _password:</property>
 <property name="use_underline">True</property>
 <property name="mnemonic_widget">current-password</property>
@@ -95,7 +154,8 @@ After you have authenticated, enter your new password, retype it for verificatio
 <object class="GtkLabel" id="new-password-label">
 <property name="visible">True</property>
 <property name="sensitive">False</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
 <property name="label" translatable="yes">_New password:</property>
 <property name="use_underline">True</property>
 <property name="mnemonic_widget">new-password</property>
@@ -110,7 +170,8 @@ After you have authenticated, enter your new password, retype it for verificatio
 <object class="GtkLabel" id="retyped-password-label">
 <property name="visible">True</property>
 <property name="sensitive">False</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
 <property name="label" translatable="yes">_Retype new password:</property>
 <property name="use_underline">True</property>
 <property name="mnemonic_widget">retyped-password</property>
@@ -129,14 +190,16 @@ After you have authenticated, enter your new password, retype it for verificatio
 </packing>
 </child>
 <child>
- <object class="GtkVBox" id="entry-vbox">
+ <object class="GtkBox" id="entry-vbox">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="orientation">vertical</property>
 <property name="spacing">6</property>
 <property name="homogeneous">True</property>
 <child>
- <object class="GtkHBox" id="auth-hbox">
+ <object class="GtkBox" id="auth-hbox">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">6</property>
 <child>
 <object class="GtkEntry" id="current-password">
@@ -145,6 +208,8 @@ After you have authenticated, enter your new password, retype it for verificatio
 <property name="visibility">False</property>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -156,15 +221,18 @@ After you have authenticated, enter your new password, retype it for verificatio
 <child>
 <object class="GtkAlignment" id="alignment1">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xscale">0</property>
 <property name="yscale">0</property>
 <child>
- <object class="GtkHBox" id="hbox73">
+ <object class="GtkBox" id="hbox73">
 <property name="visible">True</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-apply</property>
 </object>
 <packing>
@@ -176,6 +244,7 @@ After you have authenticated, enter your new password, retype it for verificatio
 <child>
 <object class="GtkLabel" id="label1070">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">_Authenticate</property>
 <property name="use_underline">True</property>
 </object>
@@ -198,6 +267,8 @@ After you have authenticated, enter your new password, retype it for verificatio
 </child>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
@@ -230,6 +301,8 @@ After you have authenticated, enter your new password, retype it for verificatio
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -243,60 +316,22 @@ After you have authenticated, enter your new password, retype it for verificatio
 <child>
 <object class="GtkLabel" id="status-label">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">Please type your password again in the &lt;b&gt;Retype new password&lt;/b&gt; field.</property>
 <property name="use_markup">True</property>
 <property name="justify">center</property>
 <property name="wrap">True</property>
 </object>
 <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
 <property name="position">3</property>
 </packing>
 </child>
 </object>
 <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action-area">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="cancel-button">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">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="change-password-button">
- <property name="label" translatable="yes">Change pa_ssword</property>
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
 <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
@@ -304,8 +339,7 @@ After you have authenticated, enter your new password, retype it for verificatio
 <packing>
 <property name="expand">False</property>
 <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="position">1</property>
 </packing>
 </child>
 </object>