feat: add better icon parsing for Windows
This commit is contained in:
14882
src/icon.go
14882
src/icon.go
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 174 KiB After Width: | Height: | Size: 174 KiB |
10
src/main.go
10
src/main.go
@@ -6,6 +6,7 @@ import (
|
|||||||
"fyne.io/fyne/v2"
|
"fyne.io/fyne/v2"
|
||||||
"fyne.io/fyne/v2/app"
|
"fyne.io/fyne/v2/app"
|
||||||
"fyne.io/fyne/v2/container"
|
"fyne.io/fyne/v2/container"
|
||||||
|
"fyne.io/fyne/v2/dialog"
|
||||||
"fyne.io/fyne/v2/theme"
|
"fyne.io/fyne/v2/theme"
|
||||||
"fyne.io/fyne/v2/widget"
|
"fyne.io/fyne/v2/widget"
|
||||||
|
|
||||||
@@ -23,6 +24,8 @@ const (
|
|||||||
appName string = "Systemec RaspScreen"
|
appName string = "Systemec RaspScreen"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
//go:embed icon.ico
|
||||||
|
var iconData []byte
|
||||||
var (
|
var (
|
||||||
windowSize fyne.Size = fyne.NewSize(750, 700) // Default Window size
|
windowSize fyne.Size = fyne.NewSize(750, 700) // Default Window size
|
||||||
buttonSize fyne.Size = fyne.NewSize(200, 50) // Default button size
|
buttonSize fyne.Size = fyne.NewSize(200, 50) // Default button size
|
||||||
@@ -31,8 +34,6 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
cfg := readConfig()
|
|
||||||
|
|
||||||
iconResource := fyne.NewStaticResource("./src/icon.ico", iconData)
|
iconResource := fyne.NewStaticResource("./src/icon.ico", iconData)
|
||||||
//iconResource, _ := fyne.LoadResourceFromURLString("https://www.systemec.nl/favicon.ico")
|
//iconResource, _ := fyne.LoadResourceFromURLString("https://www.systemec.nl/favicon.ico")
|
||||||
//iconResource, _ := fyne.LoadResourceFromPath("./icon.ico")
|
//iconResource, _ := fyne.LoadResourceFromPath("./icon.ico")
|
||||||
@@ -45,6 +46,11 @@ func main() {
|
|||||||
w.Resize(windowSize)
|
w.Resize(windowSize)
|
||||||
w.SetIcon(iconResource)
|
w.SetIcon(iconResource)
|
||||||
|
|
||||||
|
cfg, ok := readConfig()
|
||||||
|
if !ok {
|
||||||
|
dialog.ShowInformation("Failed to initialize", "Failed to read or unmarshal the raspis.yaml", w)
|
||||||
|
}
|
||||||
|
|
||||||
raspiNames := getRaspiNames(cfg)
|
raspiNames := getRaspiNames(cfg)
|
||||||
|
|
||||||
// Define variables and print them out for debug
|
// Define variables and print them out for debug
|
||||||
|
|||||||
10
src/raspi.go
10
src/raspi.go
@@ -19,16 +19,18 @@ type RaspiConfig struct {
|
|||||||
Raspis []RaspberryPi `yaml:"raspis"`
|
Raspis []RaspberryPi `yaml:"raspis"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func readConfig() RaspiConfig {
|
func readConfig() (RaspiConfig, bool) {
|
||||||
data, err := os.ReadFile("raspis.yaml")
|
data, err := os.ReadFile("raspis.yaml")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("Failed to read config YAML file (raspis.yaml): %v", err)
|
log.Printf("Failed to read config YAML file (raspis.yaml): %v", err)
|
||||||
|
return RaspiConfig{}, false
|
||||||
}
|
}
|
||||||
|
|
||||||
var cfg RaspiConfig
|
var cfg RaspiConfig
|
||||||
if err := yaml.Unmarshal(data, &cfg); err != nil {
|
if err := yaml.Unmarshal(data, &cfg); err != nil {
|
||||||
log.Fatalf("Failed to parse YAML file (raspis.yaml): %v", err)
|
log.Printf("Failed to parse YAML file (raspis.yaml): %v", err)
|
||||||
|
return RaspiConfig{}, false
|
||||||
}
|
}
|
||||||
|
|
||||||
return cfg
|
return cfg, true
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user