Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Z-Bolt/OctoScreen.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorJeffB42 <10328858+JeffB42@users.noreply.github.com>2021-04-17 19:09:02 +0300
committerJeffB42 <10328858+JeffB42@users.noreply.github.com>2021-04-17 19:09:02 +0300
commit2ac3639227df2fceb4ddb359740f6e9787834353 (patch)
treec0f4bc3c3902abc6188f7b9c2ebb441ddcae6bfd /ui
parentef3e99af798ad40167638be732415cdbb66ad023 (diff)
moved var OctoScreenVersion into environment.go
Diffstat (limited to 'ui')
-rwxr-xr-xui/CommonPanel.go3
-rwxr-xr-xui/SystemPanel.go4
2 files changed, 2 insertions, 5 deletions
diff --git a/ui/CommonPanel.go b/ui/CommonPanel.go
index f2df85f..b0e7758 100755
--- a/ui/CommonPanel.go
+++ b/ui/CommonPanel.go
@@ -15,9 +15,6 @@ import (
"github.com/Z-Bolt/OctoScreen/utils"
)
-// OctoScreenVersion - set at compilation time.
-var OctoScreenVersion = "2.7.3"
-
type CommonPanel struct {
UI *UI
grid *gtk.Grid
diff --git a/ui/SystemPanel.go b/ui/SystemPanel.go
index e297950..bae1e00 100755
--- a/ui/SystemPanel.go
+++ b/ui/SystemPanel.go
@@ -5,7 +5,7 @@ import (
"github.com/Z-Bolt/OctoScreen/interfaces"
"github.com/Z-Bolt/OctoScreen/uiWidgets"
- // "github.com/Z-Bolt/OctoScreen/utils"
+ "github.com/Z-Bolt/OctoScreen/utils"
)
var systemPanelInstance *systemPanel = nil
@@ -51,7 +51,7 @@ func (this *systemPanel) initialize() {
this.octoPrintInfoBox = uiWidgets.CreateOctoPrintInfoBox(this.UI.Client, logoWidth)
this.Grid().Attach(this.octoPrintInfoBox, 0, 0, 1, 1)
- this.octoScreenInfoBox = uiWidgets.CreateOctoScreenInfoBox(this.UI.Client, OctoScreenVersion)
+ this.octoScreenInfoBox = uiWidgets.CreateOctoScreenInfoBox(this.UI.Client, utils.OctoScreenVersion)
this.Grid().Attach(this.octoScreenInfoBox, 1, 0, 2, 1)
this.octoScreenPluginInfoBox = uiWidgets.CreateOctoScreenPluginInfoBox(this.UI.Client, this.UI.UIState, this.UI.OctoPrintPluginIsAvailable)