canvas overhaul

This commit is contained in:
kepler155c@gmail.com
2020-03-31 10:08:07 -06:00
parent 79c8c4beae
commit cdea6e4aed
18 changed files with 296 additions and 160 deletions

View File

@@ -517,7 +517,7 @@ local function loadDirectory(dir)
})
end
end
page.menuBar.config:add({ dropmenu = UI.DropMenu { buttons = dropdown } })
page.menuBar.config.dropdown = dropdown
end
local programDir = fs.getDir(shell.getRunningProgram())

View File

@@ -241,6 +241,7 @@ The settings will take effect immediately!]],
notification = UI.Notification { },
filter = UI.SlideOut {
backgroundColor = colors.cyan,
noFill = true,
menuBar = UI.MenuBar {
buttons = {
{ text = 'Save', event = 'save' },
@@ -248,7 +249,8 @@ The settings will take effect immediately!]],
},
},
grid = UI.ScrollingGrid {
x = 2, ex = -6, y = 2, ey = -6,
x = 2, ex = -6, y = 3, ey = -7,
disableHeader = true,
columns = {
{ heading = 'Name', key = 'displayName' },
},
@@ -262,7 +264,7 @@ The settings will take effect immediately!]],
text = '-', event = 'remove_entry', help = 'Remove',
},
form = UI.Form {
x = 2, y = -4, height = 3,
x = 2, y = -5, height = 3,
margin = 1,
manualControls = true,
[1] = UI.Checkbox {

View File

@@ -8,7 +8,7 @@ local infoTab = UI.Tab {
index = 4,
backgroundColor = colors.cyan,
textArea = UI.TextArea {
x = 2, ex = -2, y = 2,
x = 2, ex = -2, y = 2, ey = -2,
},
}

View File

@@ -15,7 +15,7 @@ local setup = UI.SlideOut {
title = 'Remote Setup',
},
form = UI.Form {
x = 2, ex = -2, y = 2, ey = -1,
y = 2, ey = -1,
[1] = UI.TextEntry {
formLabel = 'Server', formKey = 'server',
help = 'ID for the server',
@@ -40,15 +40,15 @@ local setup = UI.SlideOut {
formLabel = 'Run on startup', formKey = 'runOnStartup',
help = 'Run this program on startup'
},
info = UI.TextArea {
x = 1, ex = -1, y = 6, ey = -4,
textColor = colors.yellow,
marginLeft = 0,
marginRight = 0,
value = [[The Milo turtle must connect to a manipulator with a ]] ..
[[bound introspection module. The neural interface must ]] ..
[[also have an introspection module.]],
},
},
info = UI.TextArea {
x = 2, ex = -2, y = 8, ey = -4,
textColor = colors.yellow,
marginLeft = 0,
marginRight = 0,
value = [[The Milo turtle must connect to a manipulator with a ]] ..
[[bound introspection module. The neural interface must ]] ..
[[also have an introspection module.]],
},
statusBar = UI.StatusBar {
backgroundColor = colors.cyan,

View File

@@ -86,6 +86,7 @@ local function createPage(node)
[1] = UI.Tab {
tabTitle = 'Overview',
backgroundColor = colors.black,
noFill = true,
onlineLabel = UI.Text {
x = 2, y = 2,
value = 'Storage Status',