attrib "key" -> "shortcut", also fix #20

This commit is contained in:
airstruck
2016-01-03 01:18:04 -05:00
parent 3abcce1615
commit c73833337e
12 changed files with 98 additions and 90 deletions

View File

@@ -1,34 +1,34 @@
return { id = 'mainWindow',
{ type = 'menu',
{ text = 'File',
{ text = 'Save', id = 'menuSave', key = 'ctrl-s',
{ text = 'Save', id = 'menuSave', shortcut = 'ctrl-s',
status = 'Save to disk' },
{ text = 'Quit', id = 'menuQuit', key = 'escape',
{ text = 'Quit', id = 'menuQuit', shortcut = 'escape',
status = 'Quit the demo' },
},
{ text = 'Edit',
{ text = 'Cut', key = 'ctrl-c' },
{ text = 'Copy', key = 'ctrl-x' },
{ text = 'Paste', key = 'ctrl-v' },
{ text = 'Cut', shortcut = 'ctrl-c' },
{ text = 'Copy', shortcut = 'ctrl-x' },
{ text = 'Paste', shortcut = 'ctrl-v' },
{ type = 'slider' },
},
{ text = 'View',
{ text = 'Theme',
{ text = 'Light', key = 'ctrl-l', id = 'themeLight', },
{ text = 'Dark', key = 'ctrl-d', id = 'themeDark' },
{ text = 'Light', shortcut = 'ctrl-l', id = 'themeLight', },
{ text = 'Dark', shortcut = 'ctrl-d', id = 'themeDark' },
},
{ text = 'Style',
{ text = 'Default' },
},
},
{ text = 'Help',
{ id = 'about', text = 'About Luigi', icon = 'icon/16px/Book.png', key = 'f1', },
{ id = 'aboutDemo', text = 'About Luigi Demo', icon = 'icon/16px/Book Red.png', key = 'f2' },
{ id = 'license', text = 'License', key = 'f3' },
{ id = 'about', text = 'About Luigi', icon = 'icon/16px/Book.png', shortcut = 'f1', },
{ id = 'aboutDemo', text = 'About Luigi Demo', icon = 'icon/16px/Book Red.png', shortcut = 'f2' },
{ id = 'license', text = 'License', shortcut = 'f3' },
},
},
{ style = 'toolbar',
{ id = 'newButton', style = 'toolButton', key = 'z',
{ id = 'newButton', style = 'toolButton', shortcut = 'z',
icon = 'icon/32px/Blueprint.png',
status = 'Create a new thing' },
{ id = 'loadButton', style = 'toolButton',
@@ -88,10 +88,12 @@ return { id = 'mainWindow',
{ type = 'label', text = 'Flow test' },
{ type = 'check', text = 'Vertical controls', id = 'flowToggle', },
{ type = 'label', text = 'Some radio widgets' },
{ type = 'radio', text = 'One fish' },
{ type = 'radio', text = 'Two fish' },
{ type = 'radio', text = 'Red fish' },
{ type = 'radio', text = 'Blue fish' },
{
{ type = 'radio', text = 'One fish' },
{ type = 'radio', text = 'Two fish' },
{ type = 'radio', text = 'Red fish' },
{ type = 'radio', text = 'Blue fish' },
},
}
},
},