Remove mainnet migration UI elements

mysteriumnetwork · Nov 3, 2022 · e004412 · e004412
1 parent 9d9d805
commit e004412
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 71 deletions.
diff --git a/cmd/app/app.go b/cmd/app/app.go
@@ -58,7 +58,7 @@ func main() {
 		}
 	}
 	if debugMode {
-		utils.AllocConsole()
+		utils.AllocConsole(false)
 	}
 
 	mod := model.NewUIModel()

diff --git a/gui-win32/state_frame.go b/gui-win32/state_frame.go
@@ -37,9 +37,6 @@ type StateFrame struct {
 	lbNetworkMode     *walk.Label
 	btnOpenNodeConfig *walk.PushButton
 
-	lbNetwork  *walk.Label
-	btnMainNet *walk.PushButton
-
 	cmp              *walk.Composite
 	headerContainer  *walk.Composite
 	lbNodeUI         *walk.LinkLabel
@@ -139,50 +136,6 @@ func NewStateFrame(parent walk.Container, mdl *model.UIModel) *StateFrame {
 						Text: "",
 					},
 
-					Label{
-						Text: "Network",
-					},
-					Composite{
-						Alignment: AlignHNearVCenter,
-						Layout: HBox{
-							MarginsZero: true,
-							Spacing:     0,
-						},
-
-						Children: []Widget{
-							Label{
-								Text:      "-",
-								AssignTo:  &f.lbNetwork,
-								Alignment: AlignHNearVCenter,
-							},
-							PushButton{
-								Alignment: AlignHNearVCenter,
-								Enabled:   true,
-								AssignTo:  &f.btnMainNet,
-								Text:      "Update to MainNet..",
-
-								OnSizeChanged: func() {
-									f.btnMainNet.SetWidthPixels(115)
-								},
-								OnClicked: func() {
-									mdl.UIBus.Publish("btn-upgrade-network")
-								},
-							},
-							//HSpacer{StretchFactor: 0},
-						},
-					},
-					Label{
-						Text: "",
-					},
-					LinkLabel{
-						Text: "<a>Information about MainNet</a>",
-						OnLinkActivated: func(link *walk.LinkLabelLink) {
-							utils.OpenUrlInBrowser("https://mysterium.network/")
-						},
-						Alignment: AlignHNearVNear,
-					},
-					VSpacer{ColumnSpan: 2, Size: 10},
-
 					Label{
 						Text: "Node package source",
 					},
@@ -383,8 +336,6 @@ func (f *StateFrame) handlerState() {
 
 			f.lbImageName.SetText(f.mdl.Config.GetFullImageName())
 
-			f.lbNetwork.SetText(f.mdl.Config.GetNetworkCaption())
-			f.btnMainNet.SetVisible(!f.mdl.CurrentNetIsMainNet())
 			f.lbUpdateLauncher.SetVisible(f.mdl.LauncherHasUpdate)
 		}
 	})

diff --git a/utils/utils_unix.go b/utils/utils_unix.go
@@ -19,15 +19,6 @@ func getSysProcAttrs() syscall.SysProcAttr {
 	return syscall.SysProcAttr{}
 }
 
-// func IsProcessRunning(name string) bool {
-// 	res, err := CmdRun(nil, "pgrep", "-xq", "--", `^`+name)
-// 	if err == nil {
-// 		return res == 0
-// 	}
-// 	log.Println("IsProcessRunning error:", err)
-// 	return false
-// }
-
 func LauncherUpgradeAvailable() bool {
 	return false
 }
@@ -63,3 +54,7 @@ func CheckAndInstallExe() error {
 func RunasWithArgsAndWait(cmdArgs string) error {
 	panic("not implemented")
 }
+
+func EnableAutorun(en bool) error {
+    return nil
+}
diff --git a/utils/utils_win32.go b/utils/utils_win32.go
@@ -22,14 +22,14 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/scjalliance/comshim"
-		"github.com/blang/semver/v4"
+	"github.com/blang/semver/v4"
 	"github.com/go-ole/go-ole"
 	"github.com/go-ole/go-ole/oleutil"
 	"github.com/gonutz/w32"
 	"github.com/lxn/walk"
 	"github.com/mysteriumnetwork/go-fileversion"
 	"github.com/pkg/errors"
+	"github.com/scjalliance/comshim"
 	"github.com/winlabs/gowin32"
 	"golang.org/x/sys/windows"
 	"golang.org/x/sys/windows/registry"
@@ -53,7 +53,7 @@ func getSysProcAttrs() syscall.SysProcAttr {
 func CreateShortcut(dst, target, args string) error {
 	comshim.Add(1)
 	defer comshim.Done()
-	
+
 	oleShellObject, err := oleutil.CreateObject("WScript.Shell")
 	if err != nil {
 		return err
@@ -171,9 +171,9 @@ func EnableAutorun(en bool) error {
 	defer k.Close()
 
 	if en {
-		return k.SetBinaryValue(launcherLnk, []byte{2,0,0})
+		return k.SetBinaryValue(launcherLnk, []byte{2, 0, 0})
 	}
-	return k.SetBinaryValue(launcherLnk, []byte{3,0,0})
+	return k.SetBinaryValue(launcherLnk, []byte{3, 0, 0})
 }
 
 // should be executed with admin's privileges
@@ -539,14 +539,17 @@ func OpenUrlInBrowser(url string) {
 // win32 console utils. Borrowed from https://github.com/yuk7/wsldl/blob/main/src/lib/utils/utils.go
 
 // AllocConsole calls AllocConsole API in Windows kernel32
-func AllocConsole() {
+func AllocConsole(attach bool) {
 	kernel32, _ := syscall.LoadDLL("Kernel32.dll")
-	alloc, _ := kernel32.FindProc("AllocConsole")
-	alloc.Call()
-
-// 	attach, _ := kernel32.FindProc("AttachConsole")
-// 	const ATTACH_PARENT_PROCESS = ^uintptr(0)
-// 	attach.Call(ATTACH_PARENT_PROCESS)
+
+	if attach {
+		attach, _ := kernel32.FindProc("AttachConsole")
+		const ATTACH_PARENT_PROCESS = ^uintptr(0)
+		attach.Call(ATTACH_PARENT_PROCESS)
+	} else {
+		alloc, _ := kernel32.FindProc("AllocConsole")
+		alloc.Call()
+	}
 
 	hout, _ := syscall.GetStdHandle(syscall.STD_OUTPUT_HANDLE)
 	herr, _ := syscall.GetStdHandle(syscall.STD_ERROR_HANDLE)