keyboard: Move Remove button to the header bar

According to the mockups [1], the Remove button should
be placed at the start of the header bar. Currently,
however, it is positioned below the custom shortcut edit
button.

Fix that by moving the remove button to the header bar.

[1] https://raw.githubusercontent.com/gnome-design-team/gnome-mockups/master/system-settings/keyboard/keyboard-wires.png

https://bugzilla.gnome.org/show_bug.cgi?id=777846
This commit is contained in:
Georges Basile Stavracas Neto 2017-05-01 20:58:26 -03:00
parent 4ef7e93e55
commit dce6fe6add
2 changed files with 13 additions and 18 deletions

View file

@ -319,6 +319,7 @@ set_header_mode (CcKeyboardShortcutEditor *self,
mode != HEADER_MODE_CUSTOM_EDIT);
gtk_widget_set_visible (self->replace_button, mode == HEADER_MODE_REPLACE);
gtk_widget_set_visible (self->set_button, mode == HEADER_MODE_SET);
gtk_widget_set_visible (self->remove_button, mode == HEADER_MODE_CUSTOM_EDIT);
/* By setting the default response, the action button gets the 'suggested-action' applied */
switch (mode)
@ -643,7 +644,6 @@ setup_keyboard_item (CcKeyboardShortcutEditor *self,
is_accel_empty ? "button" : "label");
gtk_widget_set_visible (self->reset_custom_button, !is_accel_empty);
gtk_widget_show (self->remove_button);
g_signal_handlers_unblock_by_func (self->command_entry, command_entry_changed_cb, self);
g_signal_handlers_unblock_by_func (self->name_entry, name_entry_changed_cb, self);
@ -1040,6 +1040,5 @@ cc_keyboard_shortcut_editor_set_mode (CcKeyboardShortcutEditor *self,
gtk_widget_set_sensitive (self->add_button, FALSE);
gtk_widget_hide (self->reset_custom_button);
gtk_widget_hide (self->remove_button);
}
}