extract the titles to a common map

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit 2019-08-17 14:29:09 +10:00
parent 68c020c103
commit 28150dcb6d
2 changed files with 16 additions and 11 deletions

View file

@ -1,7 +1,6 @@
package app package app
import ( import (
"fmt"
"io" "io"
"strings" "strings"
@ -46,7 +45,6 @@ func NewApp(config *config.AppConfig) (*App, error) {
} }
// TODO: detect if swarm mode is on.. // 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) app.Gui, err = gui.NewGui(app.Log, app.DockerCommand, app.OSCommand, app.Tr, app.Config, app.ErrorChan)
if err != nil { if err != nil {

View file

@ -184,27 +184,34 @@ func (gui *Gui) layout(g *gocui.Gui) error {
v.IgnoreCarriageReturns = true 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 v, err := g.SetView("project", 0, 0, leftSideWidth, vHeights["project"]-1, gocui.BOTTOM|gocui.RIGHT); err != nil {
if err.Error() != "unknown view" { if err.Error() != "unknown view" {
return err return err
} }
v.Title = gui.Tr.ProjectTitle v.Title = titles["project"]
v.FgColor = gocui.ColorDefault v.FgColor = gocui.ColorDefault
} }
aboveContainersView := "project" aboveContainersView := "project"
if showServicesPanel { if showServicesPanel {
aboveContainersView = "services" aboveContainersView = "services"
addView(g, "services", "project", gui.Tr.ServicesTitle, vHeights["services"]) addView(g, "services", "project", titles["services"], vHeights["services"])
} }
containerTitle := gui.Tr.StandaloneContainersTitle addView(g, "containers", aboveContainersView, titles["containers"], vHeights["containers"])
if gui.Config.UserConfig.Gui.ShowAllContainers || !showServicesPanel { addView(g, "images", "containers", titles["images"], vHeights["images"])
containerTitle = gui.Tr.ContainersTitle addView(g, "volumes", "images", titles["volumes"], vHeights["volumes"])
}
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"])
if v, err := g.SetView("options", appStatusOptionsBoundary-1, height-2, optionsVersionBoundary-1, height, 0); err != nil { if v, err := g.SetView("options", appStatusOptionsBoundary-1, height-2, optionsVersionBoundary-1, height, 0); err != nil {
if err.Error() != "unknown view" { if err.Error() != "unknown view" {