From 20059cce5830f2e0ccc597738c6840c8aeda645e Mon Sep 17 00:00:00 2001 From: Danielle Fore Date: Fri, 5 Jan 2024 13:45:37 -0800 Subject: [PATCH 1/6] Some redesign ideas --- src/Views/UserSettingsView.vala | 153 +++++++++++++++++++------------- 1 file changed, 89 insertions(+), 64 deletions(-) diff --git a/src/Views/UserSettingsView.vala b/src/Views/UserSettingsView.vala index 0ecef3e0..a5c0e5d0 100644 --- a/src/Views/UserSettingsView.vala +++ b/src/Views/UserSettingsView.vala @@ -18,7 +18,7 @@ */ namespace SwitchboardPlugUserAccounts.Widgets { - public class UserSettingsView : Gtk.Grid { + public class UserSettingsView : Gtk.Box { public weak Act.User user { get; construct; } private UserUtils utils; @@ -38,12 +38,10 @@ namespace SwitchboardPlugUserAccounts.Widgets { private Gtk.Switch autologin_switch; //lock widgets - private Gtk.Image full_name_lock; private Gtk.Image user_type_lock; private Gtk.Image language_lock; private Gtk.Image autologin_lock; private Gtk.Image password_lock; - private Gtk.Image enable_lock; private Gee.HashMap? default_regions; @@ -57,45 +55,65 @@ namespace SwitchboardPlugUserAccounts.Widgets { Object (user: user); } + class construct { + set_css_name ("simplesettingspage"); + } + construct { utils = new UserUtils (user, this); delta_user = new DeltaUser (user); default_regions = get_default_regions (); - avatar = new Adw.Avatar (64, user.real_name, true); + avatar = new Adw.Avatar (48, user.real_name, true) { + margin_top = 6, + margin_end = 6, + margin_bottom = 6 + }; var avatar_popover = new AvatarPopover (user, utils); avatar_popover.add_css_class (Granite.STYLE_CLASS_MENU); var avatar_button = new Gtk.MenuButton () { - child = avatar, halign = END, - has_frame = false, + valign = END, + icon_name = "edit-symbolic", popover = avatar_popover }; + avatar_button.get_first_child ().add_css_class (Granite.STYLE_CLASS_CIRCULAR); + + var avatar_overlay = new Gtk.Overlay () { + child = avatar + }; + avatar_overlay.add_overlay (avatar_button); full_name_entry = new Gtk.Entry () { valign = Gtk.Align.CENTER }; - full_name_entry.get_style_context ().add_class (Granite.STYLE_CLASS_H3_LABEL); + full_name_entry.add_css_class (Granite.STYLE_CLASS_H2_LABEL); full_name_entry.activate.connect (() => { utils.change_full_name (full_name_entry.get_text ().strip ()); }); - var user_type_label = new Gtk.Label (_("Account type:")) { - halign = Gtk.Align.END + user_type_box = new Gtk.ComboBoxText () { + hexpand = true }; - - user_type_box = new Gtk.ComboBoxText (); user_type_box.append_text (_("Standard")); user_type_box.append_text (_("Administrator")); user_type_box.changed.connect (() => { utils.change_user_type (user_type_box.active); }); - var lang_label = new Gtk.Label (_("Language:")) { - halign = Gtk.Align.END + var user_type_label = new Granite.HeaderLabel (_("Account Type")) { + mnemonic_widget = user_type_box + }; + + var lang_label = new Granite.HeaderLabel (_("Language")); + + var grid = new Gtk.Grid () { + column_spacing = 6, + row_spacing = 6, + vexpand = true }; if (user != get_current_user ()) { @@ -121,8 +139,8 @@ namespace SwitchboardPlugUserAccounts.Widgets { reveal_child = true }; - attach (language_box, 1, 2); - attach (region_revealer, 1, 3); + grid.attach (language_box, 0, 3, 2); + grid.attach (region_revealer, 0, 4, 2); language_box.changed.connect (() => { Gtk.TreeIter? iter; @@ -165,7 +183,7 @@ namespace SwitchboardPlugUserAccounts.Widgets { tooltip_text = _("Click to switch to Language & Locale Settings") }; - attach (language_button, 1, 2); + grid.attach (language_button, 0, 3, 2); } var login_label = new Gtk.Label (_("Log In automatically:")) { @@ -179,7 +197,9 @@ namespace SwitchboardPlugUserAccounts.Widgets { }; autologin_switch.notify["active"].connect (() => utils.change_autologin (autologin_switch.active)); - password_button = new Gtk.Button.with_label (_("Change Password…")); + password_button = new Gtk.Button.with_label (_("Change Password…")) { + halign = END + }; password_button.clicked.connect (() => { var permission = get_permission (); if (user == get_current_user () && permission.allowed) { @@ -203,86 +223,89 @@ namespace SwitchboardPlugUserAccounts.Widgets { var remove_user_button = new Gtk.Button.with_label (_("Remove User Account")) { sensitive = false }; - remove_user_button.get_style_context ().add_class (Granite.STYLE_CLASS_DESTRUCTIVE_ACTION); + remove_user_button.add_css_class (Granite.STYLE_CLASS_DESTRUCTIVE_ACTION); remove_user_button.clicked.connect (() => remove_user ()); - full_name_lock = new Gtk.Image.from_icon_name ("changes-prevent-symbolic") { - tooltip_text = NO_PERMISSION_STRING - }; - full_name_lock.get_style_context ().add_class (Granite.STYLE_CLASS_DIM_LABEL); - user_type_lock = new Gtk.Image.from_icon_name ("changes-prevent-symbolic") { tooltip_text = NO_PERMISSION_STRING }; - user_type_lock.get_style_context ().add_class (Granite.STYLE_CLASS_DIM_LABEL); + user_type_lock.add_css_class (Granite.STYLE_CLASS_DIM_LABEL); language_lock = new Gtk.Image.from_icon_name ("changes-prevent-symbolic") { tooltip_text = NO_PERMISSION_STRING }; - language_lock.get_style_context ().add_class (Granite.STYLE_CLASS_DIM_LABEL); + language_lock.add_css_class (Granite.STYLE_CLASS_DIM_LABEL); autologin_lock = new Gtk.Image.from_icon_name ("changes-prevent-symbolic") { margin_top = 20, tooltip_text = NO_PERMISSION_STRING }; - autologin_lock.get_style_context ().add_class (Granite.STYLE_CLASS_DIM_LABEL); + autologin_lock.add_css_class (Granite.STYLE_CLASS_DIM_LABEL); password_lock = new Gtk.Image.from_icon_name ("changes-prevent-symbolic") { + margin_end = 6, tooltip_text = NO_PERMISSION_STRING }; - password_lock.get_style_context ().add_class (Granite.STYLE_CLASS_DIM_LABEL); - - enable_lock = new Gtk.Image.from_icon_name ("changes-prevent-symbolic"); - enable_lock.get_style_context ().add_class (Granite.STYLE_CLASS_DIM_LABEL); + password_lock.add_css_class (Granite.STYLE_CLASS_DIM_LABEL); var remove_lock = new Gtk.Image.from_icon_name ("changes-prevent-symbolic") { + margin_start = 6, tooltip_text = NO_PERMISSION_STRING }; - remove_lock.get_style_context ().add_class (Granite.STYLE_CLASS_DIM_LABEL); - - - column_spacing = 12; - row_spacing = 6; - halign = CENTER; - margin_top = 24; - margin_end = 24; - margin_bottom = 24; - margin_start = 24; - attach (avatar_button, 0, 0); - attach (full_name_entry, 1, 0); - attach (user_type_label, 0, 1); - attach (user_type_box, 1, 1); - attach (lang_label, 0, 2); - attach (login_label, 0, 4); - attach (autologin_switch, 1, 4); - attach (password_button, 1, 5); - attach (enable_user_button, 1, 6); - attach (remove_user_button, 1, 7); - attach (full_name_lock, 2, 0); - attach (user_type_lock, 2, 1); - attach (language_lock, 2, 2, 1, 2); - attach (autologin_lock, 2, 4); - attach (password_lock, 2, 5); - attach (enable_lock, 2, 6); - attach (remove_lock, 2, 7); + remove_lock.add_css_class (Granite.STYLE_CLASS_DIM_LABEL); + + var header_grid = new Gtk.Grid () { + column_spacing = 12, + halign = START + }; + header_grid.add_css_class ("header-area"); + header_grid.attach (avatar_overlay, 0, 0); + header_grid.attach (full_name_entry, 1, 0); + + var autologin_box = new Gtk.Box (HORIZONTAL, 6); + autologin_box.append (login_label); + autologin_box.append (autologin_switch); + autologin_box.append (autologin_lock); + + grid.attach (user_type_label, 0, 0); + grid.attach (user_type_lock, 1, 0); + grid.attach (user_type_box, 0, 1, 2); + grid.attach (lang_label, 0, 2); + grid.attach (language_lock, 1, 2); + grid.attach (autologin_box, 0, 5, 2); + grid.add_css_class ("content-area"); + + var action_area = new Gtk.Box (HORIZONTAL, 0); + action_area.append (remove_user_button); + action_area.append (enable_user_button); + action_area.append (remove_lock); + action_area.append (new Gtk.Grid () { hexpand = true }); + action_area.append (password_lock); + action_area.append (password_button); + action_area.add_css_class ("buttonbox"); + + margin_top = 6; + margin_end = 12; + margin_bottom = 12; + margin_start = 12; + orientation = VERTICAL; + append (header_grid); + append (grid); + append (action_area); update_ui (); update_permission (); if (get_current_user () == user) { - enable_lock.tooltip_text = CURRENT_USER_STRING; user_type_lock.tooltip_text = CURRENT_USER_STRING; remove_lock.tooltip_text = CURRENT_USER_STRING; } else if (is_last_admin (user)) { - enable_lock.tooltip_text = LAST_ADMIN_STRING; user_type_lock.tooltip_text = LAST_ADMIN_STRING; remove_lock.tooltip_text = LAST_ADMIN_STRING; } else { enable_user_button.sensitive = true; - enable_lock.set_opacity (0); - remove_user_button.sensitive = true; - remove_lock.set_opacity (0); + action_area.remove (remove_lock); } get_permission ().notify["allowed"].connect (update_permission); @@ -311,7 +334,7 @@ namespace SwitchboardPlugUserAccounts.Widgets { if (current_user || allowed) { full_name_entry.sensitive = true; - full_name_lock.set_opacity (0); + full_name_entry.secondary_icon_name = ""; language_lock.set_opacity (0); if (!user_locked) { @@ -343,6 +366,8 @@ namespace SwitchboardPlugUserAccounts.Widgets { } } else { full_name_entry.sensitive = false; + full_name_entry.secondary_icon_name = "changes-prevent-symbolic"; + full_name_entry.secondary_icon_tooltip_text = NO_PERMISSION_STRING; if (!current_user) { language_box.sensitive = false; @@ -380,7 +405,7 @@ namespace SwitchboardPlugUserAccounts.Widgets { var user_locked = user.get_locked (); if (user_locked) { enable_user_button.label = _("Enable User Account"); - enable_user_button.get_style_context ().add_class (Granite.STYLE_CLASS_SUGGESTED_ACTION); + enable_user_button.add_css_class (Granite.STYLE_CLASS_SUGGESTED_ACTION); } else { enable_user_button.label = _("Disable User Account"); enable_user_button.get_style_context ().remove_class (Granite.STYLE_CLASS_SUGGESTED_ACTION); From 280d6c552c3aa257889ac4d4a4b597046ab8126e Mon Sep 17 00:00:00 2001 From: Danielle Fore Date: Fri, 5 Jan 2024 13:51:09 -0800 Subject: [PATCH 2/6] more little tweaks --- src/Views/UserSettingsView.vala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Views/UserSettingsView.vala b/src/Views/UserSettingsView.vala index a5c0e5d0..f52764a2 100644 --- a/src/Views/UserSettingsView.vala +++ b/src/Views/UserSettingsView.vala @@ -88,7 +88,8 @@ namespace SwitchboardPlugUserAccounts.Widgets { avatar_overlay.add_overlay (avatar_button); full_name_entry = new Gtk.Entry () { - valign = Gtk.Align.CENTER + hexpand = true, + valign = CENTER }; full_name_entry.add_css_class (Granite.STYLE_CLASS_H2_LABEL); full_name_entry.activate.connect (() => { @@ -255,8 +256,7 @@ namespace SwitchboardPlugUserAccounts.Widgets { remove_lock.add_css_class (Granite.STYLE_CLASS_DIM_LABEL); var header_grid = new Gtk.Grid () { - column_spacing = 12, - halign = START + column_spacing = 12 }; header_grid.add_css_class ("header-area"); header_grid.attach (avatar_overlay, 0, 0); From 2333c0218060fb6efb6c6eaf742c41f46240f6e0 Mon Sep 17 00:00:00 2001 From: Danielle Fore Date: Fri, 5 Jan 2024 13:56:57 -0800 Subject: [PATCH 3/6] labels --- src/Views/UserSettingsView.vala | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Views/UserSettingsView.vala b/src/Views/UserSettingsView.vala index f52764a2..2c67e7ee 100644 --- a/src/Views/UserSettingsView.vala +++ b/src/Views/UserSettingsView.vala @@ -221,7 +221,7 @@ namespace SwitchboardPlugUserAccounts.Widgets { }; enable_user_button.clicked.connect (change_lock); - var remove_user_button = new Gtk.Button.with_label (_("Remove User Account")) { + var remove_user_button = new Gtk.Button.with_label (_("Remove Account")) { sensitive = false }; remove_user_button.add_css_class (Granite.STYLE_CLASS_DESTRUCTIVE_ACTION); @@ -404,11 +404,9 @@ namespace SwitchboardPlugUserAccounts.Widgets { var user_locked = user.get_locked (); if (user_locked) { - enable_user_button.label = _("Enable User Account"); - enable_user_button.add_css_class (Granite.STYLE_CLASS_SUGGESTED_ACTION); + enable_user_button.label = _("Enable Account"); } else { - enable_user_button.label = _("Disable User Account"); - enable_user_button.get_style_context ().remove_class (Granite.STYLE_CLASS_SUGGESTED_ACTION); + enable_user_button.label = _("Disable Account"); } if (delta_user.language != user.get_language ()) { From 4405b7a2d696fa932c95ce008e6110262836460e Mon Sep 17 00:00:00 2001 From: Danielle Fore Date: Fri, 5 Jan 2024 14:03:31 -0800 Subject: [PATCH 4/6] Remove locks --- src/Views/UserSettingsView.vala | 65 ++++----------------------------- 1 file changed, 8 insertions(+), 57 deletions(-) diff --git a/src/Views/UserSettingsView.vala b/src/Views/UserSettingsView.vala index 2c67e7ee..e1d1e257 100644 --- a/src/Views/UserSettingsView.vala +++ b/src/Views/UserSettingsView.vala @@ -37,17 +37,10 @@ namespace SwitchboardPlugUserAccounts.Widgets { private Gtk.Button language_button; private Gtk.Switch autologin_switch; - //lock widgets - private Gtk.Image user_type_lock; - private Gtk.Image language_lock; - private Gtk.Image autologin_lock; - private Gtk.Image password_lock; - private Gee.HashMap? default_regions; public signal void remove_user (); - private const string NO_PERMISSION_STRING = _("You do not have permission to change this"); private const string CURRENT_USER_STRING = _("You cannot change this for the currently active user"); private const string LAST_ADMIN_STRING = _("You cannot remove the last administrator's privileges"); @@ -140,8 +133,8 @@ namespace SwitchboardPlugUserAccounts.Widgets { reveal_child = true }; - grid.attach (language_box, 0, 3, 2); - grid.attach (region_revealer, 0, 4, 2); + grid.attach (language_box, 0, 3); + grid.attach (region_revealer, 0, 4); language_box.changed.connect (() => { Gtk.TreeIter? iter; @@ -184,7 +177,7 @@ namespace SwitchboardPlugUserAccounts.Widgets { tooltip_text = _("Click to switch to Language & Locale Settings") }; - grid.attach (language_button, 0, 3, 2); + grid.attach (language_button, 0, 3); } var login_label = new Gtk.Label (_("Log In automatically:")) { @@ -227,31 +220,8 @@ namespace SwitchboardPlugUserAccounts.Widgets { remove_user_button.add_css_class (Granite.STYLE_CLASS_DESTRUCTIVE_ACTION); remove_user_button.clicked.connect (() => remove_user ()); - user_type_lock = new Gtk.Image.from_icon_name ("changes-prevent-symbolic") { - tooltip_text = NO_PERMISSION_STRING - }; - user_type_lock.add_css_class (Granite.STYLE_CLASS_DIM_LABEL); - - language_lock = new Gtk.Image.from_icon_name ("changes-prevent-symbolic") { - tooltip_text = NO_PERMISSION_STRING - }; - language_lock.add_css_class (Granite.STYLE_CLASS_DIM_LABEL); - - autologin_lock = new Gtk.Image.from_icon_name ("changes-prevent-symbolic") { - margin_top = 20, - tooltip_text = NO_PERMISSION_STRING - }; - autologin_lock.add_css_class (Granite.STYLE_CLASS_DIM_LABEL); - - password_lock = new Gtk.Image.from_icon_name ("changes-prevent-symbolic") { - margin_end = 6, - tooltip_text = NO_PERMISSION_STRING - }; - password_lock.add_css_class (Granite.STYLE_CLASS_DIM_LABEL); - var remove_lock = new Gtk.Image.from_icon_name ("changes-prevent-symbolic") { - margin_start = 6, - tooltip_text = NO_PERMISSION_STRING + margin_start = 6 }; remove_lock.add_css_class (Granite.STYLE_CLASS_DIM_LABEL); @@ -265,14 +235,11 @@ namespace SwitchboardPlugUserAccounts.Widgets { var autologin_box = new Gtk.Box (HORIZONTAL, 6); autologin_box.append (login_label); autologin_box.append (autologin_switch); - autologin_box.append (autologin_lock); grid.attach (user_type_label, 0, 0); - grid.attach (user_type_lock, 1, 0); - grid.attach (user_type_box, 0, 1, 2); + grid.attach (user_type_box, 0, 1); grid.attach (lang_label, 0, 2); - grid.attach (language_lock, 1, 2); - grid.attach (autologin_box, 0, 5, 2); + grid.attach (autologin_box, 0, 5); grid.add_css_class ("content-area"); var action_area = new Gtk.Box (HORIZONTAL, 0); @@ -280,7 +247,6 @@ namespace SwitchboardPlugUserAccounts.Widgets { action_area.append (enable_user_button); action_area.append (remove_lock); action_area.append (new Gtk.Grid () { hexpand = true }); - action_area.append (password_lock); action_area.append (password_button); action_area.add_css_class ("buttonbox"); @@ -297,10 +263,10 @@ namespace SwitchboardPlugUserAccounts.Widgets { update_permission (); if (get_current_user () == user) { - user_type_lock.tooltip_text = CURRENT_USER_STRING; + user_type_label.secondary_text = CURRENT_USER_STRING; remove_lock.tooltip_text = CURRENT_USER_STRING; } else if (is_last_admin (user)) { - user_type_lock.tooltip_text = LAST_ADMIN_STRING; + user_type_label.secondary_text = LAST_ADMIN_STRING; remove_lock.tooltip_text = LAST_ADMIN_STRING; } else { enable_user_button.sensitive = true; @@ -324,39 +290,26 @@ namespace SwitchboardPlugUserAccounts.Widgets { user_type_box.sensitive = false; password_button.sensitive = false; autologin_switch.sensitive = false; - - user_type_lock.set_opacity (1); - autologin_lock.set_opacity (1); - password_lock.set_opacity (1); - - user_type_lock.tooltip_text = NO_PERMISSION_STRING; } if (current_user || allowed) { full_name_entry.sensitive = true; - full_name_entry.secondary_icon_name = ""; - language_lock.set_opacity (0); if (!user_locked) { password_button.sensitive = true; - password_lock.set_opacity (0); } else { password_button.sensitive = false; - password_lock.set_opacity (1); } if (allowed) { if (!user_locked) { autologin_switch.sensitive = true; - autologin_lock.set_opacity (0); } else { autologin_switch.sensitive = false; - autologin_lock.set_opacity (1); } if (!last_admin && !current_user) { user_type_box.sensitive = true; - user_type_lock.set_opacity (0); } } @@ -366,8 +319,6 @@ namespace SwitchboardPlugUserAccounts.Widgets { } } else { full_name_entry.sensitive = false; - full_name_entry.secondary_icon_name = "changes-prevent-symbolic"; - full_name_entry.secondary_icon_tooltip_text = NO_PERMISSION_STRING; if (!current_user) { language_box.sensitive = false; From 6cd9b83d4c019e8248b6f3d7a1e866b7a8c2e493 Mon Sep 17 00:00:00 2001 From: Danielle Fore Date: Fri, 5 Jan 2024 14:07:53 -0800 Subject: [PATCH 5/6] Pack infobar inside right pane --- src/Plug.vala | 21 ++------------------- src/Views/MainView.vala | 21 +++++++++++++++++++-- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/Plug.vala b/src/Plug.vala index 49210da9..95272ab8 100644 --- a/src/Plug.vala +++ b/src/Plug.vala @@ -25,8 +25,6 @@ namespace SwitchboardPlugUserAccounts { public class UserAccountsPlug : Switchboard.Plug { private Gtk.Grid? main_grid; - private Gtk.InfoBar infobar; - private Gtk.LockButton lock_button; private Widgets.MainView main_view; //translatable string for io.elementary.switchboard.useraccounts.administration policy @@ -53,30 +51,15 @@ namespace SwitchboardPlugUserAccounts { return main_grid; } - lock_button = new Gtk.LockButton (get_permission ()); - - infobar = new Gtk.InfoBar () { - message_type = INFO - }; - infobar.add_action_widget (lock_button, 0); - infobar.add_child (new Gtk.Label (_("Some settings require administrator rights to be changed"))); - main_view = new Widgets.MainView (); main_grid = new Gtk.Grid (); - main_grid.attach (infobar, 0, 2, 1, 1); - main_grid.attach (main_view, 0, 3, 1, 1); - - get_permission ().notify["allowed"].connect (() => { - infobar.revealed = !get_permission ().allowed; - }); + main_grid.attach (main_view, 0, 0); return main_grid; } - public override void shown () { - infobar.revealed = !get_permission ().allowed; - } + public override void shown () { } public override void hidden () { try { diff --git a/src/Views/MainView.vala b/src/Views/MainView.vala index d92fdb2e..807a0dfa 100644 --- a/src/Views/MainView.vala +++ b/src/Views/MainView.vala @@ -55,21 +55,38 @@ public class SwitchboardPlugUserAccounts.Widgets.MainView : Gtk.Box { guest = new GuestSettingsView (); + var lock_button = new Gtk.LockButton (get_permission ()); + + var infobar = new Gtk.InfoBar () { + message_type = INFO, + revealed = !get_permission ().allowed + }; + infobar.add_action_widget (lock_button, 0); + infobar.add_child (new Gtk.Label (_("Some settings require administrator rights to be changed"))); + + get_permission ().notify["allowed"].connect (() => { + infobar.revealed = !get_permission ().allowed; + }); + content = new Gtk.Stack (); content.add_named (guest, "guest_session"); + var box = new Gtk.Box (VERTICAL, 0); + box.append (infobar); + box.append (content); + toast = new Granite.Toast (""); toast.set_default_action (_("Undo")); var overlay = new Gtk.Overlay () { - child = content + child = box }; overlay.add_overlay (toast); var paned = new Gtk.Paned (HORIZONTAL) { start_child = sidebar, end_child = overlay, - position = 240, + position = 200, resize_start_child = false, shrink_start_child = false, shrink_end_child = false From ca37b86d4770d7aac338e7c06b7da3c68276df01 Mon Sep 17 00:00:00 2001 From: Danielle Fore Date: Fri, 5 Jan 2024 14:15:46 -0800 Subject: [PATCH 6/6] Some string changes --- src/Views/MainView.vala | 2 +- src/Views/UserSettingsView.vala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Views/MainView.vala b/src/Views/MainView.vala index 807a0dfa..46ef8660 100644 --- a/src/Views/MainView.vala +++ b/src/Views/MainView.vala @@ -30,7 +30,7 @@ public class SwitchboardPlugUserAccounts.Widgets.MainView : Gtk.Box { hscrollbar_policy = NEVER }; - var add_button_label = new Gtk.Label (_("Create User Account…")); + var add_button_label = new Gtk.Label (_("Create Account…")); var add_button_box = new Gtk.Box (HORIZONTAL, 0); add_button_box.append (new Gtk.Image.from_icon_name ("list-add-symbolic")); diff --git a/src/Views/UserSettingsView.vala b/src/Views/UserSettingsView.vala index e1d1e257..e5bc18af 100644 --- a/src/Views/UserSettingsView.vala +++ b/src/Views/UserSettingsView.vala @@ -41,8 +41,8 @@ namespace SwitchboardPlugUserAccounts.Widgets { public signal void remove_user (); - private const string CURRENT_USER_STRING = _("You cannot change this for the currently active user"); - private const string LAST_ADMIN_STRING = _("You cannot remove the last administrator's privileges"); + private const string CURRENT_USER_STRING = _("This can't be changed for the currently active account"); + private const string LAST_ADMIN_STRING = _("You can't remove the last administrator's privileges"); public UserSettingsView (Act.User user) { Object (user: user);