diff options
author | JeffB42 <10328858+JeffB42@users.noreply.github.com> | 2021-04-17 20:23:00 +0300 |
---|---|---|
committer | JeffB42 <10328858+JeffB42@users.noreply.github.com> | 2021-04-17 20:23:00 +0300 |
commit | 548ecc274a20f81efd1e2c9fc699637db010611a (patch) | |
tree | 2225e9a94aa812f943e2886552847894996647fd | |
parent | 4b0effd141f53a57b94a50ba3eb1e8fa46bd2c68 (diff) |
added name parameter and removed parentPanel parameter
-rwxr-xr-x | ui/BedLevelPanel.go | 2 | ||||
-rwxr-xr-x | ui/ConfigurationPanel.go | 1 | ||||
-rwxr-xr-x | ui/MovePanel.go | 2 | ||||
-rwxr-xr-x | ui/NetworkPanel.go | 2 | ||||
-rwxr-xr-x | ui/TemperaturePanel.go | 1 | ||||
-rwxr-xr-x | ui/tool_changer_panel.go | 1 | ||||
-rwxr-xr-x | ui/z_offset_calibration_panel.go | 1 |
7 files changed, 3 insertions, 7 deletions
diff --git a/ui/BedLevelPanel.go b/ui/BedLevelPanel.go index d9fcf20..caa36da 100755 --- a/ui/BedLevelPanel.go +++ b/ui/BedLevelPanel.go @@ -28,7 +28,7 @@ func BedLevelPanel( ) *bedLevelPanel { if bedLevelPanelInstance == nil { instance := &bedLevelPanel { - CommonPanel: NewCommonPanel(ui), + CommonPanel: NewCommonPanel("BedLevelPanel", ui), } instance.initialize() bedLevelPanelInstance = instance diff --git a/ui/ConfigurationPanel.go b/ui/ConfigurationPanel.go index 636a315..82efb89 100755 --- a/ui/ConfigurationPanel.go +++ b/ui/ConfigurationPanel.go @@ -14,7 +14,6 @@ type configurationPanel struct { func ConfigurationPanel( ui *UI, - parentPanel interfaces.IPanel, ) *configurationPanel { if configurationPanelInstance == nil { instance := &configurationPanel { diff --git a/ui/MovePanel.go b/ui/MovePanel.go index afd36b0..2323c99 100755 --- a/ui/MovePanel.go +++ b/ui/MovePanel.go @@ -3,7 +3,7 @@ package ui import ( // "github.com/gotk3/gotk3/gtk" - "github.com/Z-Bolt/OctoScreen/interfaces" + // "github.com/Z-Bolt/OctoScreen/interfaces" // "github.com/Z-Bolt/OctoScreen/octoprintApis" "github.com/Z-Bolt/OctoScreen/octoprintApis/dataModels" "github.com/Z-Bolt/OctoScreen/uiWidgets" diff --git a/ui/NetworkPanel.go b/ui/NetworkPanel.go index 4d1f661..1feab9a 100755 --- a/ui/NetworkPanel.go +++ b/ui/NetworkPanel.go @@ -169,7 +169,7 @@ func (this *networkPanel) addNetwork(box *gtk.Box, ssid string) { frame, _ := gtk.FrameNew("") clicked := func() { - this.UI.GoToPanel(ConnectionPanel(this.UI, this, ssid)) + this.UI.GoToPanel(ConnectionPanel(this.UI, ssid)) } image := utils.MustImageFromFileWithSize("network.svg", this.Scaled(25), this.Scaled(25)) diff --git a/ui/TemperaturePanel.go b/ui/TemperaturePanel.go index 0640706..4e8eb04 100755 --- a/ui/TemperaturePanel.go +++ b/ui/TemperaturePanel.go @@ -30,7 +30,6 @@ type temperaturePanel struct { func TemperaturePanel( ui *UI, - parentPanel interfaces.IPanel, ) *temperaturePanel { if temperaturePanelInstance == nil { temperaturePanelInstance = &temperaturePanel{ diff --git a/ui/tool_changer_panel.go b/ui/tool_changer_panel.go index b4c0723..9e9f648 100755 --- a/ui/tool_changer_panel.go +++ b/ui/tool_changer_panel.go @@ -23,7 +23,6 @@ type toolChangerPanel struct { func ToolChangerPanel( ui *UI, - parentPanel interfaces.IPanel, ) *toolChangerPanel { if toolChangerPanelInstance == nil { this := &toolChangerPanel { diff --git a/ui/z_offset_calibration_panel.go b/ui/z_offset_calibration_panel.go index c61e6b6..7cefa6f 100755 --- a/ui/z_offset_calibration_panel.go +++ b/ui/z_offset_calibration_panel.go @@ -45,7 +45,6 @@ type zOffsetCalibrationPanel struct { func ZOffsetCalibrationPanel( ui *UI, - parentPanel interfaces.IPanel, ) *zOffsetCalibrationPanel { if zOffsetCalibrationPanelInstance == nil { instane := &zOffsetCalibrationPanel { |