1 files changed, 67 insertions, 25 deletions
diff --git a/data/mate-screensaver-preferences.ui b/data/mate-screensaver-preferences.ui
index 0311064..e5ef573 100644
--- a/data/mate-screensaver-preferences.ui
+++ b/data/mate-screensaver-preferences.ui
@@ -14,6 +14,13 @@
 <property name="step_increment">1</property>
 <property name="page_increment">10</property>
 </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="lower">0</property>
+ <property name="upper">120</property>
+ <property name="value">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
 <object class="GtkWindow" id="fullscreen_preview_window">
 <property name="can_focus">True</property>
 <property name="has_focus">True</property>
@@ -391,49 +398,82 @@
 <property name="can_focus">False</property>
 <property name="spacing">12</property>
 <child>
- <object class="GtkLabel" id="activate_delay_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Regard the computer as _idle after:</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="GtkBox" id="hbox4">
+ <object class="GtkGrid" id="time_grid">
 <property name="visible">True</property>
 <property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="activate_delay_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="hexpand">False</property>
+ <property name="label" translatable="yes">Regard the computer as _idle after:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
 <child>
 <object class="GtkScale" id="activate_delay_hscale">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
 <property name="adjustment">adjustment1</property>
 <property name="digits">0</property>
 </object>
 <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</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="lock_delay_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="hexpand">False</property>
+ <property name="label" translatable="yes">Time before l_ocking:</property>
+ <property name="tooltip-text" translatable="yes">Delay before locking the screen after the screensaver activated</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScale" id="lock_delay_hscale">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="adjustment">adjustment2</property>
+ <property name="digits">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
 </packing>
 </child>
 </object>
 <packing>
 <property name="expand">True</property>
 <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
 </packing>
 </child>
 </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
 </child>
 <child>
 <object class="GtkCheckButton" id="enable_checkbox">
@@ -474,7 +514,9 @@
 <object class="GtkLabel">
 <property name="visible">True</property>
 <property name="can_focus">False</property>
- <property name="label" translatable="yes">Background picture for lock screen:</property>
+ <property name="label" translatable="yes">_Background picture for lock screen:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">picture_filename</property>
 </object>
 <packing>
 <property name="expand">False</property>