Compare commits
23 Commits
0a22377cd6
...
main
Author | SHA1 | Date | |
---|---|---|---|
80e0f6dfe5 | |||
fb82846e9e
|
|||
4a9182d063
|
|||
799d257e9d
|
|||
6adbff9bbf
|
|||
fc4c916735
|
|||
aaf43c15aa
|
|||
04eb6b87f4
|
|||
597e9f75cf | |||
26827d5ccd
|
|||
b56199fe8b
|
|||
f6958ffa97
|
|||
7f410ef700
|
|||
c4d205a79e
|
|||
c45c106f2f
|
|||
63c13de181
|
|||
57767de4b3
|
|||
c59c87d109
|
|||
24446559b4 | |||
a053ffbed6 | |||
40848a70a5 | |||
f17104595d | |||
24d80779ee |
14
FyneApp.toml
14
FyneApp.toml
@@ -1,6 +1,14 @@
|
|||||||
|
Website = "https://gui-for-ffmpeg.projects.kor-elf.net/language/en"
|
||||||
|
|
||||||
[Details]
|
[Details]
|
||||||
Icon = "icon.png"
|
Icon = "assets/icon.png"
|
||||||
Name = "GUI for FFmpeg"
|
Name = "GUI for FFmpeg"
|
||||||
ID = "net.kor-elf.projects.gui-for-ffmpeg"
|
ID = "net.kor-elf.projects.gui-for-ffmpeg"
|
||||||
Version = "0.9.0"
|
Version = "1.0.1"
|
||||||
Build = 11
|
Build = 98
|
||||||
|
|
||||||
|
[LinuxAndBSD]
|
||||||
|
GenericName = "GUI for FFmpeg"
|
||||||
|
Categories = ["AudioVideo", "Utility"]
|
||||||
|
Comment = "A simple interface for the FFmpeg console utility."
|
||||||
|
Keywords = ["ffmpeg", "media", "convert", "transcode", "audio", "video", "конвертер", "видео", "аудио", "кодек"]
|
||||||
|
88
Makefile
Normal file
88
Makefile
Normal file
@@ -0,0 +1,88 @@
|
|||||||
|
VERSION ?= $(shell grep '^ *Version *= *' FyneApp.toml | sed -E "s/.*=[[:space:]]*\"([0-9\.]+)\".*/\1/")
|
||||||
|
|
||||||
|
BUILD_TMP := fyne-cross/tmp
|
||||||
|
|
||||||
|
WINDOWS_AMD64 := gui-for-ffmpeg-$(VERSION)-windows-amd64
|
||||||
|
BUILD_TMP_WINDOWS_AMD64 := $(BUILD_TMP)/$(WINDOWS_AMD64)
|
||||||
|
|
||||||
|
LINUX_AMD64 := gui-for-ffmpeg-$(VERSION)-linux-amd64
|
||||||
|
BUILD_TMP_LINUX_AMD64 := $(BUILD_TMP)/$(LINUX_AMD64)
|
||||||
|
|
||||||
|
RELEASES := fyne-cross/releases/$(VERSION)
|
||||||
|
|
||||||
|
default:
|
||||||
|
# Run "make build-for-linux_amd64"
|
||||||
|
# Run "make build-for-windows_amd64"
|
||||||
|
# Build for all
|
||||||
|
# Run "make build"
|
||||||
|
|
||||||
|
build:
|
||||||
|
make build-for-linux_amd64
|
||||||
|
make build-for-windows_amd64
|
||||||
|
# $(RELEASES)/$(LINUX_AMD64).tar.gz
|
||||||
|
# $(RELEASES)/$(LINUX_AMD64).tar.gz.sha256
|
||||||
|
# $(RELEASES)/$(WINDOWS_AMD64).zip
|
||||||
|
# $(RELEASES)/$(WINDOWS_AMD64).zip.sha256
|
||||||
|
|
||||||
|
build-for-windows_amd64:
|
||||||
|
fyne-cross windows
|
||||||
|
|
||||||
|
@if [ -d $(BUILD_TMP_WINDOWS_AMD64) ]; then \
|
||||||
|
rm -rf $(BUILD_TMP_WINDOWS_AMD64)/*; \
|
||||||
|
else \
|
||||||
|
mkdir -p $(BUILD_TMP_WINDOWS_AMD64); \
|
||||||
|
fi
|
||||||
|
cp LICENSE $(BUILD_TMP_WINDOWS_AMD64)/LICENSE
|
||||||
|
cp LICENSE-3RD-PARTY.txt $(BUILD_TMP_WINDOWS_AMD64)/LICENSE-3RD-PARTY.txt
|
||||||
|
cp "fyne-cross/bin/windows-amd64/GUI for FFmpeg.exe" $(BUILD_TMP_WINDOWS_AMD64)/gui-for-ffmpeg.exe
|
||||||
|
cd $(BUILD_TMP) && 7z a -tzip $(WINDOWS_AMD64).zip $(WINDOWS_AMD64)
|
||||||
|
|
||||||
|
@if [ ! -d $(RELEASES) ]; then \
|
||||||
|
mkdir -p $(RELEASES); \
|
||||||
|
fi
|
||||||
|
|
||||||
|
@if [ -f $(RELEASES)/$(WINDOWS_AMD64).zip ]; then \
|
||||||
|
rm $(RELEASES)/$(WINDOWS_AMD64).zip; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
@if [ -f $(RELEASES)/$(WINDOWS_AMD64).zip.sha256 ]; then \
|
||||||
|
rm $(RELEASES)/$(WINDOWS_AMD64).zip.sha256; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
mv $(BUILD_TMP)/$(WINDOWS_AMD64).zip $(RELEASES)/$(WINDOWS_AMD64).zip
|
||||||
|
cd $(RELEASES) && sha256sum $(WINDOWS_AMD64).zip > $(WINDOWS_AMD64).zip.sha256
|
||||||
|
# $(RELEASES)/$(WINDOWS_AMD64).zip
|
||||||
|
# $(RELEASES)/$(WINDOWS_AMD64).zip.sha256
|
||||||
|
|
||||||
|
build-for-linux_amd64:
|
||||||
|
fyne-cross linux
|
||||||
|
|
||||||
|
@if [ -d $(BUILD_TMP_LINUX_AMD64) ]; then \
|
||||||
|
rm -rf $(BUILD_TMP_LINUX_AMD64)/*; \
|
||||||
|
else \
|
||||||
|
mkdir -p $(BUILD_TMP_LINUX_AMD64); \
|
||||||
|
fi
|
||||||
|
cp -r dist/linux/* $(BUILD_TMP_LINUX_AMD64)/
|
||||||
|
cp LICENSE $(BUILD_TMP_LINUX_AMD64)/LICENSE
|
||||||
|
cp LICENSE-3RD-PARTY.txt $(BUILD_TMP_LINUX_AMD64)/LICENSE-3RD-PARTY.txt
|
||||||
|
cp fyne-cross/bin/linux-amd64/gui-for-ffmpeg $(BUILD_TMP_LINUX_AMD64)/usr/local/bin/gui-for-ffmpeg
|
||||||
|
cp assets/icon.png $(BUILD_TMP_LINUX_AMD64)/usr/local/share/pixmaps/gui-for-ffmpeg.png
|
||||||
|
|
||||||
|
cd $(BUILD_TMP) && tar -czvf $(LINUX_AMD64).tar.gz $(LINUX_AMD64)
|
||||||
|
|
||||||
|
@if [ ! -d $(RELEASES) ]; then \
|
||||||
|
mkdir -p $(RELEASES); \
|
||||||
|
fi
|
||||||
|
|
||||||
|
@if [ -f $(RELEASES)/$(LINUX_AMD64).tar.gz ]; then \
|
||||||
|
rm $(RELEASES)/$(LINUX_AMD64).tar.gz; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
@if [ -f $(RELEASES)/$(LINUX_AMD64).tar.gz.sha256 ]; then \
|
||||||
|
rm $(RELEASES)/$(LINUX_AMD64).tar.gz.sha256; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
mv $(BUILD_TMP)/$(LINUX_AMD64).tar.gz $(RELEASES)/$(LINUX_AMD64).tar.gz
|
||||||
|
cd $(RELEASES) && sha256sum $(LINUX_AMD64).tar.gz > $(LINUX_AMD64).tar.gz.sha256
|
||||||
|
# $(RELEASES)/$(LINUX_AMD64).tar.gz
|
||||||
|
# $(RELEASES)/$(LINUX_AMD64).tar.gz.sha256
|
28
README.md
28
README.md
@@ -1,11 +1,11 @@
|
|||||||
# GUI for FFmpeg
|
# GUI for FFmpeg
|
||||||
|
|
||||||
<p>Простенький интерфейс для консольной утилиты FFmpeg. Но я <strong>не являюсь</strong> автором самой утилиты <strong>FFmpeg</strong>.</p>
|
<p>Простенький интерфейс для консольной утилиты FFmpeg. Но я <strong>не являюсь</strong> автором самой утилиты <strong>FFmpeg</strong>.</p>
|
||||||
<p><strong>FFmpeg</strong> — торговая марка <strong><a href="http://bellard.org/" target="_blank">Fabrice Bellard</a></strong>, создателя проекта <strong><a href="https://ffmpeg.org/about.html" target="_blank">FFmpeg</a></strong>.</p>
|
<p><strong>FFmpeg</strong> — торговая марка <strong><a href="https://bellard.org/" target="_blank">Fabrice Bellard</a></strong>, создателя проекта <strong><a href="https://ffmpeg.org/about.html" target="_blank">FFmpeg</a></strong>.</p>
|
||||||
|
|
||||||
<p>Программное обеспечение является MIT (см. <a href="https://git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/branch/main/LICENSE">LICENSE</a>) и использует сторонние библиотеки, которые распространяются на их собственных условиях (см. <a href="https://git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/branch/main/LICENSE-3RD-PARTY.txt">LICENSE-3RD-PARTY.txt</a>).</p>
|
<p>Программное обеспечение является MIT (см. <a href="https://git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/branch/main/LICENSE">LICENSE</a>) и использует сторонние библиотеки, которые распространяются на их собственных условиях (см. <a href="https://git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/branch/main/LICENSE-3RD-PARTY.txt">LICENSE-3RD-PARTY.txt</a>).</p>
|
||||||
|
|
||||||
<img src="images/screenshot-gui-for-ffmpeg.png">
|
<img src="assets/screenshot-gui-for-ffmpeg.png" alt="Скриншот программы">
|
||||||
|
|
||||||
<p>Скачать скомпилированные готовые версии можно тут: <a href="https://git.kor-elf.net/kor-elf/gui-for-ffmpeg/releases">https://git.kor-elf.net/kor-elf/gui-for-ffmpeg/releases</a>.</p>
|
<p>Скачать скомпилированные готовые версии можно тут: <a href="https://git.kor-elf.net/kor-elf/gui-for-ffmpeg/releases">https://git.kor-elf.net/kor-elf/gui-for-ffmpeg/releases</a>.</p>
|
||||||
|
|
||||||
@@ -13,6 +13,18 @@
|
|||||||
1. go install fyne.io/fyne/v2/cmd/fyne@latest
|
1. go install fyne.io/fyne/v2/cmd/fyne@latest
|
||||||
2. fyne get git.kor-elf.net/kor-elf/gui-for-ffmpeg
|
2. fyne get git.kor-elf.net/kor-elf/gui-for-ffmpeg
|
||||||
|
|
||||||
|
## Скомпилировать через Makefile:
|
||||||
|
1. git clone https://git.kor-elf.net/kor-elf/gui-for-ffmpeg.git
|
||||||
|
2. Переходим в папку проекта и там переходим в папку src: **cd gui-for-ffmpeg**
|
||||||
|
3. Ознакамливаемся, что нужно ещё установить для Вашей ОС для простого запуска (через go run) тут: https://docs.fyne.io/started/
|
||||||
|
4. go install github.com/fyne-io/fyne-cross@latest
|
||||||
|
* У Вас так же должен быть установлен docker
|
||||||
|
* О fyne-cross можно по подробней почитать тут: https://github.com/fyne-io/fyne-cross
|
||||||
|
5. * make build-for-linux_amd64
|
||||||
|
* make build-for-windows_amd64
|
||||||
|
* Или просто **make build**
|
||||||
|
6. Создаться папка с архивом в **fyne-cross/releases**
|
||||||
|
|
||||||
## Скомпилировать через исходники:
|
## Скомпилировать через исходники:
|
||||||
1. git clone https://git.kor-elf.net/kor-elf/gui-for-ffmpeg.git
|
1. git clone https://git.kor-elf.net/kor-elf/gui-for-ffmpeg.git
|
||||||
2. Переходим в папку проекта и там переходим в папку src: **cd gui-for-ffmpeg**
|
2. Переходим в папку проекта и там переходим в папку src: **cd gui-for-ffmpeg**
|
||||||
@@ -21,11 +33,7 @@
|
|||||||
5. go install github.com/fyne-io/fyne-cross@latest
|
5. go install github.com/fyne-io/fyne-cross@latest
|
||||||
* У Вас так же должен быть установлен docker
|
* У Вас так же должен быть установлен docker
|
||||||
* О fyne-cross можно по подробней почитать тут: https://github.com/fyne-io/fyne-cross
|
* О fyne-cross можно по подробней почитать тут: https://github.com/fyne-io/fyne-cross
|
||||||
6. * fyne-cross windows --icon icon.png --app-id "." -name "gui-for-ffmpeg"
|
6. * fyne-cross windows
|
||||||
* fyne-cross linux --icon icon.png --app-id "." -name "gui-for-ffmpeg"
|
* fyne-cross linux
|
||||||
7. Создаться папка **fyne-cross/bin** и там будет созданна папка с тем названием под которую Вы компилировали приложения (linux-amd64 или windows-amd64).
|
7. Создаться папка **fyne-cross/dist** и там будет созданна папка с тем названием под которую Вы компилировали приложения (linux-amd64 или windows-amd64).
|
||||||
8. В папку **fyne-cross/bin/linux-amd64** или **fyne-cross/bin/windows-amd64** копируете:
|
8. В папке **fyne-cross/dist/linux-amd64** или **fyne-cross/dist/windows-amd64** будут архивы, которые надо распаковать и пользоваться программой.
|
||||||
* LICENSE
|
|
||||||
* LICENSE-3RD-PARTY.txt
|
|
||||||
<p><strong>Структура должна получиться такая:</strong></p>
|
|
||||||
<img src="images/screenshot-folder-structure.png">
|
|
||||||
|
BIN
assets/icon.png
Normal file
BIN
assets/icon.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 29 KiB |
BIN
assets/screenshot-gui-for-ffmpeg.png
Normal file
BIN
assets/screenshot-gui-for-ffmpeg.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 77 KiB |
39
dist/linux/Makefile
vendored
Normal file
39
dist/linux/Makefile
vendored
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
# If PREFIX isn't provided, we check for $(DESTDIR)/usr/local and use that if it exists.
|
||||||
|
# Otherwice we fall back to using /usr.
|
||||||
|
|
||||||
|
LOCAL != test -d $(DESTDIR)/usr/local && echo -n "/local" || echo -n ""
|
||||||
|
LOCAL ?= $(shell test -d $(DESTDIR)/usr/local && echo "/local" || echo "")
|
||||||
|
PREFIX ?= /usr$(LOCAL)
|
||||||
|
|
||||||
|
Name := "gui-for-ffmpeg"
|
||||||
|
Exec := "gui-for-ffmpeg"
|
||||||
|
Icon := "gui-for-ffmpeg.png"
|
||||||
|
|
||||||
|
default:
|
||||||
|
# User install
|
||||||
|
# Run "make user-install" to install in ~/.local/
|
||||||
|
# Run "make user-uninstall" to uninstall from ~/.local/
|
||||||
|
#
|
||||||
|
# System install
|
||||||
|
# Run "sudo make install" to install the application.
|
||||||
|
# Run "sudo make uninstall" to uninstall the application.
|
||||||
|
|
||||||
|
install:
|
||||||
|
install -Dm00644 usr/local/share/applications/$(Name).desktop $(DESTDIR)$(PREFIX)/share/applications/$(Name).desktop
|
||||||
|
install -Dm00755 usr/local/bin/$(Exec) $(DESTDIR)$(PREFIX)/bin/$(Exec)
|
||||||
|
install -Dm00644 usr/local/share/pixmaps/$(Icon) $(DESTDIR)$(PREFIX)/share/pixmaps/$(Icon)
|
||||||
|
uninstall:
|
||||||
|
-rm $(DESTDIR)$(PREFIX)/share/applications/$(Name).desktop
|
||||||
|
-rm $(DESTDIR)$(PREFIX)/bin/$(Exec)
|
||||||
|
-rm $(DESTDIR)$(PREFIX)/share/pixmaps/$(Icon)
|
||||||
|
|
||||||
|
user-install:
|
||||||
|
install -Dm00644 usr/local/share/applications/$(Name).desktop $(DESTDIR)$(HOME)/.local/share/applications/$(Name).desktop
|
||||||
|
install -Dm00755 usr/local/bin/$(Exec) $(DESTDIR)$(HOME)/.local/bin/$(Exec)
|
||||||
|
install -Dm00644 usr/local/share/pixmaps/$(Icon) $(DESTDIR)$(HOME)/.local/share/icons/$(Icon)
|
||||||
|
sed -i -e "s,Exec=$(Exec),Exec=$(DESTDIR)$(HOME)/.local/bin/$(Exec),g" $(DESTDIR)$(HOME)/.local/share/applications/$(Name).desktop
|
||||||
|
|
||||||
|
user-uninstall:
|
||||||
|
-rm $(DESTDIR)$(HOME)/.local/share/applications/$(Name).desktop
|
||||||
|
-rm $(DESTDIR)$(HOME)/.local/bin/$(Exec)
|
||||||
|
-rm $(DESTDIR)$(HOME)/.local/share/icons/$(Icon)
|
12
dist/linux/Readme-eng.txt
vendored
Normal file
12
dist/linux/Readme-eng.txt
vendored
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
User install
|
||||||
|
Run "make user-install" to install in ~/.local/
|
||||||
|
Run "make user-uninstall" to uninstall from ~/.local/
|
||||||
|
|
||||||
|
System install
|
||||||
|
Run "sudo make install" to install the application.
|
||||||
|
Run "sudo make uninstall" to uninstall the application.
|
||||||
|
|
||||||
|
|
||||||
|
The program can be launched via the start menu in the Audio/Video or Standard section.
|
||||||
|
You can also call the program via the terminal:
|
||||||
|
gui-for-ffmpeg
|
12
dist/linux/Readme-rus.txt
vendored
Normal file
12
dist/linux/Readme-rus.txt
vendored
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
Установить для пользователя (рекомендуется)
|
||||||
|
Запустите "make user-install" для установки в домашнюю папку ~/.local/
|
||||||
|
Запустите "make user-uninstall" для удаления из домашней папки ~/.local/
|
||||||
|
|
||||||
|
Установить для всей системы
|
||||||
|
Запустить "sudo make install" Для установки в систему.
|
||||||
|
Запустить "sudo make uninstall" Для удаления из системы.
|
||||||
|
|
||||||
|
|
||||||
|
Программу можно запустить через пуск в разделе Аудио/Видео или Стандартные.
|
||||||
|
Также можно вызвать программу через терминал:
|
||||||
|
gui-for-ffmpeg
|
2
dist/linux/usr/local/bin/.gitignore
vendored
Normal file
2
dist/linux/usr/local/bin/.gitignore
vendored
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
*
|
||||||
|
!.gitignore
|
9
dist/linux/usr/local/share/applications/gui-for-ffmpeg.desktop
vendored
Normal file
9
dist/linux/usr/local/share/applications/gui-for-ffmpeg.desktop
vendored
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Type=Application
|
||||||
|
Name=GUI for FFmpeg
|
||||||
|
GenericName=GUI for FFmpeg
|
||||||
|
Exec=gui-for-ffmpeg
|
||||||
|
Icon=gui-for-ffmpeg
|
||||||
|
Comment=A simple interface for the FFmpeg console utility.
|
||||||
|
Categories=AudioVideo;Utility;
|
||||||
|
Keywords=ffmpeg;media;convert;transcode;audio;video;конвертер;видео;аудио;кодек;
|
2
dist/linux/usr/local/share/pixmaps/.gitignore
vendored
Normal file
2
dist/linux/usr/local/share/pixmaps/.gitignore
vendored
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
*
|
||||||
|
!.gitignore
|
24
go.mod
24
go.mod
@@ -5,19 +5,20 @@ go 1.23.0
|
|||||||
toolchain go1.23.9
|
toolchain go1.23.9
|
||||||
|
|
||||||
require (
|
require (
|
||||||
fyne.io/fyne/v2 v2.6.1
|
fyne.io/fyne/v2 v2.6.3
|
||||||
github.com/ulikunitz/xz v0.5.12
|
github.com/ulikunitz/xz v0.5.13
|
||||||
golang.org/x/image v0.27.0
|
golang.org/x/image v0.30.0
|
||||||
|
golang.org/x/text v0.28.0
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
fyne.io/systray v1.11.0 // indirect
|
fyne.io/systray v1.11.0 // indirect
|
||||||
github.com/BurntSushi/toml v1.5.0 // indirect
|
github.com/BurntSushi/toml v1.5.0 // indirect
|
||||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||||
github.com/fredbi/uri v1.1.0 // indirect
|
github.com/fredbi/uri v1.1.1 // indirect
|
||||||
github.com/fsnotify/fsnotify v1.9.0 // indirect
|
github.com/fsnotify/fsnotify v1.9.0 // indirect
|
||||||
github.com/fyne-io/gl-js v0.1.0 // indirect
|
github.com/fyne-io/gl-js v0.2.0 // indirect
|
||||||
github.com/fyne-io/glfw-js v0.2.0 // indirect
|
github.com/fyne-io/glfw-js v0.3.0 // indirect
|
||||||
github.com/fyne-io/image v0.1.1 // indirect
|
github.com/fyne-io/image v0.1.1 // indirect
|
||||||
github.com/fyne-io/oksvg v0.1.0 // indirect
|
github.com/fyne-io/oksvg v0.1.0 // indirect
|
||||||
github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 // indirect
|
github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 // indirect
|
||||||
@@ -27,19 +28,18 @@ require (
|
|||||||
github.com/godbus/dbus/v5 v5.1.0 // indirect
|
github.com/godbus/dbus/v5 v5.1.0 // indirect
|
||||||
github.com/hack-pad/go-indexeddb v0.3.2 // indirect
|
github.com/hack-pad/go-indexeddb v0.3.2 // indirect
|
||||||
github.com/hack-pad/safejs v0.1.1 // indirect
|
github.com/hack-pad/safejs v0.1.1 // indirect
|
||||||
github.com/jeandeaual/go-locale v0.0.0-20250421151639-a9d6ed1b3d45 // indirect
|
github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade // indirect
|
||||||
github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 // indirect
|
github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 // indirect
|
||||||
github.com/kr/text v0.2.0 // indirect
|
github.com/kr/text v0.2.0 // indirect
|
||||||
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
|
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
|
||||||
github.com/nicksnyder/go-i18n/v2 v2.6.0 // indirect
|
github.com/nicksnyder/go-i18n/v2 v2.6.0 // indirect
|
||||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||||
github.com/rymdport/portal v0.4.1 // indirect
|
github.com/rymdport/portal v0.4.2 // indirect
|
||||||
github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect
|
github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect
|
||||||
github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect
|
github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect
|
||||||
github.com/stretchr/testify v1.10.0 // indirect
|
github.com/stretchr/testify v1.10.0 // indirect
|
||||||
github.com/yuin/goldmark v1.7.11 // indirect
|
github.com/yuin/goldmark v1.7.13 // indirect
|
||||||
golang.org/x/net v0.40.0 // indirect
|
golang.org/x/net v0.43.0 // indirect
|
||||||
golang.org/x/sys v0.33.0 // indirect
|
golang.org/x/sys v0.35.0 // indirect
|
||||||
golang.org/x/text v0.25.0 // indirect
|
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
)
|
)
|
||||||
|
24
go.sum
24
go.sum
@@ -1,5 +1,7 @@
|
|||||||
fyne.io/fyne/v2 v2.6.1 h1:kjPJD4/rBS9m2nHJp+npPSuaK79yj6ObMTuzR6VQ1Is=
|
fyne.io/fyne/v2 v2.6.1 h1:kjPJD4/rBS9m2nHJp+npPSuaK79yj6ObMTuzR6VQ1Is=
|
||||||
fyne.io/fyne/v2 v2.6.1/go.mod h1:YZt7SksjvrSNJCwbWFV32WON3mE1Sr7L41D29qMZ/lU=
|
fyne.io/fyne/v2 v2.6.1/go.mod h1:YZt7SksjvrSNJCwbWFV32WON3mE1Sr7L41D29qMZ/lU=
|
||||||
|
fyne.io/fyne/v2 v2.6.3 h1:cvtM2KHeRuH+WhtHiA63z5wJVBkQ9+Ay0UMl9PxFHyA=
|
||||||
|
fyne.io/fyne/v2 v2.6.3/go.mod h1:NGSurpRElVoI1G3h+ab2df3O5KLGh1CGbsMMcX0bPIs=
|
||||||
fyne.io/systray v1.11.0 h1:D9HISlxSkx+jHSniMBR6fCFOUjk1x/OOOJLa9lJYAKg=
|
fyne.io/systray v1.11.0 h1:D9HISlxSkx+jHSniMBR6fCFOUjk1x/OOOJLa9lJYAKg=
|
||||||
fyne.io/systray v1.11.0/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs=
|
fyne.io/systray v1.11.0/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs=
|
||||||
github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
|
github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
|
||||||
@@ -11,12 +13,18 @@ github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g=
|
|||||||
github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw=
|
github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw=
|
||||||
github.com/fredbi/uri v1.1.0 h1:OqLpTXtyRg9ABReqvDGdJPqZUxs8cyBDOMXBbskCaB8=
|
github.com/fredbi/uri v1.1.0 h1:OqLpTXtyRg9ABReqvDGdJPqZUxs8cyBDOMXBbskCaB8=
|
||||||
github.com/fredbi/uri v1.1.0/go.mod h1:aYTUoAXBOq7BLfVJ8GnKmfcuURosB1xyHDIfWeC/iW4=
|
github.com/fredbi/uri v1.1.0/go.mod h1:aYTUoAXBOq7BLfVJ8GnKmfcuURosB1xyHDIfWeC/iW4=
|
||||||
|
github.com/fredbi/uri v1.1.1 h1:xZHJC08GZNIUhbP5ImTHnt5Ya0T8FI2VAwI/37kh2Ko=
|
||||||
|
github.com/fredbi/uri v1.1.1/go.mod h1:4+DZQ5zBjEwQCDmXW5JdIjz0PUA+yJbvtBv+u+adr5o=
|
||||||
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
|
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
|
||||||
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
|
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
|
||||||
github.com/fyne-io/gl-js v0.1.0 h1:8luJzNs0ntEAJo+8x8kfUOXujUlP8gB3QMOxO2mUdpM=
|
github.com/fyne-io/gl-js v0.1.0 h1:8luJzNs0ntEAJo+8x8kfUOXujUlP8gB3QMOxO2mUdpM=
|
||||||
github.com/fyne-io/gl-js v0.1.0/go.mod h1:ZcepK8vmOYLu96JoxbCKJy2ybr+g1pTnaBDdl7c3ajI=
|
github.com/fyne-io/gl-js v0.1.0/go.mod h1:ZcepK8vmOYLu96JoxbCKJy2ybr+g1pTnaBDdl7c3ajI=
|
||||||
|
github.com/fyne-io/gl-js v0.2.0 h1:+EXMLVEa18EfkXBVKhifYB6OGs3HwKO3lUElA0LlAjs=
|
||||||
|
github.com/fyne-io/gl-js v0.2.0/go.mod h1:ZcepK8vmOYLu96JoxbCKJy2ybr+g1pTnaBDdl7c3ajI=
|
||||||
github.com/fyne-io/glfw-js v0.2.0 h1:8GUZtN2aCoTPNqgRDxK5+kn9OURINhBEBc7M4O1KrmM=
|
github.com/fyne-io/glfw-js v0.2.0 h1:8GUZtN2aCoTPNqgRDxK5+kn9OURINhBEBc7M4O1KrmM=
|
||||||
github.com/fyne-io/glfw-js v0.2.0/go.mod h1:Ri6te7rdZtBgBpxLW19uBpp3Dl6K9K/bRaYdJ22G8Jk=
|
github.com/fyne-io/glfw-js v0.2.0/go.mod h1:Ri6te7rdZtBgBpxLW19uBpp3Dl6K9K/bRaYdJ22G8Jk=
|
||||||
|
github.com/fyne-io/glfw-js v0.3.0 h1:d8k2+Y7l+zy2pc7wlGRyPfTgZoqDf3AI4G+2zOWhWUk=
|
||||||
|
github.com/fyne-io/glfw-js v0.3.0/go.mod h1:Ri6te7rdZtBgBpxLW19uBpp3Dl6K9K/bRaYdJ22G8Jk=
|
||||||
github.com/fyne-io/image v0.1.1 h1:WH0z4H7qfvNUw5l4p3bC1q70sa5+YWVt6HCj7y4VNyA=
|
github.com/fyne-io/image v0.1.1 h1:WH0z4H7qfvNUw5l4p3bC1q70sa5+YWVt6HCj7y4VNyA=
|
||||||
github.com/fyne-io/image v0.1.1/go.mod h1:xrfYBh6yspc+KjkgdZU/ifUC9sPA5Iv7WYUBzQKK7JM=
|
github.com/fyne-io/image v0.1.1/go.mod h1:xrfYBh6yspc+KjkgdZU/ifUC9sPA5Iv7WYUBzQKK7JM=
|
||||||
github.com/fyne-io/oksvg v0.1.0 h1:7EUKk3HV3Y2E+qypp3nWqMXD7mum0hCw2KEGhI1fnBw=
|
github.com/fyne-io/oksvg v0.1.0 h1:7EUKk3HV3Y2E+qypp3nWqMXD7mum0hCw2KEGhI1fnBw=
|
||||||
@@ -41,6 +49,8 @@ github.com/hack-pad/safejs v0.1.1 h1:d5qPO0iQ7h2oVtpzGnLExE+Wn9AtytxIfltcS2b9KD8
|
|||||||
github.com/hack-pad/safejs v0.1.1/go.mod h1:HdS+bKF1NrE72VoXZeWzxFOVQVUSqZJAG0xNCnb+Tio=
|
github.com/hack-pad/safejs v0.1.1/go.mod h1:HdS+bKF1NrE72VoXZeWzxFOVQVUSqZJAG0xNCnb+Tio=
|
||||||
github.com/jeandeaual/go-locale v0.0.0-20250421151639-a9d6ed1b3d45 h1:vFdvrlsVU+p/KFBWTq0lTG4fvWvG88sawGlCzM+RUEU=
|
github.com/jeandeaual/go-locale v0.0.0-20250421151639-a9d6ed1b3d45 h1:vFdvrlsVU+p/KFBWTq0lTG4fvWvG88sawGlCzM+RUEU=
|
||||||
github.com/jeandeaual/go-locale v0.0.0-20250421151639-a9d6ed1b3d45/go.mod h1:ZDXo8KHryOWSIqnsb/CiDq7hQUYryCgdVnxbj8tDG7o=
|
github.com/jeandeaual/go-locale v0.0.0-20250421151639-a9d6ed1b3d45/go.mod h1:ZDXo8KHryOWSIqnsb/CiDq7hQUYryCgdVnxbj8tDG7o=
|
||||||
|
github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade h1:FmusiCI1wHw+XQbvL9M+1r/C3SPqKrmBaIOYwVfQoDE=
|
||||||
|
github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade/go.mod h1:ZDXo8KHryOWSIqnsb/CiDq7hQUYryCgdVnxbj8tDG7o=
|
||||||
github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 h1:YLvr1eE6cdCqjOe972w/cYF+FjW34v27+9Vo5106B4M=
|
github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 h1:YLvr1eE6cdCqjOe972w/cYF+FjW34v27+9Vo5106B4M=
|
||||||
github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw=
|
github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw=
|
||||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
||||||
@@ -57,6 +67,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
|
|||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/rymdport/portal v0.4.1 h1:2dnZhjf5uEaeDjeF/yBIeeRo6pNI2QAKm7kq1w/kbnA=
|
github.com/rymdport/portal v0.4.1 h1:2dnZhjf5uEaeDjeF/yBIeeRo6pNI2QAKm7kq1w/kbnA=
|
||||||
github.com/rymdport/portal v0.4.1/go.mod h1:kFF4jslnJ8pD5uCi17brj/ODlfIidOxlgUDTO5ncnC4=
|
github.com/rymdport/portal v0.4.1/go.mod h1:kFF4jslnJ8pD5uCi17brj/ODlfIidOxlgUDTO5ncnC4=
|
||||||
|
github.com/rymdport/portal v0.4.2 h1:7jKRSemwlTyVHHrTGgQg7gmNPJs88xkbKcIL3NlcmSU=
|
||||||
|
github.com/rymdport/portal v0.4.2/go.mod h1:kFF4jslnJ8pD5uCi17brj/ODlfIidOxlgUDTO5ncnC4=
|
||||||
github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c h1:km8GpoQut05eY3GiYWEedbTT0qnSxrCjsVbb7yKY1KE=
|
github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c h1:km8GpoQut05eY3GiYWEedbTT0qnSxrCjsVbb7yKY1KE=
|
||||||
github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c/go.mod h1:cNQ3dwVJtS5Hmnjxy6AgTPd0Inb3pW05ftPSX7NZO7Q=
|
github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c/go.mod h1:cNQ3dwVJtS5Hmnjxy6AgTPd0Inb3pW05ftPSX7NZO7Q=
|
||||||
github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef h1:Ch6Q+AZUxDBCVqdkI8FSpFyZDtCVBc2VmejdNrm5rRQ=
|
github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef h1:Ch6Q+AZUxDBCVqdkI8FSpFyZDtCVBc2VmejdNrm5rRQ=
|
||||||
@@ -65,16 +77,28 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
|
|||||||
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||||
github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
|
github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
|
||||||
github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
|
github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
|
||||||
|
github.com/ulikunitz/xz v0.5.13 h1:ar98gWrjf4H1ev05fYP/o29PDZw9DrI3niHtnEqyuXA=
|
||||||
|
github.com/ulikunitz/xz v0.5.13/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
|
||||||
github.com/yuin/goldmark v1.7.11 h1:ZCxLyDMtz0nT2HFfsYG8WZ47Trip2+JyLysKcMYE5bo=
|
github.com/yuin/goldmark v1.7.11 h1:ZCxLyDMtz0nT2HFfsYG8WZ47Trip2+JyLysKcMYE5bo=
|
||||||
github.com/yuin/goldmark v1.7.11/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
|
github.com/yuin/goldmark v1.7.11/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
|
||||||
|
github.com/yuin/goldmark v1.7.13 h1:GPddIs617DnBLFFVJFgpo1aBfe/4xcvMc3SB5t/D0pA=
|
||||||
|
github.com/yuin/goldmark v1.7.13/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
|
||||||
golang.org/x/image v0.27.0 h1:C8gA4oWU/tKkdCfYT6T2u4faJu3MeNS5O8UPWlPF61w=
|
golang.org/x/image v0.27.0 h1:C8gA4oWU/tKkdCfYT6T2u4faJu3MeNS5O8UPWlPF61w=
|
||||||
golang.org/x/image v0.27.0/go.mod h1:xbdrClrAUway1MUTEZDq9mz/UpRwYAkFFNUslZtcB+g=
|
golang.org/x/image v0.27.0/go.mod h1:xbdrClrAUway1MUTEZDq9mz/UpRwYAkFFNUslZtcB+g=
|
||||||
|
golang.org/x/image v0.30.0 h1:jD5RhkmVAnjqaCUXfbGBrn3lpxbknfN9w2UhHHU+5B4=
|
||||||
|
golang.org/x/image v0.30.0/go.mod h1:SAEUTxCCMWSrJcCy/4HwavEsfZZJlYxeHLc6tTiAe/c=
|
||||||
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
|
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
|
||||||
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
|
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
|
||||||
|
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
|
||||||
|
golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
|
||||||
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
|
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
|
||||||
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
||||||
|
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
|
||||||
|
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
||||||
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
|
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
|
||||||
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
|
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
|
||||||
|
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
|
||||||
|
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
|
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
|
||||||
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 5.5 KiB |
@@ -1,10 +1,11 @@
|
|||||||
package setting
|
package setting
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"image/color"
|
||||||
|
|
||||||
"fyne.io/fyne/v2"
|
"fyne.io/fyne/v2"
|
||||||
"fyne.io/fyne/v2/lang"
|
"fyne.io/fyne/v2/lang"
|
||||||
"fyne.io/fyne/v2/theme"
|
"fyne.io/fyne/v2/theme"
|
||||||
"image/color"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func (s *setting) GetTheme() ThemeInfoContract {
|
func (s *setting) GetTheme() ThemeInfoContract {
|
||||||
@@ -31,7 +32,8 @@ func (s *setting) SetTheme(themeInfo ThemeInfoContract) {
|
|||||||
func (s *setting) ThemeInit() {
|
func (s *setting) ThemeInit() {
|
||||||
themeInfo := s.GetTheme()
|
themeInfo := s.GetTheme()
|
||||||
if themeInfo.GetName() == "default" {
|
if themeInfo.GetName() == "default" {
|
||||||
s.fyneApp.Settings().SetTheme(theme.DefaultTheme())
|
// In the new version of Fyne the theme color changes incorrectly if it is set to default.
|
||||||
|
// s.fyneApp.Settings().SetTheme(theme.DefaultTheme())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
s.fyneApp.Settings().SetTheme(&forcedVariant{theme: theme.DefaultTheme(), variant: themeInfo.GetVariant()})
|
s.fyneApp.Settings().SetTheme(&forcedVariant{theme: theme.DefaultTheme(), variant: themeInfo.GetVariant()})
|
||||||
|
@@ -19,7 +19,7 @@ type controller struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func NewController(app application.AppContract) ControllerContract {
|
func NewController(app application.AppContract) ControllerContract {
|
||||||
fyneWindow := app.FyneApp().NewWindow(app.FyneApp().Metadata().Name)
|
fyneWindow := app.FyneApp().NewWindow("GUI for FFmpeg")
|
||||||
fyneWindow.SetMaster()
|
fyneWindow.SetMaster()
|
||||||
queueLayout := window.NewQueueLayout(app.GetFFmpegService())
|
queueLayout := window.NewQueueLayout(app.GetFFmpegService())
|
||||||
app.GetQueueService().AddListener(queueLayout)
|
app.GetQueueService().AddListener(queueLayout)
|
||||||
|
@@ -80,14 +80,21 @@ func HelpFFplay() fyne.CanvasObject {
|
|||||||
return widget.NewLabel("")
|
return widget.NewLabel("")
|
||||||
},
|
},
|
||||||
func(i widget.TableCellID, o fyne.CanvasObject) {
|
func(i widget.TableCellID, o fyne.CanvasObject) {
|
||||||
|
label := o.(*widget.Label)
|
||||||
|
|
||||||
|
label.TextStyle.Bold = false
|
||||||
|
label.SizeName = theme.SizeNameText
|
||||||
|
|
||||||
if i.Row == 0 {
|
if i.Row == 0 {
|
||||||
o.(*widget.Label).TextStyle.Bold = true
|
label.TextStyle.Bold = true
|
||||||
o.(*widget.Label).SizeName = theme.SizeNameSubHeadingText
|
label.SizeName = theme.SizeNameSubHeadingText
|
||||||
}
|
}
|
||||||
|
|
||||||
if i.Col == 0 {
|
if i.Col == 0 {
|
||||||
o.(*widget.Label).TextStyle.Bold = true
|
label.TextStyle.Bold = true
|
||||||
}
|
}
|
||||||
o.(*widget.Label).SetText(data[i.Row][i.Col])
|
|
||||||
|
label.SetText(data[i.Row][i.Col])
|
||||||
})
|
})
|
||||||
list.SetRowHeight(0, 40)
|
list.SetRowHeight(0, 40)
|
||||||
list.SetColumnWidth(0, 200)
|
list.SetColumnWidth(0, 200)
|
||||||
|
Reference in New Issue
Block a user