diff --git a/README.md b/README.md index 38031b4..23180b8 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,6 @@ * fyne-cross linux --icon icon.png --app-id "." -name "gui-for-ffmpeg" 7. Создаться папка **fyne-cross/bin** и там будет созданна папка с тем названием под которую Вы компилировали приложения (linux-amd64 или windows-amd64). 8. В папку **fyne-cross/bin/linux-amd64** или **fyne-cross/bin/windows-amd64** копируете: - * icon.png * LICENSE * LICENSE-3RD-PARTY.txt
Структура должна получиться такая:
diff --git a/images/screenshot-folder-structure.png b/images/screenshot-folder-structure.png index 58b4406..ab90c36 100644 Binary files a/images/screenshot-folder-structure.png and b/images/screenshot-folder-structure.png differ diff --git a/internal/resources/icon.go b/internal/resources/icon.go new file mode 100644 index 0000000..003278e --- /dev/null +++ b/internal/resources/icon.go @@ -0,0 +1,13 @@ +package resources + +import ( + _ "embed" + "fyne.io/fyne/v2" +) + +//go:embed icons/logo.png +var iconAppLogo []byte + +func IconAppLogoResource() *fyne.StaticResource { + return fyne.NewStaticResource("icon.png", iconAppLogo) +} diff --git a/internal/resources/icons/logo.png b/internal/resources/icons/logo.png new file mode 100644 index 0000000..6eaf8f6 Binary files /dev/null and b/internal/resources/icons/logo.png differ diff --git a/main.go b/main.go index 1c67187..e299536 100644 --- a/main.go +++ b/main.go @@ -1,10 +1,12 @@ package main import ( + _ "embed" "fyne.io/fyne/v2" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/convertor" error2 "git.kor-elf.net/kor-elf/gui-for-ffmpeg/error" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/handler" + "git.kor-elf.net/kor-elf/gui-for-ffmpeg/internal/resources" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/kernel" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/localizer" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/menu" @@ -16,12 +18,11 @@ var application kernel.AppContract var ffPathUtilities *kernel.FFPathUtilities func init() { - iconResource, _ := fyne.LoadResourceFromPath("icon.png") appMetadata := &fyne.AppMetadata{ ID: "net.kor-elf.projects.gui-for-ffmpeg", Name: "GUI for FFmpeg", Version: "0.9.0", - Icon: iconResource, + Icon: resources.IconAppLogoResource(), } ffPathUtilities = &kernel.FFPathUtilities{FFmpeg: "", FFprobe: "", FFplay: ""} diff --git a/menu/view.go b/menu/view.go index 29864d8..be4b4f4 100644 --- a/menu/view.go +++ b/menu/view.go @@ -6,6 +6,7 @@ import ( "fyne.io/fyne/v2/container" "fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/widget" + "git.kor-elf.net/kor-elf/gui-for-ffmpeg/internal/resources" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/kernel" "golang.org/x/image/colornames" "net/url" @@ -32,7 +33,7 @@ func (v View) Gratitude() { view.Resize(fyne.Size{Width: 500, Height: 400}) view.SetFixedSize(true) - image := canvas.NewImageFromFile("icon.png") + image := canvas.NewImageFromResource(resources.IconAppLogoResource()) image.SetMinSize(fyne.Size{Width: 100, Height: 100}) image.FillMode = canvas.ImageFillContain @@ -103,7 +104,7 @@ func (v View) About(ffmpegVersion string, ffprobeVersion string, ffplayVersion s Text: v.app.GetLocalizerService().GetMessage("aboutText"), }, ) - image := canvas.NewImageFromFile("icon.png") + image := canvas.NewImageFromResource(resources.IconAppLogoResource()) image.SetMinSize(fyne.Size{Width: 100, Height: 100}) image.FillMode = canvas.ImageFillContain