mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-15 20:42:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

New Keyboard Shortcuts dialog layout (fix #777)

Browse Source
This commit is contained in:
David Capello 2015-08-25 13:59:15 -03:00
parent 746f41ff5b
commit 19951c6dd5
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
data/widgets/keyboard_shortcuts.xml
View File

@ -1,13 +1,22 @@
<!-- Aseprite -->
<!-- Copyright (C) 2001-2014 by David Capello -->
<!-- Copyright (C) 2001-2015 by David Capello -->
<gui>
<window id="keyboard_shortcuts" text="Keyboard Shortcuts">
<hbox>
<vbox>
<view expansive="true" width="80">
<listbox id="section" expansive="true" />
</view>
<separator horizontal="true" />
<button text="&amp;OK" closewindow="true" id="ok" magnet="true" width="60" />
<button text="&amp;Cancel" closewindow="true" />
<separator horizontal="true" />
<button text="&amp;Import" id="import_button" />
<button text="&amp;Export" id="export_button" />
<separator horizontal="true" />
<button text="&amp;Reset" id="reset_button" />
</vbox>
<vbox expansive="true">
<hbox>
<label text="Section:" />
<combobox id="section" expansive="true" />
</hbox>
<view id="menus_view" expansive="true">
<listbox id="menus" />
</view>
@ -21,15 +30,6 @@
<listbox id="actions" />
</view>
</vbox>
<vbox>
<button text="&amp;OK" closewindow="true" id="ok" magnet="true" width="60" />
<button text="&amp;Cancel" closewindow="true" />
<separator horizontal="true" />
<button text="&amp;Import" id="import_button" />
<button text="&amp;Export" id="export_button" />
<separator horizontal="true" />
<button text="&amp;Reset" id="reset_button" />
</vbox>
</hbox>
</window>
</gui>

11
src/app/commands/cmd_keyboard_shortcuts.cpp
View File

@ -283,10 +283,10 @@ public:
KeyboardShortcutsWindow() {
setAutoRemap(false);
section()->addItem("Menus");
section()->addItem("Commands");
section()->addItem("Tools");
section()->addItem("Action Modifiers");
section()->addChild(new ListItem("Menus"));
section()->addChild(new ListItem("Commands"));
section()->addChild(new ListItem("Tools"));
section()->addChild(new ListItem("Action Modifiers"));
section()->Change.connect(Bind<void>(&KeyboardShortcutsWindow::onSectionChange, this));
importButton()->Click.connect(Bind<void>(&KeyboardShortcutsWindow::onImport, this));
@ -365,11 +365,12 @@ private:
this->tools()->sortItems();
this->actions()->sortItems();
section()->selectIndex(0);
onSectionChange();
}
void onSectionChange() {
int section = this->section()->getSelectedItemIndex();
int section = this->section()->getSelectedIndex();
menusView()->setVisible(section == 0);
commandsView()->setVisible(section == 1);