diff --git a/.github/workflows/cross-compile.yaml b/.github/workflows/cross-compile.yaml index 77d7c06..c2db5ed 100644 --- a/.github/workflows/cross-compile.yaml +++ b/.github/workflows/cross-compile.yaml @@ -230,7 +230,7 @@ jobs: export CC=x86_64-w64-mingw32-gcc export CXX=x86_64-w64-mingw32-g++ export CGO_LDFLAGS="-static-libgcc -static-libstdc++" - go-winres simply --icon ./src/icon.ico --manifest gui + go-winres simply --icon ./src/Icon.png --manifest gui mv *.syso ./src go build -o ./patchworks.exe -ldflags -H=windowsgui ./src @@ -242,7 +242,7 @@ jobs: export CC=x86_64-w64-mingw32-gcc export CXX=x86_64-w64-mingw32-g++ export CGO_LDFLAGS="-static-libgcc -static-libstdc++" - go-winres simply --icon ./src/icon.ico --manifest gui + go-winres simply --icon ./src/Icon.png --manifest gui mv *.syso ./src go build -o ./patchworks-debug.exe ./src diff --git a/src/Icon.png b/src/Icon.png new file mode 100644 index 0000000..27c779d Binary files /dev/null and b/src/Icon.png differ diff --git a/src/define.go b/src/define.go index fa5dbce..dcee471 100644 --- a/src/define.go +++ b/src/define.go @@ -4,4 +4,4 @@ import "fyne.io/fyne/v2" var ( windowSize fyne.Size = fyne.NewSize(1280, 720) -) +) \ No newline at end of file diff --git a/src/main.go b/src/main.go index b152bef..1309780 100644 --- a/src/main.go +++ b/src/main.go @@ -15,7 +15,7 @@ import ( _ "embed" ) -//go:embed icon.ico +//go:embed Icon.png var iconData []byte func main() { @@ -24,7 +24,7 @@ func main() { return } - iconResource := fyne.NewStaticResource("./src/icon.ico", iconData) + iconResource := fyne.NewStaticResource("./src/Icon.png", iconData) app := app.NewWithID("nl.nerthus.patchworks") app.Settings().SetTheme(theme.DefaultTheme()) @@ -37,7 +37,9 @@ func main() { passEntry := widget.NewPasswordEntry() targEntry := widget.NewEntry() var book string + inputContainer := draw.MakeInputContainer(userEntry, passEntry, targEntry, &book, w) + infoContainer := draw.MakeInfoContainer() content := container.NewBorder( nil, // top diff --git a/src/modules/draw/draw.go b/src/modules/draw/draw.go index d65ed61..834dc32 100644 --- a/src/modules/draw/draw.go +++ b/src/modules/draw/draw.go @@ -18,14 +18,14 @@ func MakeInputContainer(userEntry, passEntry, targEntry *widget.Entry, book *str } loginBox := container.NewVBox( - widget.NewLabel("Service Username"), + widget.NewLabel("MeshCentral Username"), userEntry, - widget.NewLabel("Service Password"), + widget.NewLabel("MeshCentral Password"), passEntry, ) targetBox := container.NewVBox( - widget.NewLabel("Target Device or Group"), + widget.NewLabel("MeshCentral Target Device or Group"), targEntry, ) @@ -59,3 +59,7 @@ func MakeInputContainer(userEntry, passEntry, targEntry *widget.Entry, book *str return inputBox } + +func MakeInfoContainer(book *string) *fyne.Container { + +}