applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
gnome-control-center/panels/keyboard/shortcut-editor.ui

419 lines
21 KiB
Text
Raw Normal View History

keyboard: introduce CcKeyboardShortcutEditor The current CcKeyboardPanel used to manage keyboard editing through GtkCellRendererAccel, which was replaced when we moved to use a GtkListBox. Because of that, the ability to edit shortcuts is now missing. Re-add shortcut editing capabilities through a new dialog, which is done according to the latest mockups available. https://bugzilla.gnome.org/show_bug.cgi?id=769063
2016-07-08 00:35:38 -03:00
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="3.20"/>
<template class="CcKeyboardShortcutEditor" parent="GtkDialog">
<property name="can_focus">False</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="width_request">400</property>
<property name="height_request">300</property>
<property name="window_position">center</property>
<property name="type_hint">dialog</property>
<signal name="delete-event" handler="gtk_widget_hide_on_delete" object="CcKeyboardShortcutEditor" swapped="yes"/>
<child internal-child="vbox">
<object class="GtkBox">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkStack" id="stack">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">12</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
<object class="GtkLabel" id="top_info_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="wrap">True</property>
<property name="wrap_mode">word-char</property>
<property name="width_chars">15</property>
<property name="max_width_chars">20</property>
</object>
</child>
<child>
shortcut-editor: move widgets into a stack The stack will be used by the next patches to show an call for action page. https://bugzilla.gnome.org/show_bug.cgi?id=769314
2016-08-31 20:55:42 -03:00
<object class="GtkStack" id="standard_shortcut_stack">
keyboard: introduce CcKeyboardShortcutEditor The current CcKeyboardPanel used to manage keyboard editing through GtkCellRendererAccel, which was replaced when we moved to use a GtkListBox. Because of that, the ability to edit shortcuts is now missing. Re-add shortcut editing capabilities through a new dialog, which is done according to the latest mockups available. https://bugzilla.gnome.org/show_bug.cgi?id=769063
2016-07-08 00:35:38 -03:00
<property name="visible">True</property>
<property name="can_focus">False</property>
shortcut-editor: move widgets into a stack The stack will be used by the next patches to show an call for action page. https://bugzilla.gnome.org/show_bug.cgi?id=769314
2016-08-31 20:55:42 -03:00
<property name="expand">True</property>
<property name="transition_type">crossfade</property>
shortcut-editor: show custom page while waiting for input While waiting for keyboard input, as per the new proposed mockup, the shortcut editor dialog should show a custom page with an icon that indicates the required action. The current code, however, does not expose this new customized page. Fix that by adding this new page and controlling the time when it shows and hides. https://bugzilla.gnome.org/show_bug.cgi?id=769314
2016-08-31 21:14:34 -03:00
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">18</property>
<property name="expand">True</property>
<property name="halign">center</property>
<property name="valign">center</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="resource">/org/gnome/control-center/keyboard/enter-keyboard-shortcut.svg</property>
</object>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
Mark some strings as translatable
2016-09-09 12:36:03 +03:00
<property name="label" translatable="yes">Press Esc to cancel.</property>
shortcut-editor: show custom page while waiting for input While waiting for keyboard input, as per the new proposed mockup, the shortcut editor dialog should show a custom page with an icon that indicates the required action. The current code, however, does not expose this new customized page. Fix that by adding this new page and controlling the time when it shows and hides. https://bugzilla.gnome.org/show_bug.cgi?id=769314
2016-08-31 21:14:34 -03:00
<style>
<class name="dim-label" />
</style>
</object>
</child>
</object>
<packing>
<property name="name">change-shortcut</property>
</packing>
</child>
shortcut-editor: update reset button position and style The Reset button, according to the mockups, should be placed at the right side (left on rtl) of the shortcut label. Also, rather than a plain string, the button should use a symbolic icon for 'edit-clear' action. This patch moves and updates the Reset button to match the mockups. https://bugzilla.gnome.org/show_bug.cgi?id=769314
2016-08-31 20:44:28 -03:00
<child>
shortcut-editor: move widgets into a stack The stack will be used by the next patches to show an call for action page. https://bugzilla.gnome.org/show_bug.cgi?id=769314
2016-08-31 20:55:42 -03:00
<object class="GtkBox">
shortcut-editor: update reset button position and style The Reset button, according to the mockups, should be placed at the right side (left on rtl) of the shortcut label. Also, rather than a plain string, the button should use a symbolic icon for 'edit-clear' action. This patch moves and updates the Reset button to match the mockups. https://bugzilla.gnome.org/show_bug.cgi?id=769314
2016-08-31 20:44:28 -03:00
<property name="visible">True</property>
shortcut-editor: move widgets into a stack The stack will be used by the next patches to show an call for action page. https://bugzilla.gnome.org/show_bug.cgi?id=769314
2016-08-31 20:55:42 -03:00
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">18</property>
<child type="center">
<object class="GtkShortcutLabel" id="shortcut_accel_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="disabled-text" translatable="yes">Disabled</property>
</object>
</child>
<child>
<object class="GtkButton" id="reset_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="relief">none</property>
<property name="halign">end</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon-name">edit-clear-symbolic</property>
</object>
</child>
<signal name="clicked" handler="reset_item_clicked_cb" object="CcKeyboardShortcutEditor" swapped="yes" />
</object>
<packing>
<property name="pack_type">end</property>
</packing>
</child>
</object>
</child>
shortcut-editor: update reset button position and style The Reset button, according to the mockups, should be placed at the right side (left on rtl) of the shortcut label. Also, rather than a plain string, the button should use a symbolic icon for 'edit-clear' action. This patch moves and updates the Reset button to match the mockups. https://bugzilla.gnome.org/show_bug.cgi?id=769314
2016-08-31 20:44:28 -03:00
<child>
shortcut-editor: move widgets into a stack The stack will be used by the next patches to show an call for action page. https://bugzilla.gnome.org/show_bug.cgi?id=769314
2016-08-31 20:55:42 -03:00
<object class="GtkLabel" id="shortcut_conflict_label">
shortcut-editor: update reset button position and style The Reset button, according to the mockups, should be placed at the right side (left on rtl) of the shortcut label. Also, rather than a plain string, the button should use a symbolic icon for 'edit-clear' action. This patch moves and updates the Reset button to match the mockups. https://bugzilla.gnome.org/show_bug.cgi?id=769314
2016-08-31 20:44:28 -03:00
<property name="visible">True</property>
<property name="can_focus">False</property>
shortcut-editor: move widgets into a stack The stack will be used by the next patches to show an call for action page. https://bugzilla.gnome.org/show_bug.cgi?id=769314
2016-08-31 20:55:42 -03:00
<property name="hexpand">True</property>
<property name="wrap">True</property>
<property name="wrap_mode">word-char</property>
<property name="width_chars">15</property>
<property name="max_width_chars">20</property>
<property name="xalign">0</property>
shortcut-editor: update reset button position and style The Reset button, according to the mockups, should be placed at the right side (left on rtl) of the shortcut label. Also, rather than a plain string, the button should use a symbolic icon for 'edit-clear' action. This patch moves and updates the Reset button to match the mockups. https://bugzilla.gnome.org/show_bug.cgi?id=769314
2016-08-31 20:44:28 -03:00
</object>
</child>
</object>
<packing>
shortcut-editor: move widgets into a stack The stack will be used by the next patches to show an call for action page. https://bugzilla.gnome.org/show_bug.cgi?id=769314
2016-08-31 20:55:42 -03:00
<property name="name">main</property>
shortcut-editor: update reset button position and style The Reset button, according to the mockups, should be placed at the right side (left on rtl) of the shortcut label. Also, rather than a plain string, the button should use a symbolic icon for 'edit-clear' action. This patch moves and updates the Reset button to match the mockups. https://bugzilla.gnome.org/show_bug.cgi?id=769314
2016-08-31 20:44:28 -03:00
</packing>
</child>
keyboard: introduce CcKeyboardShortcutEditor The current CcKeyboardPanel used to manage keyboard editing through GtkCellRendererAccel, which was replaced when we moved to use a GtkListBox. Because of that, the ability to edit shortcuts is now missing. Re-add shortcut editing capabilities through a new dialog, which is done according to the latest mockups available. https://bugzilla.gnome.org/show_bug.cgi?id=769063
2016-07-08 00:35:38 -03:00
</object>
</child>
</object>
<packing>
<property name="name">edit</property>
</packing>
</child>
<child>
<object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="row_spacing">12</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Name</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Command</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Shortcut</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="new_shortcut_conflict_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="wrap">True</property>
<property name="wrap_mode">word-char</property>
<property name="width_chars">15</property>
<property name="max_width_chars">20</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="name_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="sensitive" bind-source="edit_button" bind-property="active" bind-flags="default|invert-boolean" />
<signal name="notify::text" handler="name_entry_changed_cb" object="CcKeyboardShortcutEditor" swapped="yes" />
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="command_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="sensitive" bind-source="edit_button" bind-property="active" bind-flags="default|invert-boolean" />
<signal name="notify::text" handler="command_entry_changed_cb" object="CcKeyboardShortcutEditor" swapped="yes" />
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkToggleButton" id="edit_button">
<property name="label" translatable="yes">Edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="notify::active" handler="edit_custom_shortcut_button_toggled_cb" object="CcKeyboardShortcutEditor" swapped="yes" />
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">2</property>
</packing>
</child>
<child>
shortcut-editor: use a different page to edit custom shortcuts When adding a new keyboard shortcut, in accordance to the mockups, the dialog should present a new page calling for an action from the user. This patch adds this page, and adapts the code to show it whenever the user wants to change the shortcut. https://bugzilla.gnome.org/show_bug.cgi?id=769314
2016-08-30 15:41:27 -03:00
<object class="GtkStack" id="custom_shortcut_stack">
keyboard: introduce CcKeyboardShortcutEditor The current CcKeyboardPanel used to manage keyboard editing through GtkCellRendererAccel, which was replaced when we moved to use a GtkListBox. Because of that, the ability to edit shortcuts is now missing. Re-add shortcut editing capabilities through a new dialog, which is done according to the latest mockups available. https://bugzilla.gnome.org/show_bug.cgi?id=769063
2016-07-08 00:35:38 -03:00
<property name="visible">True</property>
<property name="can_focus">False</property>
shortcut-editor: use a different page to edit custom shortcuts When adding a new keyboard shortcut, in accordance to the mockups, the dialog should present a new page calling for an action from the user. This patch adds this page, and adapts the code to show it whenever the user wants to change the shortcut. https://bugzilla.gnome.org/show_bug.cgi?id=769314
2016-08-30 15:41:27 -03:00
<child>
<object class="GtkButton" id="change_custom_shortcut_button">
<property name="visible">True</property>
<property name="can_focus">False</property>
Disambiguate "Set Shortcut" string with context
2016-09-25 01:59:45 +02:00
<property name="label" translatable="yes" context="button">Set Shortcut</property>
shortcut-editor: use a different page to edit custom shortcuts When adding a new keyboard shortcut, in accordance to the mockups, the dialog should present a new page calling for an action from the user. This patch adds this page, and adapts the code to show it whenever the user wants to change the shortcut. https://bugzilla.gnome.org/show_bug.cgi?id=769314
2016-08-30 15:41:27 -03:00
<signal name="clicked" handler="change_custom_shortcut_button_clicked_cb" object="CcKeyboardShortcutEditor" swapped="yes" />
</object>
<packing>
<property name="name">button</property>
</packing>
</child>
<child>
<object class="GtkShortcutLabel" id="custom_shortcut_accel_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
<property name="disabled-text" translatable="yes">None</property>
</object>
<packing>
<property name="name">label</property>
</packing>
</child>
keyboard: introduce CcKeyboardShortcutEditor The current CcKeyboardPanel used to manage keyboard editing through GtkCellRendererAccel, which was replaced when we moved to use a GtkListBox. Because of that, the ability to edit shortcuts is now missing. Re-add shortcut editing capabilities through a new dialog, which is done according to the latest mockups available. https://bugzilla.gnome.org/show_bug.cgi?id=769063
2016-07-08 00:35:38 -03:00
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="remove_button">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Remove</property>
<property name="valign">end</property>
<property name="sensitive" bind-source="edit_button" bind-property="active" bind-flags="default|invert-boolean" />
<signal name="clicked" handler="remove_button_clicked_cb" object="CcKeyboardShortcutEditor" swapped="yes" />
<style>
<class name="destructive-action" />
</style>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">3</property>
</packing>
</child>
</object>
<packing>
<property name="name">custom</property>
<property name="position">1</property>
</packing>
</child>
shortcut-editor: use a different page to edit custom shortcuts When adding a new keyboard shortcut, in accordance to the mockups, the dialog should present a new page calling for an action from the user. This patch adds this page, and adapts the code to show it whenever the user wants to change the shortcut. https://bugzilla.gnome.org/show_bug.cgi?id=769314
2016-08-30 15:41:27 -03:00
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">18</property>
<property name="expand">True</property>
<property name="halign">center</property>
<property name="valign">center</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
Mark another string as translatable
2016-09-09 12:49:45 +03:00
<property name="label" translatable="yes">Enter the new shortcut</property>
shortcut-editor: use a different page to edit custom shortcuts When adding a new keyboard shortcut, in accordance to the mockups, the dialog should present a new page calling for an action from the user. This patch adds this page, and adapts the code to show it whenever the user wants to change the shortcut. https://bugzilla.gnome.org/show_bug.cgi?id=769314
2016-08-30 15:41:27 -03:00
</object>
</child>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="resource">/org/gnome/control-center/keyboard/enter-keyboard-shortcut.svg</property>
</object>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
Mark some strings as translatable
2016-09-09 12:36:03 +03:00
<property name="label" translatable="yes">Press Esc to cancel.</property>
shortcut-editor: use a different page to edit custom shortcuts When adding a new keyboard shortcut, in accordance to the mockups, the dialog should present a new page calling for an action from the user. This patch adds this page, and adapts the code to show it whenever the user wants to change the shortcut. https://bugzilla.gnome.org/show_bug.cgi?id=769314
2016-08-30 15:41:27 -03:00
<style>
<class name="dim-label" />
</style>
</object>
</child>
</object>
<packing>
<property name="name">change-shortcut</property>
<property name="position">2</property>
</packing>
</child>
keyboard: introduce CcKeyboardShortcutEditor The current CcKeyboardPanel used to manage keyboard editing through GtkCellRendererAccel, which was replaced when we moved to use a GtkListBox. Because of that, the ability to edit shortcuts is now missing. Re-add shortcut editing capabilities through a new dialog, which is done according to the latest mockups available. https://bugzilla.gnome.org/show_bug.cgi?id=769063
2016-07-08 00:35:38 -03:00
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<child type="titlebar">
<object class="GtkHeaderBar" id="headerbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_close_button">True</property>
<child>
<object class="GtkButton" id="cancel_button">
<property name="label" translatable="yes">Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="cancel_button_clicked_cb" object="CcKeyboardShortcutEditor" swapped="no" />
</object>
</child>
<child>
<object class="GtkButton" id="add_button">
<property name="label" translatable="yes">Add</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="add_button_clicked_cb" object="CcKeyboardShortcutEditor" swapped="yes" />
<style>
<class name="suggested-action" />
</style>
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="replace_button">
<property name="label" translatable="yes">Replace</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
keyboard: bring back uniqueness check The collision detection code was removed in commit a0a155884ef66ca as the cleanup was happening because the previous code was closely tied to the user interface components. Because that code wasn't appliable to the new listbox UI, it was temporarily removed. This patch re-adds this feature to work with the new code orgazination. https://bugzilla.gnome.org/show_bug.cgi?id=769063
2016-07-13 20:09:17 -03:00
<signal name="clicked" handler="replace_button_clicked_cb" object="CcKeyboardShortcutEditor" swapped="yes" />
keyboard: introduce CcKeyboardShortcutEditor The current CcKeyboardPanel used to manage keyboard editing through GtkCellRendererAccel, which was replaced when we moved to use a GtkListBox. Because of that, the ability to edit shortcuts is now missing. Re-add shortcut editing capabilities through a new dialog, which is done according to the latest mockups available. https://bugzilla.gnome.org/show_bug.cgi?id=769063
2016-07-08 00:35:38 -03:00
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
shortcut-editor: add 'Set' button The Set button will be used to update a standard shortcut. This patch adds it to the headerbar. https://bugzilla.gnome.org/show_bug.cgi?id=769314
2016-08-30 11:42:09 -03:00
<child>
<object class="GtkButton" id="set_button">
<property name="label" translatable="yes">Set</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="set_button_clicked_cb" object="CcKeyboardShortcutEditor" swapped="yes" />
<style>
<class name="suggested-action" />
</style>
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">3</property>
</packing>
</child>
keyboard: introduce CcKeyboardShortcutEditor The current CcKeyboardPanel used to manage keyboard editing through GtkCellRendererAccel, which was replaced when we moved to use a GtkListBox. Because of that, the ability to edit shortcuts is now missing. Re-add shortcut editing capabilities through a new dialog, which is done according to the latest mockups available. https://bugzilla.gnome.org/show_bug.cgi?id=769063
2016-07-08 00:35:38 -03:00
</object>
</child>
</template>
<object class="GtkSizeGroup">
<widgets>
<widget name="cancel_button"/>
<widget name="add_button"/>
<widget name="replace_button"/>
<widget name="reset_button"/>
</widgets>
</object>
</interface>
Reference in a new issue Copy permalink