diff options
author | JeffB42 <10328858+JeffB42@users.noreply.github.com> | 2020-07-31 06:58:13 +0300 |
---|---|---|
committer | JeffB42 <10328858+JeffB42@users.noreply.github.com> | 2020-07-31 06:58:13 +0300 |
commit | 7d0fc084752d29b8c545b85d90e6e83637bd021e (patch) | |
tree | d0871510a84345e1c1bb9d1b7703c6fe7b86ffb6 | |
parent | 238a76063bbf03c026c2e72c230c7e313a4d1fde (diff) |
fixed typo, renamed getDeafultMenu to getDefaultMenu2.5.1-dev
-rw-r--r-- | ui/idle_status.go | 18 | ||||
-rw-r--r-- | ui/menu.go | 3 |
2 files changed, 9 insertions, 12 deletions
diff --git a/ui/idle_status.go b/ui/idle_status.go index 1eb68d2..564d645 100644 --- a/ui/idle_status.go +++ b/ui/idle_status.go @@ -42,7 +42,7 @@ func (m *idleStatusPanel) initialize() { if m.UI.Settings == nil || len(m.UI.Settings.MenuStructure) == 0 { Logger.Info("Loading default menu") - menuItems = getDeafultMenu() + menuItems = getDefaultMenu() } else { Logger.Info("Loading octo menu") menuItems = m.UI.Settings.MenuStructure @@ -82,29 +82,28 @@ func (m *idleStatusPanel) showTools() { g := MustGrid() g.SetRowHomogeneous(true) g.SetColumnHomogeneous(true) - m.Grid().Attach(g, 1, 0, 2, 3) - - g.Attach(m.tool0, 1, 0, 2, 1) - g.Attach(m.bed, 1, 1, 2, 1) + g.Attach(m.tool0, 1, 0, 2, 1) + g.Attach(m.bed, 1, 1, 2, 1) case 2: m.Grid().Attach(m.tool0, 1, 0, 2, 1) m.Grid().Attach(m.tool1, 1, 1, 2, 1) - m.Grid().Attach(m.bed, 1, 2, 2, 1) + m.Grid().Attach(m.bed, 1, 2, 2, 1) + case 3: m.Grid().Attach(m.tool0, 1, 0, 1, 1) m.Grid().Attach(m.tool1, 2, 0, 1, 1) m.Grid().Attach(m.tool2, 1, 1, 2, 1) - m.Grid().Attach(m.bed, 1, 2, 2, 1) + m.Grid().Attach(m.bed, 1, 2, 2, 1) + case 4: m.Grid().Attach(m.tool0, 1, 0, 1, 1) m.Grid().Attach(m.tool1, 2, 0, 1, 1) m.Grid().Attach(m.tool2, 1, 1, 1, 1) m.Grid().Attach(m.tool3, 2, 1, 1, 1) - m.Grid().Attach(m.bed, 1, 2, 2, 1) + m.Grid().Attach(m.bed, 1, 2, 2, 1) } - } func (m *idleStatusPanel) updateTemperature() { @@ -159,7 +158,6 @@ type ToolHeatup struct { } func ToolHeatupNew(num int, printer *octoprint.Client) *ToolHeatup { - var ( image string tool string @@ -67,8 +67,7 @@ func (m *menuPanel) initialize() { m.arrangeMenuItems(m.g, m.items, 4) } -func getDeafultMenu() []octoprint.MenuItem { - +func getDefaultMenu() []octoprint.MenuItem { default_menu := `[ { "name": "Home", |