From 28150dcb6d76212e6b9612d2be739f265a4500aa Mon Sep 17 00:00:00 2001
From: Sven Dowideit <SvenDowideit@home.org.au>
Date: Sat, 17 Aug 2019 14:29:09 +1000
Subject: [PATCH] extract the titles to a common map

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
---
 pkg/app/app.go    |  2 --
 pkg/gui/layout.go | 25 ++++++++++++++++---------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/pkg/app/app.go b/pkg/app/app.go
index 1327d90b..65e261b8 100644
--- a/pkg/app/app.go
+++ b/pkg/app/app.go
@@ -1,7 +1,6 @@
 package app
 
 import (
-	"fmt"
 	"io"
 	"strings"
 
@@ -46,7 +45,6 @@ func NewApp(config *config.AppConfig) (*App, error) {
 	}
 
 	// TODO: detect if swarm mode is on..
-	fmt.Printf("SWARM: %s\n", app.Config.DockerSwarm)
 
 	app.Gui, err = gui.NewGui(app.Log, app.DockerCommand, app.OSCommand, app.Tr, app.Config, app.ErrorChan)
 	if err != nil {
diff --git a/pkg/gui/layout.go b/pkg/gui/layout.go
index 2379378b..65110a92 100644
--- a/pkg/gui/layout.go
+++ b/pkg/gui/layout.go
@@ -184,27 +184,34 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		v.IgnoreCarriageReturns = true
 	}
 
+	titles := map[string]string{
+		"project":    gui.Tr.ProjectTitle,
+		"services":   gui.Tr.ServicesTitle,
+		"containers": gui.Tr.StandaloneContainersTitle,
+		"images":     gui.Tr.ImagesTitle,
+		"volumes":    gui.Tr.VolumesTitle,
+	}
+	if gui.Config.UserConfig.Gui.ShowAllContainers || !showServicesPanel {
+		titles["containers"] = gui.Tr.ContainersTitle
+	}
+
 	if v, err := g.SetView("project", 0, 0, leftSideWidth, vHeights["project"]-1, gocui.BOTTOM|gocui.RIGHT); err != nil {
 		if err.Error() != "unknown view" {
 			return err
 		}
-		v.Title = gui.Tr.ProjectTitle
+		v.Title = titles["project"]
 		v.FgColor = gocui.ColorDefault
 	}
 
 	aboveContainersView := "project"
 	if showServicesPanel {
 		aboveContainersView = "services"
-		addView(g, "services", "project", gui.Tr.ServicesTitle, vHeights["services"])
+		addView(g, "services", "project", titles["services"], vHeights["services"])
 	}
 
-	containerTitle := gui.Tr.StandaloneContainersTitle
-	if gui.Config.UserConfig.Gui.ShowAllContainers || !showServicesPanel {
-		containerTitle = gui.Tr.ContainersTitle
-	}
-	addView(g, "containers", aboveContainersView, containerTitle, vHeights["containers"])
-	addView(g, "images", "containers", gui.Tr.ImagesTitle, vHeights["images"])
-	addView(g, "volumes", "images", gui.Tr.VolumesTitle, vHeights["volumes"])
+	addView(g, "containers", aboveContainersView, titles["containers"], vHeights["containers"])
+	addView(g, "images", "containers", titles["images"], vHeights["images"])
+	addView(g, "volumes", "images", titles["volumes"], vHeights["volumes"])
 
 	if v, err := g.SetView("options", appStatusOptionsBoundary-1, height-2, optionsVersionBoundary-1, height, 0); err != nil {
 		if err.Error() != "unknown view" {