*: cosmetic changes

Signed-off-by: Máximo Cuadros <[email protected]>

ui/common.go

@@ -3,6 +3,7 @@ package ui
 import (
 	"fmt"
 	"log"
+	"math"
 	"sync"
 	"time"
 
@@ -11,6 +12,7 @@ import (
 )
 
 const panelW = 4
+const panelH = 2
 
 type Panel interface {
 	Grid() *gtk.Grid
@@ -37,11 +39,17 @@ func NewCommonPanel(ui *UI) CommonPanel {
 }
 
 func (p *CommonPanel) Initialize() {
-	for i := 1; i <= panelW; i++ {
-		p.grid.Attach(MustBox(gtk.ORIENTATION_HORIZONTAL, 0), i, 0, 1, 1)
+	last := panelW * panelH
+	if last < len(p.buttons) {
+		cols := math.Ceil(float64(len(p.buttons)) / float64(panelW))
+		last = int(cols) * panelW
 	}
 
-	p.grid.Attach(MustButtonImage("Back", "back.svg", p.UI.ShowDefaultPanel), 4, 1, 1, 1)
+	for i := len(p.buttons) + 1; i < last; i++ {
+		p.AddButton(MustBox(gtk.ORIENTATION_HORIZONTAL, 0))
+	}
+
+	p.AddButton(MustButtonImage("Back", "back.svg", p.UI.ShowDefaultPanel))
 }
 
 func (p *CommonPanel) AddButton(b gtk.IWidget) {

ui/control.go

@@ -29,7 +29,7 @@ func NewControlPanel(ui *UI) *ControlPanel {
 }
 
 func (m *ControlPanel) initialize() {
-	m.Initialize()
+	defer m.Initialize()
 
 	for _, c := range m.getControl() {
 		b := m.createControlButton(c)

ui/filament.go

@@ -31,7 +31,7 @@ func NewFilamentPanel(ui *UI) *FilamentPanel {
 }
 
 func (m *FilamentPanel) initialize() {
-	m.Initialize()
+	defer m.Initialize()
 
 	m.grid.Attach(m.createExtrudeButton("Extrude", "extrude.svg", 1), 1, 0, 1, 1)
 	m.grid.Attach(m.createExtrudeButton("Retract", "retract.svg", -1), 4, 0, 1, 1)
@@ -79,7 +79,7 @@ func (m *FilamentPanel) loadTemperatureState(s *octoprint.TemperatureState) {
 func (m *FilamentPanel) addNewTool(tool string) {
 	m.labels[tool] = MustLabelWithImage("extruder.svg", "")
 	m.box.Add(m.labels[tool])
-	m.tool.AddStep(Step{tool, tool})
+	m.tool.AddStep(Step{strings.Title(tool), tool})
 
 	Logger.Infof("New tool detected %s", tool)
 }

ui/home.go

@@ -16,7 +16,7 @@ func NewHomePanel(ui *UI) *HomePanel {
 }
 
 func (m *HomePanel) initialize() {
-	m.Initialize()
+	defer m.Initialize()
 
 	m.AddButton(m.createMoveButton("Home All", "home.svg",
 		octoprint.XAxis, octoprint.YAxis, octoprint.ZAxis,

ui/move.go

@@ -19,7 +19,7 @@ func NewMovePanel(ui *UI) Panel {
 }
 
 func (m *MovePanel) initialize() {
-	m.Initialize()
+	defer m.Initialize()
 
 	m.AddButton(m.createMoveButton("X+", "move-x+.svg", octoprint.XAxis, 1))
 	m.AddButton(m.createMoveButton("Y+", "move-y+.svg", octoprint.YAxis, 1))

ui/splash.go

@@ -27,7 +27,3 @@ func (m *SplashPanel) initialize() {
 
 	m.grid.Attach(box, 1, 0, 1, 1)
 }
-
-func (m *SplashPanel) Connect() {
-
-}

ui/status.go

@@ -28,11 +28,12 @@ func NewStatusPanel(ui *UI) *StatusPanel {
 }
 
 func (m *StatusPanel) initialize() {
+	defer m.Initialize()
+
 	m.grid.Attach(m.createMainBox(), 1, 0, 4, 1)
 	m.grid.Attach(m.createPrintButton(), 1, 1, 1, 1)
 	m.grid.Attach(m.createPauseButton(), 2, 1, 1, 1)
 	m.grid.Attach(m.createStopButton(), 3, 1, 1, 1)
-	m.grid.Attach(MustButtonImage("Return", "back.svg", m.UI.ShowDefaultPanel), 4, 1, 1, 1)
 
 	m.grid.Connect("show", m.Show)
 }
@@ -199,7 +200,12 @@ func (m *StatusPanel) updateJob() {
 		return
 	}
 
-	m.file.Label.SetLabel(fmt.Sprintf("File: %s", filenameEllipsis(s.Job.File.Name)))
+	file := "<not-set>"
+	if s.Job.File.Name != "" {
+		file = filenameEllipsis(s.Job.File.Name)
+	}
+
+	m.file.Label.SetLabel(fmt.Sprintf("File: %s", file))
 	m.pb.SetFraction(s.Progress.Completion / 100)
 
 	if m.UI.State.IsOperational() {

ui/temperature.go

@@ -30,7 +30,7 @@ func NewTemperaturePanel(ui *UI) *TemperaturePanel {
 }
 
 func (m *TemperaturePanel) initialize() {
-	m.Initialize()
+	defer m.Initialize()
 
 	m.grid.Attach(m.createChangeButton("Increase", "increase.svg", 1), 1, 0, 1, 1)
 	m.grid.Attach(m.createChangeButton("Decrease", "decrease.svg", -1), 4, 0, 1, 1)