[Xfce4-commits] [apps/xfce4-screensaver] 01/01: Fix dialog appearance with all themes that support lightdm-gtk-greeter

noreply at xfce.org noreply at xfce.org
Tue Jun 18 03:14:00 CEST 2019


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 829a751109c17c7aded58b8b557efc0aa63be7db
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Mon Jun 17 21:13:46 2019 -0400

    Fix dialog appearance with all themes that support lightdm-gtk-greeter
---
 src/gs-lock-plug.c               |  39 ++-
 src/xfce4-screensaver-dialog.css |   2 +-
 src/xfce4-screensaver-dialog.ui  | 510 +++++++++++++++++++++------------------
 3 files changed, 301 insertions(+), 250 deletions(-)

diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
index 92da99e..784e88a 100644
--- a/src/gs-lock-plug.c
+++ b/src/gs-lock-plug.c
@@ -76,7 +76,7 @@ struct GSLockPlugPrivate {
     GtkWidget   *auth_username_label;
     GtkWidget   *auth_prompt_label;
     GtkWidget   *auth_prompt_entry;
-    GtkWidget   *auth_prompt_box;
+    GtkWidget   *auth_prompt_infobar;
     GtkWidget   *auth_capslock_label;
     GtkWidget   *auth_message_label;
     GtkWidget   *status_message_label;
@@ -154,6 +154,22 @@ gs_lock_plug_style_set (GtkWidget *widget,
     gtk_box_set_spacing (GTK_BOX (plug->priv->auth_action_area), 5);
 }
 
+static void
+toggle_infobar_visibility (GSLockPlug *plug)
+{
+    gboolean visible = FALSE;
+    if (gtk_widget_get_visible (plug->priv->status_message_label)) {
+        visible = TRUE;
+    } else if (gtk_widget_get_visible (plug->priv->auth_prompt_label)) {
+        visible = TRUE;
+    } else if (gtk_widget_get_visible (plug->priv->auth_capslock_label)) {
+        visible = TRUE;
+    } else if (gtk_widget_get_visible (plug->priv->auth_message_label)) {
+        visible = TRUE;
+    }
+    gtk_widget_set_visible (plug->priv->auth_prompt_infobar, visible);
+}
+
 static gboolean
 process_is_running (const char * name) {
     int    num_processes;
@@ -253,6 +269,7 @@ set_status_text (GSLockPlug *plug,
         } else {
             gtk_widget_show (GTK_WIDGET (plug->priv->auth_message_label));
         }
+        toggle_infobar_visibility (plug);
     }
 }
 
@@ -377,6 +394,7 @@ capslock_update (GSLockPlug *plug,
     } else {
         gtk_widget_hide (GTK_WIDGET (plug->priv->auth_capslock_label));
     }
+    toggle_infobar_visibility (plug);
 }
 
 static gboolean
@@ -819,6 +837,7 @@ gs_lock_plug_set_status_message (GSLockPlug *plug,
         } else {
             gtk_widget_hide (plug->priv->status_message_label);
         }
+        toggle_infobar_visibility (plug);
     }
 }
 
@@ -1109,6 +1128,7 @@ gs_lock_plug_enable_prompt (GSLockPlug *plug,
     } else {
         gtk_widget_show (GTK_WIDGET (plug->priv->auth_prompt_label));
     }
+    toggle_infobar_visibility (plug);
 
     gtk_entry_set_visibility (GTK_ENTRY (plug->priv->auth_prompt_entry), visible);
     gtk_widget_set_sensitive (plug->priv->auth_prompt_entry, TRUE);
@@ -1577,7 +1597,7 @@ load_theme (GSLockPlug *plug) {
 
     lock_overlay = GTK_WIDGET(gtk_builder_get_object(builder, "lock-overlay"));
     lock_panel = GTK_WIDGET(gtk_builder_get_object(builder, "lock-panel"));
-    lock_dialog = GTK_WIDGET(gtk_builder_get_object(builder, "lock-dialog"));
+    lock_dialog = GTK_WIDGET(gtk_builder_get_object(builder, "login_window"));
 
     gtk_widget_set_halign(GTK_WIDGET(lock_panel), GTK_ALIGN_FILL);
     gtk_widget_set_valign(GTK_WIDGET(lock_panel), GTK_ALIGN_START);
@@ -1596,17 +1616,19 @@ load_theme (GSLockPlug *plug) {
     plug->priv->auth_datetime_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-date-time-label"));
     plug->priv->auth_realname_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-realname-label"));
     plug->priv->auth_username_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-hostname-label"));
-    plug->priv->auth_prompt_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-label"));
     plug->priv->auth_prompt_entry = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-entry"));
-    plug->priv->auth_prompt_box = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-box"));
-    plug->priv->auth_capslock_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-capslock-label"));
-    plug->priv->auth_message_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-status-label"));
     plug->priv->auth_unlock_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-unlock-button"));
     plug->priv->auth_cancel_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-cancel-button"));
     plug->priv->auth_logout_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-logout-button"));
     plug->priv->auth_switch_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-switch-button"));
     plug->priv->background_image = GTK_WIDGET (gtk_builder_get_object(builder, "lock-image"));
 
+    plug->priv->auth_prompt_infobar = GTK_WIDGET (gtk_builder_get_object(builder, "greeter_infobar"));
+    plug->priv->status_message_label = GTK_WIDGET (gtk_builder_get_object(builder, "status-message-label"));
+    plug->priv->auth_prompt_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-label"));
+    plug->priv->auth_capslock_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-capslock-label"));
+    plug->priv->auth_message_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-status-label"));
+
     /* Placeholder for the keyboard indicator */
     plug->priv->auth_prompt_kbd_layout_indicator = GTK_WIDGET (
             gtk_builder_get_object(builder, "auth-prompt-kbd-layout-indicator"));
@@ -1622,8 +1644,6 @@ load_theme (GSLockPlug *plug) {
     date_time_update (plug);
     gtk_widget_show_all (lock_dialog);
 
-    plug->priv->status_message_label = GTK_WIDGET (gtk_builder_get_object(builder, "status-message-label"));
-
     return TRUE;
 }
 
@@ -1647,7 +1667,7 @@ gs_lock_plug_init (GSLockPlug *plug) {
     GtkStyleContext *context;
 
     context = gtk_widget_get_style_context (GTK_WIDGET (plug));
-    gtk_style_context_add_class (context, "lock-dialog");
+    gtk_style_context_add_class (context, "login_window");
 
     if (!load_theme (plug)) {
         gs_debug ("Unable to load theme!");
@@ -1740,6 +1760,7 @@ gs_lock_plug_init (GSLockPlug *plug) {
         } else {
             gtk_widget_hide (plug->priv->status_message_label);
         }
+        toggle_infobar_visibility (plug);
     }
 
     if (plug->priv->auth_switch_button != NULL) {
diff --git a/src/xfce4-screensaver-dialog.css b/src/xfce4-screensaver-dialog.css
index 926ae33..9c55467 100644
--- a/src/xfce4-screensaver-dialog.css
+++ b/src/xfce4-screensaver-dialog.css
@@ -1,2 +1,2 @@
 /* Workaround for Adwaita - and other themes - setting a smaller font for the keycap window */
-#lock_dialog.keycap { font-size: initial; }
+#login_window.keycap { font-size: initial; }
diff --git a/src/xfce4-screensaver-dialog.ui b/src/xfce4-screensaver-dialog.ui
index e3b0ea9..29e25fa 100644
--- a/src/xfce4-screensaver-dialog.ui
+++ b/src/xfce4-screensaver-dialog.ui
@@ -2,36 +2,118 @@
 <!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
-  <object class="GtkEventBox" id="lock-dialog">
-    <property name="name">lock_dialog</property>
+  <object class="GtkOverlay" id="lock-overlay">
+    <property name="name">screen</property>
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkImage" id="lock-image">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="stock">gtk-missing-image</property>
+      </object>
+      <packing>
+        <property name="index">-1</property>
+      </packing>
+    </child>
+    <style>
+      <class name="lightdm-gtk-greeter"/>
+    </style>
+  </object>
+  <object class="GtkBox" id="lock-panel">
+    <property name="name">panel_window</property>
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="spacing">6</property>
+    <child>
+      <object class="GtkLabel" id="auth-hostname-label">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_left">6</property>
+        <property name="label" translatable="yes"><b>%h</b></property>
+        <property name="use_markup">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child type="center">
+      <object class="GtkLabel" id="auth-date-time-label">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_right">6</property>
+        <property name="label" translatable="yes"><b>%s</b></property>
+        <property name="use_markup">True</property>
+        <property name="xalign">0.5</property>
+      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">4</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkImage">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_right">6</property>
+        <property name="margin_top">6</property>
+        <property name="margin_bottom">6</property>
+        <property name="pixel_size">16</property>
+        <property name="icon_name">system-lock-screen-symbolic</property>
+        <property name="icon_size">1</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="pack_type">end</property>
+        <property name="position">3</property>
+      </packing>
+    </child>
+    <style>
+      <class name="background"/>
+      <class name="panel"/>
+      <class name="xfce4-panel"/>
+    </style>
+  </object>
+  <object class="GtkEventBox" id="login_window">
+    <property name="name">login_window</property>
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkBox">
+      <object class="GtkBox" id="login_box">
+        <property name="name">login_box</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkBox" id="vbox2">
-            <property name="name">login_window</property>
+          <object class="GtkFrame" id="content_frame">
+            <property name="name">content_frame</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
             <child>
-              <object class="GtkBox" id="content-area">
+              <object class="GtkGrid">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">18</property>
-                <property name="margin_right">18</property>
-                <property name="margin_top">18</property>
-                <property name="orientation">vertical</property>
+                <property name="margin_left">24</property>
+                <property name="margin_right">24</property>
+                <property name="margin_top">24</property>
+                <property name="row_spacing">6</property>
+                <property name="row_homogeneous">True</property>
                 <child>
-                  <object class="GtkBox" id="user-box">
-                    <property name="name">content_frame</property>
+                  <object class="GtkFrame" id="user_image_border">
+                    <property name="name">user_image_border</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="spacing">12</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="margin_right">18</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkImage" id="auth-face-image">
                         <property name="name">user_image</property>
@@ -39,11 +121,55 @@
                         <property name="height_request">80</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="valign">center</property>
                         <property name="pixel_size">80</property>
                         <property name="icon_name">avatar-default</property>
-                        <property name="icon_size">6</property>
+                      </object>
+                    </child>
+                    <child type="label_item">
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                    <property name="height">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="auth-realname-label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="tooltip_text" translatable="yes">%U</property>
+                    <property name="valign">end</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="label"><span size="x-large">%R</span></property>
+                    <property name="use_markup">True</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="valign">start</property>
+                    <child>
+                      <object class="GtkEntry" id="auth-prompt-entry">
+                        <property name="name">prompt_entry</property>
+                        <property name="width_request">-1</property>
+                        <property name="can_focus">True</property>
+                        <property name="valign">center</property>
+                        <property name="hexpand">True</property>
+                        <property name="visibility">False</property>
+                        <property name="activates_default">True</property>
+                        <property name="primary_icon_activatable">False</property>
+                        <property name="secondary_icon_activatable">False</property>
+                        <property name="placeholder_text" translatable="yes">Enter your password</property>
+                        <property name="input_purpose">password</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -52,83 +178,63 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkBox">
+                      <object class="GtkBox" id="auth-prompt-kbd-layout-indicator">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="halign">end</property>
                         <property name="valign">center</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">6</property>
                         <child>
-                          <object class="GtkLabel" id="auth-realname-label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">%U</property>
-                            <property name="label"><span size="x-large">%R</span></property>
-                            <property name="use_markup">True</property>
-                            <property name="xalign">0</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="hbox1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkEntry" id="auth-prompt-entry">
-                                <property name="can_focus">True</property>
-                                <property name="visibility">False</property>
-                                <property name="activates_default">True</property>
-                                <property name="primary_icon_activatable">False</property>
-                                <property name="secondary_icon_activatable">False</property>
-                                <property name="placeholder_text" translatable="yes">Enter your password</property>
-                                <property name="input_purpose">password</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="auth-prompt-kbd-layout-indicator">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
+                          <placeholder/>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
+                        <property name="expand">False</property>
                         <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
                   </packing>
                 </child>
+              </object>
+            </child>
+            <child type="label_item">
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkInfoBar" id="greeter_infobar">
+            <property name="name">greeter_infobar</property>
+            <property name="can_focus">False</property>
+            <property name="no_show_all">True</property>
+            <child internal-child="action_area">
+              <object class="GtkButtonBox" id="infobar-action_area">
+                <property name="can_focus">False</property>
+                <property name="spacing">6</property>
+                <property name="layout_style">end</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child internal-child="content_area">
+              <object class="GtkBox" id="infobar-content_area">
+                <property name="can_focus">False</property>
+                <property name="spacing">16</property>
                 <child>
                   <object class="GtkBox" id="auth-prompt-box">
                     <property name="visible">True</property>
@@ -186,114 +292,114 @@
                   <packing>
                     <property name="expand">True</property>
                     <property name="fill">True</property>
-                    <property name="position">2</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkFrame" id="buttonbox_frame">
+            <property name="name">buttonbox_frame</property>
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
             <child>
-              <object class="GtkBox" id="action-buttons">
-                <property name="name">buttonbox_frame</property>
+              <object class="GtkBox" id="auth-action-area">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
+                <property name="halign">end</property>
+                <property name="margin_left">24</property>
+                <property name="margin_right">24</property>
+                <property name="margin_bottom">24</property>
+                <property name="spacing">6</property>
+                <property name="homogeneous">True</property>
                 <child>
-                  <object class="GtkButtonBox" id="auth-action-area">
+                  <object class="GtkButton" id="auth-switch-button">
+                    <property name="label" translatable="yes">_Switch User</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="margin_right">12</property>
-                    <property name="margin_bottom">12</property>
-                    <property name="spacing">6</property>
-                    <property name="layout_style">end</property>
-                    <child>
-                      <object class="GtkButton" id="auth-switch-button">
-                        <property name="label" translatable="yes">_Switch User</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="focus_on_click">False</property>
-                        <property name="can_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>
-                    <child>
-                      <object class="GtkButton" id="auth-logout-button">
-                        <property name="label" translatable="yes">_Log Out</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="focus_on_click">False</property>
-                        <property name="can_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">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="auth-cancel-button">
-                        <property name="label" translatable="yes">_Cancel</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="focus_on_click">False</property>
-                        <property name="can_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">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="auth-unlock-button">
-                        <property name="label" translatable="yes">_Unlock</property>
-                        <property name="name">login_button</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_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
+                    <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
+                    <property name="can_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>
+                <child>
+                  <object class="GtkButton" id="auth-logout-button">
+                    <property name="label" translatable="yes">_Log Out</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
+                    <property name="can_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">True</property>
-                    <property name="position">0</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="auth-cancel-button">
+                    <property name="label" translatable="yes">_Cancel</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="focus_on_click">False</property>
+                    <property name="can_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">True</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="auth-unlock-button">
+                    <property name="label" translatable="yes">_Unlock</property>
+                    <property name="name">login_button</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_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">4</property>
                   </packing>
                 </child>
               </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">6</property>
-              </packing>
+            </child>
+            <child type="label_item">
+              <placeholder/>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">0</property>
+            <property name="position">2</property>
           </packing>
         </child>
       </object>
@@ -303,80 +409,4 @@
       <class name="keycap"/>
     </style>
   </object>
-  <object class="GtkOverlay" id="lock-overlay">
-    <property name="name">screen</property>
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkImage" id="lock-image">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="stock">gtk-missing-image</property>
-      </object>
-      <packing>
-        <property name="index">-1</property>
-      </packing>
-    </child>
-    <style>
-      <class name="lightdm-gtk-greeter"/>
-    </style>
-  </object>
-  <object class="GtkBox" id="lock-panel">
-    <property name="name">panel_window</property>
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkLabel" id="auth-hostname-label">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
-        <property name="label" translatable="yes"><b>%h</b></property>
-        <property name="use_markup">True</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child type="center">
-      <object class="GtkLabel" id="auth-date-time-label">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="label" translatable="yes"><b>%s</b></property>
-        <property name="use_markup">True</property>
-        <property name="xalign">0.5</property>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">4</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkImage">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
-        <property name="margin_top">6</property>
-        <property name="margin_bottom">6</property>
-        <property name="pixel_size">16</property>
-        <property name="icon_name">system-lock-screen-symbolic</property>
-        <property name="icon_size">1</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="pack_type">end</property>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <style>
-      <class name="background"/>
-      <class name="panel"/>
-      <class name="xfce4-panel"/>
-    </style>
-  </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