From ccfee260c14fa53ac6f16a1ce249dec89af5dc64 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 14 May 2019 14:02:33 +0200 Subject: ui: centralize state labels --- ui/confview.go | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) (limited to 'ui/confview.go') diff --git a/ui/confview.go b/ui/confview.go index 11226cc4..869ba229 100644 --- a/ui/confview.go +++ b/ui/confview.go @@ -108,22 +108,7 @@ func (lsl *labelStatusLine) update(state service.TunnelState) { } lsl.statusImage.SetImage(img) s, e := lsl.statusLabel.TextSelection() - switch state { - case service.TunnelStarted: - lsl.statusLabel.SetText("Active") - - case service.TunnelStarting: - lsl.statusLabel.SetText("Activating") - - case service.TunnelStopped: - lsl.statusLabel.SetText("Inactive") - - case service.TunnelStopping: - lsl.statusLabel.SetText("Deactivating") - - case service.TunnelUnknown: - lsl.statusLabel.SetText("Unknown state") - } + lsl.statusLabel.SetText(textForState(state, false)) lsl.statusLabel.SetTextSelection(s, e) } @@ -208,16 +193,10 @@ func (tal *toggleActiveLine) update(state service.TunnelState) { switch state { case service.TunnelStarted: text = "Deactivate" - - case service.TunnelStarting: - text = "Activating..." - case service.TunnelStopped: text = "Activate" - - case service.TunnelStopping: - text = "Deactivating..." - + case service.TunnelStarting, service.TunnelStopping: + text = textForState(state, true) default: text = "" } -- cgit v1.2.3-59-g8ed1b