From d52f97429d6c2fb24fa29ba42d3b13b43dde1e08 Mon Sep 17 00:00:00 2001
From: aynakeya <aynakeya.official@gmail.com>
Date: Wed, 10 Apr 2024 00:52:59 -0700
Subject: [PATCH] make width height configurable

---
 gui/gui.go                   | 8 ++++----
 internal/init.go             | 2 ++
 pkg/config/config.go         | 2 +-
 pkg/config/config_general.go | 4 ++++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/gui/gui.go b/gui/gui.go
index b3486ea..edd2043 100644
--- a/gui/gui.go
+++ b/gui/gui.go
@@ -4,7 +4,7 @@ import (
 	"AynaLivePlayer/core/events"
 	"AynaLivePlayer/core/model"
 	"AynaLivePlayer/global"
-	config2 "AynaLivePlayer/pkg/config"
+	"AynaLivePlayer/pkg/config"
 	"AynaLivePlayer/pkg/event"
 	"AynaLivePlayer/pkg/i18n"
 	"AynaLivePlayer/resource"
@@ -36,7 +36,7 @@ func Initialize() {
 	//os.Setenv("FYNE_FONT", config.GetAssetPath("msyh.ttc"))
 	App = app.New()
 	App.Settings().SetTheme(&myTheme{})
-	MainWindow = App.NewWindow(fmt.Sprintf("%s Ver %s", config2.ProgramName, model.Version(config2.Version)))
+	MainWindow = App.NewWindow(fmt.Sprintf("%s Ver %s", config.ProgramName, model.Version(config.Version)))
 
 	tabs := container.NewAppTabs(
 		container.NewTabItem(i18n.T("gui.tab.player"),
@@ -63,7 +63,7 @@ func Initialize() {
 	MainWindow.SetIcon(resource.ImageIcon)
 	MainWindow.SetContent(tabs)
 	//MainWindow.Resize(fyne.NewSize(1280, 720))
-	MainWindow.Resize(fyne.NewSize(960, 480))
+	MainWindow.Resize(fyne.NewSize(config.General.Width, config.General.Height))
 
 	setupPlayerWindow()
 
@@ -78,7 +78,7 @@ func Initialize() {
 			dialog.ShowError(err, MainWindow)
 		})
 
-	//MainWindow.SetFixedSize(true)
+	MainWindow.SetFixedSize(true)
 	//if config2.General.AutoCheckUpdate {
 	//	go checkUpdate()
 	//}
diff --git a/internal/init.go b/internal/init.go
index cada5a8..2fa8bfb 100644
--- a/internal/init.go
+++ b/internal/init.go
@@ -1,6 +1,8 @@
 package internal
 
 import (
+	_ "github.com/AynaLivePlayer/miaosic/providers/bilibili"
 	_ "github.com/AynaLivePlayer/miaosic/providers/bilivideo"
+	_ "github.com/AynaLivePlayer/miaosic/providers/kuwo"
 	_ "github.com/AynaLivePlayer/miaosic/providers/netease"
 )
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 21dd6a6..285795c 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -10,7 +10,7 @@ import (
 
 const (
 	ProgramName        = "卡西米尔唱片机"
-	Version     uint32 = 0x00090b
+	Version     uint32 = 0x010000
 )
 
 const (
diff --git a/pkg/config/config_general.go b/pkg/config/config_general.go
index 81f07fe..a5ff990 100644
--- a/pkg/config/config_general.go
+++ b/pkg/config/config_general.go
@@ -2,6 +2,8 @@ package config
 
 type _GeneralConfig struct {
 	BaseConfig
+	Width           float32
+	Height          float32
 	Language        string
 	AutoCheckUpdate bool
 }
@@ -13,4 +15,6 @@ func (c *_GeneralConfig) Name() string {
 var General = &_GeneralConfig{
 	Language:        "zh-CN",
 	AutoCheckUpdate: true,
+	Width:           960,
+	Height:          480,
 }