1 files changed, 77 insertions, 52 deletions
diff --git a/src/ui/password.ui b/src/ui/password.ui
index 638f668..37f1d24 100644
--- a/src/ui/password.ui
+++ b/src/ui/password.ui
@@ -1,36 +1,95 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
- <requires lib="gtk+" version="2.14"/>
- <!-- interface-naming-policy toplevel-contextual -->
+ <!-- interface-requires gtk+ 3.0 -->
 <object class="GtkDialog" id="password_dialog">
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="title" translatable="yes">Password</property>
 <property name="resizable">False</property>
 <property name="window_position">center-on-parent</property>
 <property name="type_hint">dialog</property>
 <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox15">
+ <object class="GtkBox" id="dialog-vbox15">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
 <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area15">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="pw_cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</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_action_appearance">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="pw_ok_button">
+ <property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">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="vbox11">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="spacing">12</property>
 <child>
 <object class="GtkTable" id="table1">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="n_rows">2</property>
 <property name="n_columns">2</property>
 <property name="column_spacing">12</property>
 <property name="row_spacing">6</property>
 <child>
+ <placeholder/>
+ </child>
+ <child>
 <object class="GtkCheckButton" id="pw_encrypt_header_checkbutton">
 <property name="label" translatable="yes">_Encrypt the file list</property>
+ <property name="use_action_appearance">False</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
 <property name="use_underline">True</property>
+ <property name="xalign">0</property>
 <property name="draw_indicator">True</property>
 </object>
 <packing>
@@ -38,13 +97,14 @@
 <property name="right_attach">2</property>
 <property name="top_attach">1</property>
 <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
 <property name="y_options"></property>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label34">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
 <property name="label" translatable="yes">_Password:</property>
 <property name="use_underline">True</property>
 <property name="mnemonic_widget">pw_password_entry</property>
@@ -59,7 +119,7 @@
 <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="activates_default">True</property>
 </object>
 <packing>
@@ -68,21 +128,22 @@
 <property name="y_options"></property>
 </packing>
 </child>
- <child>
- <placeholder/>
- </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkHBox" id="pw_note_hbox">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">6</property>
 <child>
 <object class="GtkImage" id="image2">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="stock">gtk-dialog-info</property>
 <property name="icon-size">6</property>
 </object>
@@ -95,65 +156,29 @@
 <child>
 <object class="GtkLabel" id="label33">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="label" translatable="yes">&lt;i&gt;&lt;b&gt;Note:&lt;/b&gt; the password will be used to encrypt files you add to the current archive, and to decrypt files you extract from the current archive. When the archive is closed the password will be deleted.&lt;/i&gt;</property>
 <property name="use_markup">True</property>
 <property name="wrap">True</property>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
 </object>
 <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area15">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="pw_cancel_button">
- <property name="label">gtk-cancel</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="pw_ok_button">
- <property name="label">gtk-ok</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_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="expand">True</property>
+ <property name="fill">True</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>
+ <property name="fill">True</property>
+ <property name="position">1</property>
 </packing>
 </child>
 </object>