minor improvements

This commit is contained in:
airstruck
2015-12-10 16:05:54 -05:00
parent bcfed7b737
commit c8ca310811
20 changed files with 160 additions and 108 deletions

View File

@@ -1,7 +1,6 @@
return { style = 'dialog',
{ style = 'dialogHead', text = 'License' },
{ style = 'dialogBody', text = [[
The MIT License (MIT)
{ style = 'dialogBody', text = [[The MIT License (MIT)
Copyright (c) 2015 airstruck
@@ -21,8 +20,8 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
]] },
SOFTWARE.]]
},
{ style = 'dialogFoot',
{}, -- spacer
{ style = 'dialogButton', id = 'closeButton', text = 'Close' }

View File

@@ -1,5 +1,5 @@
return { id = 'mainWindow', type = 'panel',
{ type = 'menu', id = 'menubar', flow = 'x',
return { id = 'mainWindow',
{ type = 'menu',
{ text = 'File',
{ text = 'Save', id = 'menuSave', key = 'ctrl-s',
status = 'Save to disk' },
@@ -27,7 +27,7 @@ return { id = 'mainWindow', type = 'panel',
{ id = 'license', text = 'License', key = 'f3' },
},
},
{ type = 'panel', id = 'toolbar', style = 'toolbar', flow = 'x',
{ style = 'toolbar',
{ id = 'newButton', style = 'toolButton', key = 'z',
icon = 'icon/32px/Blueprint.png',
status = 'Create a new thing' },
@@ -39,30 +39,36 @@ return { id = 'mainWindow', type = 'panel',
status = 'Save a thing' },
},
{ flow = 'x',
{ id = 'leftSideBox', width = 200, minwidth = 64, scroll = true, type = 'panel',
{ text = 'Hi, I\'m centered middle. ', style = 'listThing',
align = 'middle center' },
{ text = 'Hi, I\'m right bottom.\nAlso two lines, woopdy woop.Hi, I\'m right bottom.\nAlso two lines, woopdy woop.Hi, I\'m right bottom.\nAlso two lines, woopdy woop.', style = 'listThing',
align = 'bottom right' },
{ text = 'Hi, I\'m centered top. ', style = 'listThing',
align = 'top center' },
{ text = 'A man, a plan, a canal: Panama!', style = 'listThing' },
{ id = 'leftSideBox', minwidth = 200, width = 200, scroll = true, type = 'panel',
{ style = 'listThing', align = 'middle center',
text = 'Try the scroll wheel on this area.' },
{ style = 'listThing', align = 'middle center',
text = 'This text is centered, and in the middle vertically.' },
{ style = 'listThing', align = 'middle left',
text = 'This text is aligned left, and in the middle vertically.' },
{ style = 'listThing', align = 'middle right',
text = 'This text is aligned right, and in the middle vertically.' },
{ style = 'listThing', align = 'top center',
text = 'This text is centered, and at the top vertically.' },
{ style = 'listThing', align = 'bottom center',
text = 'This text is centered, and at the bottom vertically.' },
},
{ type = 'sash' },
{ type = 'panel', id = 'mainCanvas' },
{ type = 'sash' },
{ type = 'panel', id = 'rightSideBox', width = 200, minwidth = 64, scroll = true,
{ id = 'flowTest', height = 'auto', minheight = 128,
{ type = 'panel', id = 'rightSideBox', minwidth = 200, width = 200, scroll = true,
{ id = 'flowTest', height = 'auto', minheight = 128,
{
{ type = 'label', text = 'Slider' },
{ type = 'slider', id = 'slidey', width = false },
},
{
{ type = 'label', text = 'Stepper' },
{ type = 'stepper', id = 'stepper', width = false,
{ type = 'stepper', id = 'stepper', width = false, wrap = true,
{ value = 1, text = 'Thing One' },
{ value = 2, text = 'Thing Two' },
{ value = 3, text = 'Thing Three' },
{ value = 4, text = 'Thing Four' },
},
},
{
@@ -70,7 +76,7 @@ return { id = 'mainWindow', type = 'panel',
{ type = 'progress', id = 'progressBar', width = false },
},
},
{ height = 'auto',
{ height = 'auto',
{ type = 'label', text = 'Flow test' },
{ type = 'check', text = 'Vertical controls', id = 'flowToggle', },
{ type = 'label', text = 'Some radio widgets' },
@@ -82,9 +88,12 @@ return { id = 'mainWindow', type = 'panel',
},
},
{ type = 'sash' },
{ type = 'panel', flow = 'x', height = 64,
{ type = 'text', id = 'aTextField', text = 'Testing «ταБЬℓσ»: 1<2 & 4+1>3, now 20% off!' },
{ type = 'button', width = 90, id = 'aButton', text = 'Press me!' },
{ type = 'panel', height = 'auto',
{ flow = 'x',
{ type = 'text', id = 'aTextField', text = 'Testing «ταБЬℓσ»: 1<2 & 4+1>3, now 20% off!' },
{ type = 'button', width = 90, id = 'aButton', text = 'Press me!' }
},
{ type = 'status', id = 'statusbar' },
},
{ type = 'status', id = 'statusbar' },
}