applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

user-accounts: use a toolbar for source list

Browse source
This commit is contained in:
William Jon McCann 2011-01-24 16:23:56 -05:00
parent bb752ed25c
commit 5046c06752
2 changed files with 17 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

36
panels/user-accounts/data/user-accounts-dialog.ui
View file

@ -38,14 +38,6 @@
<column type="gchararray"/>
</columns>
</object>
<object class="GtkImage" id="plus">
<property name="pixel_size">12</property>
<property name="icon_name">list-add</property>
</object>
<object class="GtkImage" id="minus">
<property name="pixel_size">12</property>
<property name="icon_name">list-remove</property>
</object>
<object class="GtkWindow" id="user-account-window">
<property name="border_width">12</property>
<property name="title" translatable="yes">Account Information</property>
@ -69,7 +61,7 @@
<object class="GtkVBox" id="userlist-vbox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<property name="spacing">0</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
@ -90,35 +82,29 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="add-delete-buttonbox">
<object class="GtkToolbar" id="add-remove-toolbar">
<property name="visible">True</property>
<property name="spacing">2</property>
<property name="icon_size">1</property>
<child>
<object class="GtkButton" id="add-user-button">
<object class="GtkToolButton" id="add-user-toolbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Create a user</property>
<property name="image">plus</property>
<property name="can_focus">False</property>
<property name="icon_name">list-add-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkButton" id="delete-user-button">
<object class="GtkToolButton" id="remove-user-toolbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Delete the selected user</property>
<property name="image">minus</property>
<property name="can_focus">False</property>
<property name="icon_name">list-remove-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
<property name="homogeneous">True</property>
</packing>
</child>
</object>

12
panels/user-accounts/um-user-panel.c
View file

@ -896,7 +896,7 @@ on_permission_changed (GPermission *permission,
is_authorized = g_permission_get_allowed (G_PERMISSION (d->permission));
self_selected = um_user_get_uid (user) == geteuid ();
widget = get_widget (d, "add-user-button");
widget = get_widget (d, "add-user-toolbutton");
gtk_widget_set_sensitive (widget, is_authorized);
if (is_authorized) {
setup_tooltip_with_embedded_icon (widget, _("Create a user"), NULL, NULL);
@ -916,7 +916,7 @@ on_permission_changed (GPermission *permission,
g_object_unref (icon);
}
widget = get_widget (d, "delete-user-button");
widget = get_widget (d, "delete-user-toolbutton");
gtk_widget_set_sensitive (widget, is_authorized && !self_selected);
if (is_authorized) {
setup_tooltip_with_embedded_icon (widget, _("Delete the selected user"), NULL, NULL);
@ -1135,10 +1135,10 @@ setup_main_window (UmUserPanelPrivate *d)
g_signal_connect (selection, "changed", G_CALLBACK (selected_user_changed), d);
gtk_tree_selection_set_select_function (selection, dont_select_headings, NULL, NULL);
button = get_widget (d, "add-user-button");
button = get_widget (d, "add-user-toolbutton");
g_signal_connect (button, "clicked", G_CALLBACK (add_user), d);
button = get_widget (d, "delete-user-button");
button = get_widget (d, "delete-user-toolbutton");
g_signal_connect (button, "clicked", G_CALLBACK (delete_user), d);
button = get_widget (d, "user-icon-nonbutton");
@ -1180,7 +1180,7 @@ setup_main_window (UmUserPanelPrivate *d)
d->lock_button = button;
}
button = get_widget (d, "add-user-button");
button = get_widget (d, "add-user-toolbutton");
names[0] = "changes-prevent-symbolic";
names[1] = "changes-prevent";
names[2] = NULL;
@ -1189,7 +1189,7 @@ setup_main_window (UmUserPanelPrivate *d)
_("To create a user,\nclick the * icon first"),
"*",
icon);
button = get_widget (d, "delete-user-button");
button = get_widget (d, "delete-user-toolbutton");
setup_tooltip_with_embedded_icon (button,
_("To delete the selected user,\nclick the * icon first"),
"*",