[Xfce4-commits] [apps/xfce4-screensaver] 01/01: Organize glade file

noreply at xfce.org noreply at xfce.org
Sun Nov 18 21:02:56 CET 2018


This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-screensaver.

commit 24791f2eded5701aa59502f6938eda12b81e685e
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sun Nov 18 15:02:51 2018 -0500

    Organize glade file
---
 src/xfce4-screensaver-preferences.c  |   2 +-
 src/xfce4-screensaver-preferences.ui | 420 +++++++++++++++++------------------
 2 files changed, 211 insertions(+), 211 deletions(-)

diff --git a/src/xfce4-screensaver-preferences.c b/src/xfce4-screensaver-preferences.c
index 382c7a0..a3cba5b 100644
--- a/src/xfce4-screensaver-preferences.c
+++ b/src/xfce4-screensaver-preferences.c
@@ -1737,7 +1737,7 @@ configure_capplet (void) {
     list_scroller               = GTK_WIDGET (gtk_builder_get_object (builder, "saver_themes_scrolled_window"));
     root_warning_infobar        = GTK_WIDGET (gtk_builder_get_object (builder, "root_warning_infobar"));
     preview_button              = GTK_WIDGET (gtk_builder_get_object (builder, "preview_button"));
-    gpm_button                  = GTK_WIDGET (gtk_builder_get_object (builder, "gpm_button"));
+    gpm_button                  = GTK_WIDGET (gtk_builder_get_object (builder, "power_management_button"));
     fullscreen_preview_window   = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_window"));
     fullscreen_preview_area     = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_area"));
     fullscreen_preview_close    = GTK_WIDGET (gtk_builder_get_object (builder, "fullscreen_preview_close"));
diff --git a/src/xfce4-screensaver-preferences.ui b/src/xfce4-screensaver-preferences.ui
index 251dc4c..2b89110 100644
--- a/src/xfce4-screensaver-preferences.ui
+++ b/src/xfce4-screensaver-preferences.ui
@@ -32,13 +32,6 @@ Simon Steinbeiß
   <!-- interface-description screensaver preferences -->
   <!-- interface-copyright 2018 Xfce Developers -->
   <!-- interface-authors Wolfgang Ulbrich (MATE Screensaver)\nSean Davis\nSimon Steinbei\303\237 -->
-  <object class="GtkAdjustment" id="cycle_delay_adj">
-    <property name="lower">1</property>
-    <property name="upper">1440</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>
@@ -53,17 +46,17 @@ Simon Steinbeiß
       <placeholder/>
     </child>
     <child>
-      <object class="GtkBox" id="vbox10">
+      <object class="GtkBox" id="fullscreen_preview_vbox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkBox" id="hbox9">
+          <object class="GtkBox" id="fullscreen_preview_hbox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkImage" id="image2">
+              <object class="GtkImage" id="fullscreen_preview_image">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="margin_left">5</property>
@@ -77,7 +70,7 @@ Simon Steinbeiß
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label15">
+              <object class="GtkLabel" id="fullscreen_preview_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
@@ -120,7 +113,7 @@ Simon Steinbeiß
               </packing>
             </child>
             <child>
-              <object class="GtkBox">
+              <object class="GtkBox" id="fullscreen_preview_nav_buttons">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
@@ -197,29 +190,36 @@ Simon Steinbeiß
       </object>
     </child>
   </object>
-  <object class="GtkAdjustment" id="idle_delay_adj">
-    <property name="lower">1</property>
+  <object class="GtkAdjustment" id="prefs_dialog_adj_lock_saver_activation_delay">
     <property name="upper">1440</property>
-    <property name="value">5</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" id="lock_delay_adj">
+  <object class="GtkAdjustment" id="prefs_dialog_adj_logout_delay">
     <property name="upper">1440</property>
+    <property name="value">120</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" id="logout_delay_adj">
+  <object class="GtkAdjustment" id="prefs_dialog_adj_saver_idle_activation_delay">
+    <property name="lower">1</property>
     <property name="upper">1440</property>
-    <property name="value">120</property>
+    <property name="value">5</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkImage" id="power_image">
+  <object class="GtkAdjustment" id="prefs_dialog_adj_saver_themes_cycle_delay">
+    <property name="lower">1</property>
+    <property name="upper">1440</property>
+    <property name="value">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkImage" id="prefs_dialog_image_power_management">
     <property name="can_focus">False</property>
     <property name="stock">gtk-jump-to</property>
   </object>
-  <object class="GtkImage" id="preview_image">
+  <object class="GtkImage" id="prefs_dialog_image_preview">
     <property name="can_focus">False</property>
     <property name="stock">gtk-fullscreen</property>
   </object>
@@ -244,7 +244,7 @@ Simon Steinbeiß
             <property name="hexpand">True</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="helpbutton1">
+              <object class="GtkButton" id="help_button">
                 <property name="label">gtk-help</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -260,13 +260,13 @@ Simon Steinbeiß
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="gpm_button">
+              <object class="GtkButton" id="power_management_button">
                 <property name="label" translatable="yes">Power _Management</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="image">power_image</property>
+                <property name="image">prefs_dialog_image_power_management</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -284,7 +284,7 @@ Simon Steinbeiß
                 <property name="receives_default">True</property>
                 <property name="halign">end</property>
                 <property name="valign">center</property>
-                <property name="image">preview_image</property>
+                <property name="image">prefs_dialog_image_preview</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -293,7 +293,7 @@ Simon Steinbeiß
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button1">
+              <object class="GtkButton" id="close_button">
                 <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -523,18 +523,18 @@ Simon Steinbeiß
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <child>
-                  <object class="GtkBox">
+                  <object class="GtkBox" id="saver_page">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="border_width">12</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">12</property>
                     <child>
-                      <object class="GtkBox">
+                      <object class="GtkBox" id="saver_enable_box">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkLabel">
+                          <object class="GtkLabel" id="saver_enable_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Enable Screensaver</property>
@@ -550,7 +550,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSwitch" id="enable_screensaver">
+                          <object class="GtkSwitch" id="saver_enable">
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
@@ -589,6 +589,39 @@ Simon Steinbeiß
                             <property name="row_spacing">6</property>
                             <property name="column_spacing">12</property>
                             <child>
+                              <object class="GtkLabel" id="saver_themes_theme_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Theme</property>
+                                <property name="xalign">0</property>
+                                <property name="yalign">1</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="saver_themes_preview_label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Preview</property>
+                                <property name="xalign">0</property>
+                                <property name="yalign">1</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">0</property>
+                                <property name="width">2</property>
+                              </packing>
+                            </child>
+                            <child>
                               <object class="GtkScrolledWindow" id="saver_themes_scrolled_window">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -627,39 +660,6 @@ Simon Steinbeiß
                                 <property name="width">2</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkLabel" id="saver_themes_theme_label">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Theme</property>
-                                <property name="xalign">0</property>
-                                <property name="yalign">1</property>
-                                <attributes>
-                                  <attribute name="weight" value="bold"/>
-                                </attributes>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="saver_themes_preview_label">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Preview</property>
-                                <property name="xalign">0</property>
-                                <property name="yalign">1</property>
-                                <attributes>
-                                  <attribute name="weight" value="bold"/>
-                                </attributes>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">2</property>
-                              </packing>
-                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -681,6 +681,31 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
+                          <object class="GtkSpinButton" id="saver_themes_cycle_delay">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="adjustment">prefs_dialog_adj_saver_themes_cycle_delay</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="saver_themes_cycle_delay_label_right">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">minutes</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                            </attributes>
+                          </object>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
                           <object class="GtkLabel" id="saver_idle_activation_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -726,21 +751,10 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSpinButton" id="saver_themes_cycle_delay">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="adjustment">cycle_delay_adj</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
                           <object class="GtkSpinButton" id="saver_idle_activation_delay">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="adjustment">idle_delay_adj</property>
+                            <property name="adjustment">prefs_dialog_adj_saver_idle_activation_delay</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -748,20 +762,6 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="saver_themes_cycle_delay_label_right">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">minutes</property>
-                            <attributes>
-                              <attribute name="style" value="italic"/>
-                            </attributes>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
                           <object class="GtkLabel" id="saver_idle_activation_delay_label_right">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -785,7 +785,7 @@ Simon Steinbeiß
                   </object>
                 </child>
                 <child type="tab">
-                  <object class="GtkLabel">
+                  <object class="GtkLabel" id="saver_page_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Screensaver</property>
@@ -795,18 +795,18 @@ Simon Steinbeiß
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkBox">
+                  <object class="GtkBox" id="lock_page">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="border_width">12</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">12</property>
                     <child>
-                      <object class="GtkBox">
+                      <object class="GtkBox" id="lock_enable_box">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkLabel">
+                          <object class="GtkLabel" id="lock_enable_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Enable Lock Screen</property>
@@ -821,7 +821,7 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSwitch" id="enable_screenlocker">
+                          <object class="GtkSwitch" id="lock_enable">
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
@@ -850,12 +850,11 @@ Simon Steinbeiß
                         <property name="row_spacing">6</property>
                         <property name="column_spacing">6</property>
                         <child>
-                          <object class="GtkLabel" id="lock_status_messages_label">
+                          <object class="GtkLabel" id="lock_saver_activation_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_top">12</property>
-                            <property name="hexpand">True</property>
-                            <property name="label" translatable="yes">Session Status Messages</property>
+                            <property name="label" translatable="yes">Lock Screen with Screensaver</property>
                             <property name="xalign">0</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
@@ -863,32 +862,67 @@ Simon Steinbeiß
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">4</property>
+                            <property name="top_attach">0</property>
+                            <property name="width">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="lock_user_switching_label">
+                          <object class="GtkSwitch" id="lock_saver_activation_enabled">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="halign">end</property>
+                            <property name="valign">center</property>
                             <property name="margin_top">12</property>
-                            <property name="label" translatable="yes">User Switching</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="lock_saver_activation_delay_label_left">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_left">12</property>
+                            <property name="label" translatable="yes">Lock the screen after the screensaver is active for:</property>
                             <property name="xalign">0</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSpinButton" id="lock_saver_activation_delay">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="adjustment">prefs_dialog_adj_lock_saver_activation_delay</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="lock_saver_activation_delay_label_right">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">minutes</property>
                             <attributes>
-                              <attribute name="weight" value="bold"/>
+                              <attribute name="style" value="italic"/>
                             </attributes>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">8</property>
-                            <property name="width">2</property>
+                            <property name="left_attach">2</property>
+                            <property name="top_attach">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="lock_logout_label">
+                          <object class="GtkLabel" id="lock_embedded_keyboard_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_top">12</property>
-                            <property name="label" translatable="yes">Logout</property>
+                            <property name="label" translatable="yes">On Screen Keyboard</property>
                             <property name="xalign">0</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
@@ -896,60 +930,62 @@ Simon Steinbeiß
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">5</property>
+                            <property name="top_attach">2</property>
                             <property name="width">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="lock_logout_command_label">
+                          <object class="GtkSwitch" id="lock_embedded_keyboard_enabled">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_left">12</property>
-                            <property name="label" translatable="yes">Logout command:</property>
-                            <property name="xalign">0</property>
+                            <property name="can_focus">True</property>
+                            <property name="halign">end</property>
+                            <property name="valign">center</property>
+                            <property name="margin_top">12</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">6</property>
+                            <property name="left_attach">2</property>
+                            <property name="top_attach">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="lock_logout_delay_label_left">
+                          <object class="GtkLabel" id="lock_embedded_keyboard_command_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">12</property>
-                            <property name="label" translatable="yes">Enable logout after:</property>
+                            <property name="label" translatable="yes">On screen keyboard command:</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">7</property>
+                            <property name="top_attach">3</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSwitch" id="lock_user_switching_enabled">
+                          <object class="GtkEntry" id="lock_embedded_keyboard_command">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="halign">end</property>
-                            <property name="valign">center</property>
-                            <property name="margin_top">12</property>
                           </object>
                           <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">8</property>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">3</property>
+                            <property name="width">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSwitch" id="lock_logout_enabled">
+                          <object class="GtkLabel" id="lock_status_messages_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="halign">end</property>
-                            <property name="valign">center</property>
+                            <property name="can_focus">False</property>
                             <property name="margin_top">12</property>
+                            <property name="hexpand">True</property>
+                            <property name="label" translatable="yes">Session Status Messages</property>
+                            <property name="xalign">0</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
                           <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">5</property>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">4</property>
                           </packing>
                         </child>
                         <child>
@@ -967,115 +1003,103 @@ Simon Steinbeiß
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkEntry" id="lock_logout_command">
+                          <object class="GtkLabel" id="lock_logout_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_top">12</property>
+                            <property name="label" translatable="yes">Logout</property>
+                            <property name="xalign">0</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">6</property>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">5</property>
                             <property name="width">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSpinButton" id="lock_logout_delay">
+                          <object class="GtkSwitch" id="lock_logout_enabled">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="adjustment">logout_delay_adj</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">7</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="lock_logout_delay_label_right">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">minutes</property>
-                            <attributes>
-                              <attribute name="style" value="italic"/>
-                            </attributes>
+                            <property name="halign">end</property>
+                            <property name="valign">center</property>
+                            <property name="margin_top">12</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
-                            <property name="top_attach">7</property>
+                            <property name="top_attach">5</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="lock_saver_activation_delay_label_right">
+                          <object class="GtkLabel" id="lock_logout_command_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">minutes</property>
-                            <attributes>
-                              <attribute name="style" value="italic"/>
-                            </attributes>
+                            <property name="margin_left">12</property>
+                            <property name="label" translatable="yes">Logout command:</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">1</property>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">6</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSpinButton" id="lock_saver_activation_delay">
+                          <object class="GtkEntry" id="lock_logout_command">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="adjustment">lock_delay_adj</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
+                            <property name="top_attach">6</property>
+                            <property name="width">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="lock_saver_activation_delay_label_left">
+                          <object class="GtkLabel" id="lock_logout_delay_label_left">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">12</property>
-                            <property name="label" translatable="yes">Lock the screen after the screensaver is active for:</property>
+                            <property name="label" translatable="yes">Enable logout after:</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
+                            <property name="top_attach">7</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSwitch" id="lock_saver_activation_enabled">
+                          <object class="GtkSpinButton" id="lock_logout_delay">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="halign">end</property>
-                            <property name="valign">center</property>
-                            <property name="margin_top">12</property>
+                            <property name="adjustment">prefs_dialog_adj_logout_delay</property>
                           </object>
                           <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">0</property>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">7</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="lock_saver_activation_label">
+                          <object class="GtkLabel" id="lock_logout_delay_label_right">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_top">12</property>
-                            <property name="label" translatable="yes">Lock Screen with Screensaver</property>
-                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">minutes</property>
                             <attributes>
-                              <attribute name="weight" value="bold"/>
+                              <attribute name="style" value="italic"/>
                             </attributes>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                            <property name="width">2</property>
+                            <property name="left_attach">2</property>
+                            <property name="top_attach">7</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="lock_embedded_keyboard_label">
+                          <object class="GtkLabel" id="lock_user_switching_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_top">12</property>
-                            <property name="label" translatable="yes">On Screen Keyboard</property>
+                            <property name="label" translatable="yes">User Switching</property>
                             <property name="xalign">0</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
@@ -1083,12 +1107,12 @@ Simon Steinbeiß
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">2</property>
+                            <property name="top_attach">8</property>
                             <property name="width">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSwitch" id="lock_embedded_keyboard_enabled">
+                          <object class="GtkSwitch" id="lock_user_switching_enabled">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="halign">end</property>
@@ -1097,31 +1121,7 @@ Simon Steinbeiß
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
-                            <property name="top_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="lock_embedded_keyboard_command_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_left">12</property>
-                            <property name="label" translatable="yes">On screen keyboard command:</property>
-                            <property name="xalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="lock_embedded_keyboard_command">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">3</property>
-                            <property name="width">2</property>
+                            <property name="top_attach">8</property>
                           </packing>
                         </child>
                       </object>
@@ -1137,7 +1137,7 @@ Simon Steinbeiß
                   </packing>
                 </child>
                 <child type="tab">
-                  <object class="GtkLabel">
+                  <object class="GtkLabel" id="lock_page_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Lock Screen</property>
@@ -1170,9 +1170,9 @@ Simon Steinbeiß
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-11">helpbutton1</action-widget>
-      <action-widget response="-2">gpm_button</action-widget>
-      <action-widget response="-7">button1</action-widget>
+      <action-widget response="-11">help_button</action-widget>
+      <action-widget response="-2">power_management_button</action-widget>
+      <action-widget response="-7">close_button</action-widget>
     </action-widgets>
   </object>
 </interface>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list