Skip to content

Commit 12f3cfa

Browse files
pvandepvande
committed
Rename StatusPanel to ProjectPanel
1 parent 572ff63 commit 12f3cfa

File tree

11 files changed

+69
-68
lines changed

11 files changed

+69
-68
lines changed

‎getter.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
OpenConfig
2727
pressEnterToReturn
2828
previousContext
29+
ProjectTitle
2930
pruneImages
3031
PruningStatus
3132
remove
@@ -40,7 +41,6 @@
4041
RunningSubprocess
4142
scroll
4243
ServicesTitle
43-
StatusTitle
4444
stop
4545
StopContainer
4646
StoppingStatus
@@ -59,4 +59,4 @@
5959
puts "#{key}: \"#{value}\","
6060
end
6161
end
62-
end
62+
end

‎pkg/gui/gui.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ type containerPanelState struct {
8181
ContextIndex int // for specifying if you are looking at logs/stats/config/etc
8282
}
8383

84-
type statusState struct {
84+
type projectState struct {
8585
ContextIndex int // for specifying if you are looking at credits/logs
8686
}
8787

@@ -112,7 +112,7 @@ type panelStates struct {
112112
Main *mainPanelState
113113
Images *imagePanelState
114114
Volumes *volumePanelState
115-
Status *statusState
115+
Project *projectState
116116
}
117117

118118
type guiState struct {
@@ -142,14 +142,14 @@ func NewGui(log *logrus.Entry, dockerCommand *commands.DockerCommand, oSCommand
142142
Main: &mainPanelState{
143143
ObjectKey: "",
144144
},
145-
Status: &statusState{ContextIndex: 0},
145+
Project: &projectState{ContextIndex: 0},
146146
},
147147
SessionIndex: 0,
148148
}
149149

150-
cyclableViews := []string{"status", "containers", "images", "volumes"}
150+
cyclableViews := []string{"project", "containers", "images", "volumes"}
151151
if dockerCommand.InDockerComposeProject {
152-
cyclableViews = []string{"status", "services", "containers", "images", "volumes"}
152+
cyclableViews = []string{"project", "services", "containers", "images", "volumes"}
153153
}
154154

155155
gui := &Gui{

‎pkg/gui/keybindings.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -126,51 +126,51 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
126126
Handler: gui.handleCustomCommand,
127127
},
128128
{
129-
ViewName: "status",
129+
ViewName: "project",
130130
Key: 'e',
131131
Modifier: gocui.ModNone,
132132
Handler: gui.handleEditConfig,
133133
Description: gui.Tr.EditConfig,
134134
},
135135
{
136-
ViewName: "status",
136+
ViewName: "project",
137137
Key: 'o',
138138
Modifier: gocui.ModNone,
139139
Handler: gui.handleOpenConfig,
140140
Description: gui.Tr.OpenConfig,
141141
},
142142
{
143-
ViewName: "status",
143+
ViewName: "project",
144144
Key: '[',
145145
Modifier: gocui.ModNone,
146-
Handler: gui.handleStatusPrevContext,
146+
Handler: gui.handleProjectPrevContext,
147147
Description: gui.Tr.PreviousContext,
148148
},
149149
{
150-
ViewName: "status",
150+
ViewName: "project",
151151
Key: ']',
152152
Modifier: gocui.ModNone,
153-
Handler: gui.handleStatusNextContext,
153+
Handler: gui.handleProjectNextContext,
154154
Description: gui.Tr.NextContext,
155155
},
156156
{
157-
ViewName: "status",
157+
ViewName: "project",
158158
Key: gocui.MouseLeft,
159159
Modifier: gocui.ModNone,
160-
Handler: gui.handleStatusClick,
160+
Handler: gui.handleProjectClick,
161161
},
162162
{
163-
ViewName: "status",
163+
ViewName: "project",
164164
Key: 'm',
165165
Modifier: gocui.ModNone,
166166
Handler: gui.handleViewAllLogs,
167167
Description: gui.Tr.ViewLogs,
168168
},
169169
{
170-
ViewName: "status",
170+
ViewName: "project",
171171
Key: gocui.MouseLeft,
172172
Modifier: gocui.ModNone,
173-
Handler: gui.handleStatusSelect,
173+
Handler: gui.handleProjectSelect,
174174
},
175175
{
176176
ViewName: "menu",
@@ -430,7 +430,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
430430
}
431431

432432
// TODO: add more views here
433-
for _, viewName := range []string{"status", "services", "containers", "images", "volumes", "menu"} {
433+
for _, viewName := range []string{"project", "services", "containers", "images", "volumes", "menu"} {
434434
bindings = append(bindings, []*Binding{
435435
{ViewName: viewName, Key: gocui.KeyArrowLeft, Modifier: gocui.ModNone, Handler: gui.previousView},
436436
{ViewName: viewName, Key: gocui.KeyArrowRight, Modifier: gocui.ModNone, Handler: gui.nextView},
@@ -464,7 +464,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
464464
}...)
465465
}
466466

467-
for _, viewName := range []string{"status", "services", "containers", "images", "volumes"} {
467+
for _, viewName := range []string{"project", "services", "containers", "images", "volumes"} {
468468
bindings = append(bindings, &Binding{
469469
ViewName: viewName,
470470
Key: gocui.KeyEnter,

‎pkg/gui/layout.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
117117
if gui.DockerCommand.InDockerComposeProject {
118118
tallPanels++
119119
vHeights = map[string]int{
120-
"status": 3,
120+
"project": 3,
121121
"services": usableSpace/tallPanels + usableSpace%tallPanels,
122122
"containers": usableSpace / tallPanels,
123123
"images": usableSpace / tallPanels,
@@ -126,7 +126,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
126126
}
127127
} else {
128128
vHeights = map[string]int{
129-
"status": 3,
129+
"project": 3,
130130
"containers": usableSpace/tallPanels + usableSpace%tallPanels,
131131
"images": usableSpace / tallPanels,
132132
"volumes": usableSpace / tallPanels,
@@ -140,7 +140,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
140140
defaultHeight = 1
141141
}
142142
vHeights = map[string]int{
143-
"status": defaultHeight,
143+
"project": defaultHeight,
144144
"containers": defaultHeight,
145145
"images": defaultHeight,
146146
"volumes": defaultHeight,
@@ -176,19 +176,19 @@ func (gui *Gui) layout(g *gocui.Gui) error {
176176
v.IgnoreCarriageReturns = true
177177
}
178178

179-
if v, err := g.SetView("status", 0, 0, leftSideWidth, vHeights["status"]-1, gocui.BOTTOM|gocui.RIGHT); err != nil {
179+
if v, err := g.SetView("project", 0, 0, leftSideWidth, vHeights["project"]-1, gocui.BOTTOM|gocui.RIGHT); err != nil {
180180
if err.Error() != "unknown view" {
181181
return err
182182
}
183-
v.Title = gui.Tr.StatusTitle
183+
v.Title = gui.Tr.ProjectTitle
184184
v.FgColor = gocui.ColorDefault
185185
}
186186

187187
var servicesView *gocui.View
188-
aboveContainersView := "status"
188+
aboveContainersView := "project"
189189
if gui.DockerCommand.InDockerComposeProject {
190190
aboveContainersView = "services"
191-
servicesView, err = g.SetViewBeneath("services", "status", vHeights["services"])
191+
servicesView, err = g.SetViewBeneath("services", "project", vHeights["services"])
192192
if err != nil {
193193
if err.Error() != "unknown view" {
194194
return err

‎pkg/gui/main_panel.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ func (gui *Gui) onMainTabClick(tabIndex int) error {
5858
}
5959

6060
switch viewName {
61+
case "project":
62+
gui.State.Panels.Project.ContextIndex = tabIndex
63+
return gui.handleProjectSelect(gui.g, gui.getProjectView())
6164
case "services":
6265
gui.State.Panels.Services.ContextIndex = tabIndex
6366
return gui.handleServiceSelect(gui.g, gui.getServicesView())
@@ -70,9 +73,6 @@ func (gui *Gui) onMainTabClick(tabIndex int) error {
7073
case "volumes":
7174
gui.State.Panels.Volumes.ContextIndex = tabIndex
7275
return gui.handleVolumeSelect(gui.g, gui.getVolumesView())
73-
case "status":
74-
gui.State.Panels.Status.ContextIndex = tabIndex
75-
return gui.handleStatusSelect(gui.g, gui.getStatusView())
7676
}
7777

7878
return nil

‎pkg/gui/status_panel.go renamed to ‎pkg/gui/project_panel.go

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@ import (
1313
"github.com/jesseduffield/yaml"
1414
)
1515

16-
func (gui *Gui) getStatusContexts() []string {
16+
func (gui *Gui) getProjectContexts() []string {
1717
if gui.DockerCommand.InDockerComposeProject {
18-
return []string{"logs", "credits", "config"}
18+
return []string{"logs", "config", "credits"}
1919
}
2020
return []string{"credits"}
2121
}
2222

23-
func (gui *Gui) getStatusContextTitles() []string {
23+
func (gui *Gui) getProjectContextTitles() []string {
2424
if gui.DockerCommand.InDockerComposeProject {
25-
return []string{gui.Tr.LogsTitle, gui.Tr.CreditsTitle, gui.Tr.DockerComposeConfigTitle}
25+
return []string{gui.Tr.LogsTitle, gui.Tr.DockerComposeConfigTitle, gui.Tr.CreditsTitle}
2626
}
2727
return []string{gui.Tr.CreditsTitle}
2828
}
2929

30-
func (gui *Gui) refreshStatus() error {
31-
v := gui.getStatusView()
30+
func (gui *Gui) refreshProject() error {
31+
v := gui.getProjectView()
3232

3333
gui.g.Update(func(*gocui.Gui) error {
3434
v.Clear()
@@ -39,7 +39,7 @@ func (gui *Gui) refreshStatus() error {
3939
return nil
4040
}
4141

42-
func (gui *Gui) handleStatusClick(g *gocui.Gui, v *gocui.View) error {
42+
func (gui *Gui) handleProjectClick(g *gocui.Gui, v *gocui.View) error {
4343
if gui.popupPanelFocused() {
4444
return nil
4545
}
@@ -48,26 +48,26 @@ func (gui *Gui) handleStatusClick(g *gocui.Gui, v *gocui.View) error {
4848
return err
4949
}
5050

51-
return gui.handleStatusSelect(g, v)
51+
return gui.handleProjectSelect(g, v)
5252
}
5353

54-
func (gui *Gui) handleStatusSelect(g *gocui.Gui, v *gocui.View) error {
54+
func (gui *Gui) handleProjectSelect(g *gocui.Gui, v *gocui.View) error {
5555
if gui.popupPanelFocused() {
5656
return nil
5757
}
5858

59-
key := gui.getStatusContexts()[gui.State.Panels.Status.ContextIndex]
59+
key := gui.getProjectContexts()[gui.State.Panels.Project.ContextIndex]
6060
if !gui.shouldRefresh(key) {
6161
return nil
6262
}
6363

6464
gui.clearMainView()
6565

6666
mainView := gui.getMainView()
67-
mainView.Tabs = gui.getStatusContextTitles()
68-
mainView.TabIndex = gui.State.Panels.Status.ContextIndex
67+
mainView.Tabs = gui.getProjectContextTitles()
68+
mainView.TabIndex = gui.State.Panels.Project.ContextIndex
6969

70-
switch gui.getStatusContexts()[gui.State.Panels.Status.ContextIndex] {
70+
switch gui.getProjectContexts()[gui.State.Panels.Project.ContextIndex] {
7171
case "credits":
7272
if err := gui.renderCredits(); err != nil {
7373
return err
@@ -176,28 +176,28 @@ func lazydockerTitle() string {
176176
`
177177
}
178178

179-
func (gui *Gui) handleStatusNextContext(g *gocui.Gui, v *gocui.View) error {
180-
contexts := gui.getStatusContexts()
181-
if gui.State.Panels.Status.ContextIndex >= len(contexts)-1 {
182-
gui.State.Panels.Status.ContextIndex = 0
179+
func (gui *Gui) handleProjectNextContext(g *gocui.Gui, v *gocui.View) error {
180+
contexts := gui.getProjectContexts()
181+
if gui.State.Panels.Project.ContextIndex >= len(contexts)-1 {
182+
gui.State.Panels.Project.ContextIndex = 0
183183
} else {
184-
gui.State.Panels.Status.ContextIndex++
184+
gui.State.Panels.Project.ContextIndex++
185185
}
186186

187-
gui.handleStatusSelect(gui.g, v)
187+
gui.handleProjectSelect(gui.g, v)
188188

189189
return nil
190190
}
191191

192-
func (gui *Gui) handleStatusPrevContext(g *gocui.Gui, v *gocui.View) error {
193-
contexts := gui.getStatusContexts()
194-
if gui.State.Panels.Status.ContextIndex <= 0 {
195-
gui.State.Panels.Status.ContextIndex = len(contexts) - 1
192+
func (gui *Gui) handleProjectPrevContext(g *gocui.Gui, v *gocui.View) error {
193+
contexts := gui.getProjectContexts()
194+
if gui.State.Panels.Project.ContextIndex <= 0 {
195+
gui.State.Panels.Project.ContextIndex = len(contexts) - 1
196196
} else {
197-
gui.State.Panels.Status.ContextIndex--
197+
gui.State.Panels.Project.ContextIndex--
198198
}
199199

200-
gui.handleStatusSelect(gui.g, v)
200+
gui.handleProjectSelect(gui.g, v)
201201

202202
return nil
203203
}

‎pkg/gui/view_helpers.go

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ func (gui *Gui) refreshSidePanels(g *gocui.Gui) error {
1515
if err := gui.refreshImages(); err != nil {
1616
return err
1717
}
18-
if err := gui.refreshStatus(); err != nil {
18+
19+
if err := gui.refreshProject(); err != nil {
1920
return err
2021
}
2122

@@ -85,8 +86,8 @@ func (gui *Gui) newLineFocused(v *gocui.View) error {
8586
switch v.Name() {
8687
case "menu":
8788
return gui.handleMenuSelect(gui.g, v)
88-
case "status":
89-
return gui.handleStatusSelect(gui.g, v)
89+
case "project":
90+
return gui.handleProjectSelect(gui.g, v)
9091
case "services":
9192
return gui.handleServiceSelect(gui.g, v)
9293
case "containers":
@@ -236,6 +237,11 @@ func (gui *Gui) renderOptionsMap(optionsMap map[string]string) error {
236237
return gui.renderString(gui.g, "options", gui.optionsMapToString(optionsMap))
237238
}
238239

240+
func (gui *Gui) getProjectView() *gocui.View {
241+
v, _ := gui.g.View("project")
242+
return v
243+
}
244+
239245
func (gui *Gui) getServicesView() *gocui.View {
240246
v, _ := gui.g.View("services")
241247
return v
@@ -261,11 +267,6 @@ func (gui *Gui) getMainView() *gocui.View {
261267
return v
262268
}
263269

264-
func (gui *Gui) getStatusView() *gocui.View {
265-
v, _ := gui.g.View("status")
266-
return v
267-
}
268-
269270
func (gui *Gui) trimmedContent(v *gocui.View) string {
270271
return strings.TrimSpace(v.Buffer())
271272
}

‎pkg/i18n/dutch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func dutchSet() TranslationSet {
5656

5757
GlobalTitle: "Globaal",
5858
MainTitle: "Hooft",
59-
StatusTitle: "Staat",
59+
ProjectTitle: "Project",
6060
ServicesTitle: "Diensten",
6161
ContainersTitle: "Containers",
6262
StandaloneContainersTitle: "Alleenstaande Containers",

‎pkg/i18n/english.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ type TranslationSet struct {
55
AddFavourite string
66
ErrorMessage string
77
NotEnoughSpace string
8-
StatusTitle string
8+
ProjectTitle string
99
MainTitle string
1010
GlobalTitle string
1111
Navigate string
@@ -140,7 +140,7 @@ func englishSet() TranslationSet {
140140

141141
GlobalTitle: "Global",
142142
MainTitle: "Main",
143-
StatusTitle: "Status",
143+
ProjectTitle: "Project",
144144
ServicesTitle: "Services",
145145
ContainersTitle: "Containers",
146146
StandaloneContainersTitle: "Standalone Containers",

0 commit comments

Comments
 (0)