commit 5e858826c5740a5b0e9dd818ef417a9d0765d316
Author: Ian Douglas Scott <idscott system76 com>
Date: Fri Mar 12 11:50:33 2021 -0800
user-accounts: Use HdyClamp
panels/user-accounts/cc-user-panel.ui | 504 +++++++++++++++++-----------------
1 file changed, 255 insertions(+), 249 deletions(-)
---
diff --git a/panels/user-accounts/cc-user-panel.ui b/panels/user-accounts/cc-user-panel.ui
index dc91f23e4..68549f495 100644
--- a/panels/user-accounts/cc-user-panel.ui
+++ b/panels/user-accounts/cc-user-panel.ui
@@ -117,347 +117,353 @@
<property name="hscrollbar-policy">GTK_POLICY_NEVER</property>
<child>
- <object class="GtkBox">
+ <object class="HdyClamp">
<property name="visible">True</property>
- <property name="halign">GTK_ALIGN_CENTER</property>
- <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
- <property name="spacing">20</property>
<property name="margin-top">30</property>
<property name="margin-bottom">30</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
- <property name="valign">GTK_ALIGN_CENTER</property>
- <property name="spacing">10</property>
- <property name="margin-top">10</property>
- <property name="margin-bottom">10</property>
+ <property name="halign">GTK_ALIGN_CENTER</property>
+ <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+ <property name="spacing">20</property>
+
<child>
- <object class="GtkStack" id="user_icon_stack">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="halign">GTK_ALIGN_END</property>
- <style>
- <class name="user-icon-button"/>
- </style>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="spacing">10</property>
+ <property name="margin-top">10</property>
+ <property name="margin-bottom">10</property>
<child>
- <object class="CcUserImage" id="user_icon_image">
+ <object class="GtkStack" id="user_icon_stack">
<property name="visible">True</property>
- <property name="icon_name">avatar-default</property>
- <property name="pixel_size">96</property>
<property name="halign">GTK_ALIGN_END</property>
<style>
<class name="user-icon-button"/>
</style>
- <child internal-child="accessible">
- <object class="AtkObject">
- <property name="accessible-name" translatable="yes">User
Icon</property>
+ <child>
+ <object class="CcUserImage" id="user_icon_image">
+ <property name="visible">True</property>
+ <property name="icon_name">avatar-default</property>
+ <property name="pixel_size">96</property>
+ <property name="halign">GTK_ALIGN_END</property>
+ <style>
+ <class name="user-icon-button"/>
+ </style>
+ <child internal-child="accessible">
+ <object class="AtkObject">
+ <property name="accessible-name" translatable="yes">User
Icon</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="user_icon_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <style>
+ <class name="user-icon-button"/>
+ </style>
+ <child internal-child="accessible">
+ <object class="AtkObject">
+ <property name="accessible-name" translatable="yes">User
Icon</property>
+ </object>
+ </child>
+ <child>
+ <object class="CcUserImage" id="user_icon_image2">
+ <property name="visible">True</property>
+ <property name="icon_name">avatar-default</property>
+ <property name="pixel_size">96</property>
+ </object>
+ </child>
</object>
</child>
</object>
</child>
+
<child>
- <object class="GtkToggleButton" id="user_icon_button">
+ <object class="GtkStack" id="full_name_stack">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <style>
- <class name="user-icon-button"/>
- </style>
- <child internal-child="accessible">
- <object class="AtkObject">
- <property name="accessible-name" translatable="yes">User
Icon</property>
+ <child>
+ <object class="GtkLabel" id="full_name_label">
+ <property name="visible">True</property>
+ <property name="halign">GTK_ALIGN_START</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ <property name="width-chars">18</property>
+ <property name="max-width-chars">30</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="scale" value="1.2"/>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
<child>
- <object class="CcUserImage" id="user_icon_image2">
+ <object class="GtkEntry" id="full_name_entry">
<property name="visible">True</property>
- <property name="icon_name">avatar-default</property>
- <property name="pixel_size">96</property>
+ <property name="max-length">255</property>
+ <property name="width-chars">18</property>
+ <property name="max-width-chars">30</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <signal name="activate" handler="full_name_entry_activate"
object="CcUserPanel" swapped="yes"/>
+ <signal name="key-press-event"
handler="full_name_entry_key_press_cb" object="CcUserPanel" swapped="yes"/>
</object>
</child>
</object>
</child>
- </object>
- </child>
-
- <child>
- <object class="GtkStack" id="full_name_stack">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="full_name_label">
- <property name="visible">True</property>
- <property name="halign">GTK_ALIGN_START</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
- <property name="width-chars">18</property>
- <property name="max-width-chars">30</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="scale" value="1.2"/>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
<child>
- <object class="GtkEntry" id="full_name_entry">
+ <object class="GtkToggleButton" id="full_name_edit_button">
<property name="visible">True</property>
- <property name="max-length">255</property>
- <property name="width-chars">18</property>
- <property name="max-width-chars">30</property>
+ <signal name="toggled" handler="full_name_edit_button_toggled"
object="CcUserPanel" swapped="yes"/>
<property name="valign">GTK_ALIGN_CENTER</property>
- <signal name="activate" handler="full_name_entry_activate"
object="CcUserPanel" swapped="yes"/>
- <signal name="key-press-event" handler="full_name_entry_key_press_cb"
object="CcUserPanel" swapped="yes"/>
+ <style>
+ <class name="circular"/>
+ </style>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="margin">5</property>
+ <property name="icon-name">document-edit-symbolic</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="pack_type">end</property>
+ </packing>
</child>
</object>
</child>
+
<child>
- <object class="GtkToggleButton" id="full_name_edit_button">
+ <object class="GtkBox" id="account_settings_box">
<property name="visible">True</property>
- <signal name="toggled" handler="full_name_edit_button_toggled"
object="CcUserPanel" swapped="yes"/>
- <property name="valign">GTK_ALIGN_CENTER</property>
- <style>
- <class name="circular"/>
- </style>
+ <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+ <property name="spacing">10</property>
<child>
- <object class="GtkImage">
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="margin">5</property>
- <property name="icon-name">document-edit-symbolic</property>
+ <property name="label" translatable="yes">Account Settings</property>
+ <property name="halign">GTK_ALIGN_START</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
- </object>
- <packing>
- <property name="pack_type">end</property>
- </packing>
- </child>
- </object>
- </child>
-
- <child>
- <object class="GtkBox" id="account_settings_box">
- <property name="visible">True</property>
- <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
- <property name="spacing">10</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Account Settings</property>
- <property name="halign">GTK_ALIGN_START</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- <child>
- <object class="GtkListBox" id="account_settings_listbox">
- <property name="visible">True</property>
- <property name="selection-mode">GTK_SELECTION_NONE</property>
- <signal name="row-activated" handler="activate_row"/>
- <style>
- <class name="frame"/>
- </style>
<child>
- <object class="HdyActionRow" id="account_type_row">
+ <object class="GtkListBox" id="account_settings_listbox">
<property name="visible">True</property>
- <property name="title" translatable="yes">_Administrator</property>
- <property name="subtitle" translatable="yes">Administrators can add and
remove other users, and can change settings for all users.</property>
- <property name="subtitle-lines">0</property>
- <property name="use_underline">True</property>
+ <property name="selection-mode">GTK_SELECTION_NONE</property>
+ <signal name="row-activated" handler="activate_row"/>
+ <style>
+ <class name="frame"/>
+ </style>
<child>
- <object class="GtkSwitch" id="account_type_switch">
+ <object class="HdyActionRow" id="account_type_row">
<property name="visible">True</property>
- <property name="valign">center</property>
- <signal name="notify::active" handler="account_type_changed"
object="CcUserPanel" swapped="yes"/>
+ <property name="title" translatable="yes">_Administrator</property>
+ <property name="subtitle" translatable="yes">Administrators can add
and remove other users, and can change settings for all users.</property>
+ <property name="subtitle-lines">0</property>
+ <property name="use_underline">True</property>
+ <child>
+ <object class="GtkSwitch" id="account_type_switch">
+ <property name="visible">True</property>
+ <property name="valign">center</property>
+ <signal name="notify::active" handler="account_type_changed"
object="CcUserPanel" swapped="yes"/>
+ </object>
+ </child>
</object>
</child>
- </object>
- </child>
- <child>
- <object class="HdyActionRow" id="parental_controls_row">
- <property name="visible">False</property>
- <property name="title" translatable="yes">_Parental Controls</property>
- <property name="subtitle" translatable="yes">Open the Parental Controls
application.</property>
- <property name="subtitle-lines">0</property>
<child>
- <object class="GtkLabel" id="parental_controls_button_label">
- <property name="visible">True</property>
- <property name="valign">0.5</property>
+ <object class="HdyActionRow" id="parental_controls_row">
+ <property name="visible">False</property>
+ <property name="title" translatable="yes">_Parental
Controls</property>
+ <property name="subtitle" translatable="yes">Open the Parental
Controls application.</property>
+ <property name="subtitle-lines">0</property>
+ <child>
+ <object class="GtkLabel" id="parental_controls_button_label">
+ <property name="visible">True</property>
+ <property name="valign">0.5</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImage" id="parental_control_go_next">
+ <property name="visible">True</property>
+ <property name="icon-name">go-next-symbolic</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ </child>
</object>
</child>
- <child>
- <object class="GtkImage" id="parental_control_go_next">
- <property name="visible">True</property>
- <property name="icon-name">go-next-symbolic</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="HdyActionRow" id="language_row">
- <property name="visible">True</property>
- <property name="title" translatable="yes">_Language</property>
- <property name="use_underline">True</property>
- <child>
- <object class="GtkLabel" id="language_button_label">
- <property name="visible">True</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- </child>
<child>
- <object class="GtkImage">
+ <object class="HdyActionRow" id="language_row">
<property name="visible">True</property>
- <property name="icon-name">go-next-symbolic</property>
- <style>
- <class name="dim-label"/>
- </style>
+ <property name="title" translatable="yes">_Language</property>
+ <property name="use_underline">True</property>
+ <child>
+ <object class="GtkLabel" id="language_button_label">
+ <property name="visible">True</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="icon-name">go-next-symbolic</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ </child>
</object>
</child>
</object>
</child>
</object>
</child>
- </object>
- </child>
- <child>
- <object class="GtkBox" id="authentication_and_login_box">
- <property name="visible">True</property>
- <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
- <property name="spacing">10</property>
- <property name="margin-top">10</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Authentication &
Login</property>
- <property name="halign">GTK_ALIGN_START</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
<child>
- <object class="GtkListBox" id="authentication_and_login_listbox">
+ <object class="GtkBox" id="authentication_and_login_box">
<property name="visible">True</property>
- <property name="selection-mode">GTK_SELECTION_NONE</property>
- <signal name="row-activated" handler="activate_row"/>
- <style>
- <class name="frame"/>
- </style>
+ <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+ <property name="spacing">10</property>
+ <property name="margin-top">10</property>
<child>
- <object class="HdyActionRow" id="password_row">
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="title" translatable="yes">_Password</property>
- <property name="use_underline">True</property>
- <child>
- <object class="GtkLabel" id="password_button_label">
- <property name="visible">True</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- </child>
- <child>
- <object class="GtkImage">
- <property name="visible">True</property>
- <property name="icon-name">go-next-symbolic</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- </child>
+ <property name="label" translatable="yes">Authentication &
Login</property>
+ <property name="halign">GTK_ALIGN_START</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
<child>
- <object class="HdyActionRow" id="fingerprint_row">
+ <object class="GtkListBox" id="authentication_and_login_listbox">
<property name="visible">True</property>
- <property name="title" translatable="yes">_Fingerprint Login</property>
- <property name="use_underline">True</property>
- <child>
- <object class="GtkLabel" id="fingerprint_state_label">
- <property name="visible">True</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- </child>
+ <property name="selection-mode">GTK_SELECTION_NONE</property>
+ <signal name="row-activated" handler="activate_row"/>
+ <style>
+ <class name="frame"/>
+ </style>
<child>
- <object class="GtkImage">
+ <object class="HdyActionRow" id="password_row">
<property name="visible">True</property>
- <property name="icon-name">go-next-symbolic</property>
- <style>
- <class name="dim-label"/>
- </style>
+ <property name="title" translatable="yes">_Password</property>
+ <property name="use_underline">True</property>
+ <child>
+ <object class="GtkLabel" id="password_button_label">
+ <property name="visible">True</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="icon-name">go-next-symbolic</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ </child>
</object>
</child>
- </object>
- </child>
- <child>
- <object class="HdyActionRow" id="autologin_row">
- <property name="visible">True</property>
- <property name="title" translatable="yes">A_utomatic Login</property>
- <property name="use_underline">True</property>
<child>
- <object class="GtkSwitch" id="autologin_switch">
+ <object class="HdyActionRow" id="fingerprint_row">
<property name="visible">True</property>
- <property name="valign">center</property>
- <signal name="notify::active" handler="autologin_changed"
object="CcUserPanel" swapped="yes"/>
+ <property name="title" translatable="yes">_Fingerprint
Login</property>
+ <property name="use_underline">True</property>
+ <child>
+ <object class="GtkLabel" id="fingerprint_state_label">
+ <property name="visible">True</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="icon-name">go-next-symbolic</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ </child>
</object>
</child>
- </object>
- </child>
- <child>
- <object class="HdyActionRow" id="last_login_row">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Account Activity</property>
- <property name="use_underline">True</property>
<child>
- <object class="GtkLabel" id="last_login_button_label">
+ <object class="HdyActionRow" id="autologin_row">
<property name="visible">True</property>
- <style>
- <class name="dim-label"/>
- </style>
+ <property name="title" translatable="yes">A_utomatic Login</property>
+ <property name="use_underline">True</property>
+ <child>
+ <object class="GtkSwitch" id="autologin_switch">
+ <property name="visible">True</property>
+ <property name="valign">center</property>
+ <signal name="notify::active" handler="autologin_changed"
object="CcUserPanel" swapped="yes"/>
+ </object>
+ </child>
</object>
</child>
<child>
- <object class="GtkImage">
+ <object class="HdyActionRow" id="last_login_row">
<property name="visible">True</property>
- <property name="icon-name">go-next-symbolic</property>
- <style>
- <class name="dim-label"/>
- </style>
+ <property name="title" translatable="yes">Account Activity</property>
+ <property name="use_underline">True</property>
+ <child>
+ <object class="GtkLabel" id="last_login_button_label">
+ <property name="visible">True</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="icon-name">go-next-symbolic</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ </child>
</object>
</child>
</object>
</child>
</object>
</child>
+ <child>
+ <object class="GtkButton" id="remove_user_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">GTK_ALIGN_END</property>
+ <property name="label" translatable="yes">Remove User…</property>
+ <property name="margin-top">10</property>
+ <property name="margin-bottom">10</property>
+ <signal name="clicked" handler="delete_user" object="CcUserPanel"
swapped="yes"/>
+ <style>
+ <class name="destructive-action"/>
+ </style>
+ </object>
+ <packing>
+ <property name="pack_type">end</property>
+ </packing>
+ </child>
</object>
</child>
- <child>
- <object class="GtkButton" id="remove_user_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">GTK_ALIGN_END</property>
- <property name="label" translatable="yes">Remove User…</property>
- <property name="margin-top">10</property>
- <property name="margin-bottom">10</property>
- <signal name="clicked" handler="delete_user" object="CcUserPanel" swapped="yes"/>
- <style>
- <class name="destructive-action"/>
- </style>
- </object>
- <packing>
- <property name="pack_type">end</property>
- </packing>
- </child>
</object>
</child>
</object>