Версия 0.4.0. #5

Merged
kor-elf merged 7 commits from develop into main 2024-02-17 20:33:18 +06:00
35 changed files with 29 additions and 30 deletions
Showing only changes of commit c4ec958576 - Show all commits

View File

@ -11,11 +11,11 @@
## Установка через fyne: ## Установка через fyne:
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/src 2. fyne get git.kor-elf.net/kor-elf/gui-for-ffmpeg
## Скомпилировать через исходники: ## Скомпилировать через исходники:
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/src** 2. Переходим в папку проекта и там переходим в папку src: **cd gui-for-ffmpeg**
3. Ознакамливаемся, что нужно ещё установить для Вашей ОС для простого запуска (через go run) тут: https://docs.fyne.io/started/ 3. Ознакамливаемся, что нужно ещё установить для Вашей ОС для простого запуска (через go run) тут: https://docs.fyne.io/started/
4. *(не обязательный шаг)* Просто запустить можно так: **go run main.go** 4. *(не обязательный шаг)* Просто запустить можно так: **go run main.go**
5. go install github.com/fyne-io/fyne-cross@latest 5. go install github.com/fyne-io/fyne-cross@latest
@ -35,9 +35,8 @@
## Работа с переводами: ## Работа с переводами:
1. go install -v github.com/nicksnyder/go-i18n/v2/goi18n@latest 1. go install -v github.com/nicksnyder/go-i18n/v2/goi18n@latest
2. Переходим в папке проекта в папку src: **cd ./src** 2. goi18n merge -sourceLanguage ru -outdir languages languages/active.\*.toml languages/translate.\*.toml
3. goi18n merge -sourceLanguage ru -outdir languages languages/active.\*.toml languages/translate.\*.toml 3. В файлах **languages/translate.\*.toml** переводим текст на нужный язык
4. В файлах **languages/translate.\*.toml** переводим текст на нужный язык 4. goi18n merge -sourceLanguage ru -outdir languages languages/active.\*.toml languages/translate.\*.toml
5. goi18n merge -sourceLanguage ru -outdir languages languages/active.\*.toml languages/translate.\*.toml
Более подробно можно почитать тут: https://github.com/nicksnyder/go-i18n Более подробно можно почитать тут: https://github.com/nicksnyder/go-i18n

View File

@ -1,7 +1,7 @@
package convertor package convertor
import ( import (
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/setting" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/setting"
) )
type RepositoryContract interface { type RepositoryContract interface {

View File

@ -2,7 +2,7 @@ package convertor
import ( import (
"errors" "errors"
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/helper" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/helper"
"io" "io"
"os/exec" "os/exec"
"regexp" "regexp"

View File

@ -8,8 +8,8 @@ import (
"fyne.io/fyne/v2/dialog" "fyne.io/fyne/v2/dialog"
"fyne.io/fyne/v2/storage" "fyne.io/fyne/v2/storage"
"fyne.io/fyne/v2/widget" "fyne.io/fyne/v2/widget"
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/helper" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/helper"
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/localizer" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/localizer"
"github.com/nicksnyder/go-i18n/v2/i18n" "github.com/nicksnyder/go-i18n/v2/i18n"
"image/color" "image/color"
"path/filepath" "path/filepath"

View File

@ -7,7 +7,7 @@ import (
"fyne.io/fyne/v2/dialog" "fyne.io/fyne/v2/dialog"
"fyne.io/fyne/v2/storage" "fyne.io/fyne/v2/storage"
"fyne.io/fyne/v2/widget" "fyne.io/fyne/v2/widget"
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/helper" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/helper"
"github.com/nicksnyder/go-i18n/v2/i18n" "github.com/nicksnyder/go-i18n/v2/i18n"
"image/color" "image/color"
"net/url" "net/url"

View File

@ -4,7 +4,7 @@ import (
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
"fyne.io/fyne/v2/widget" "fyne.io/fyne/v2/widget"
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/localizer" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/localizer"
"github.com/nicksnyder/go-i18n/v2/i18n" "github.com/nicksnyder/go-i18n/v2/i18n"
) )

View File

@ -1,4 +1,4 @@
module git.kor-elf.net/kor-elf/gui-for-ffmpeg/src module git.kor-elf.net/kor-elf/gui-for-ffmpeg
go 1.21 go 1.21

View File

View File

@ -4,9 +4,9 @@ import (
"bufio" "bufio"
"errors" "errors"
"fyne.io/fyne/v2/widget" "fyne.io/fyne/v2/widget"
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/convertor" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/convertor"
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/helper" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/helper"
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/localizer" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/localizer"
"github.com/nicksnyder/go-i18n/v2/i18n" "github.com/nicksnyder/go-i18n/v2/i18n"
"io" "io"
"regexp" "regexp"

View File

@ -6,7 +6,7 @@ package handler
import ( import (
"fyne.io/fyne/v2/canvas" "fyne.io/fyne/v2/canvas"
"fyne.io/fyne/v2/widget" "fyne.io/fyne/v2/widget"
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/convertor" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/convertor"
) )
func getPathsToFF() []convertor.FFPathUtilities { func getPathsToFF() []convertor.FFPathUtilities {

View File

@ -1,7 +1,7 @@
package handler package handler
import ( import (
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/localizer" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/localizer"
) )
type MainHandler struct { type MainHandler struct {

View File

@ -2,8 +2,8 @@ package handler
import ( import (
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/localizer" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/localizer"
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/menu" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/menu"
"github.com/nicksnyder/go-i18n/v2/i18n" "github.com/nicksnyder/go-i18n/v2/i18n"
) )

View File

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

View File

@ -1,7 +1,7 @@
package localizer package localizer
import ( import (
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/setting" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/setting"
) )
type RepositoryContract interface { type RepositoryContract interface {

View File

@ -6,13 +6,13 @@ import (
"fyne.io/fyne/v2/app" "fyne.io/fyne/v2/app"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
"fyne.io/fyne/v2/widget" "fyne.io/fyne/v2/widget"
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/convertor" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/convertor"
error2 "git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/error" error2 "git.kor-elf.net/kor-elf/gui-for-ffmpeg/error"
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/handler" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/handler"
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/localizer" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/localizer"
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/menu" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/menu"
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/migration" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/migration"
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/setting" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/setting"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
"golang.org/x/text/language" "golang.org/x/text/language"
"gorm.io/driver/sqlite" "gorm.io/driver/sqlite"

View File

@ -5,7 +5,7 @@ import (
"fyne.io/fyne/v2/canvas" "fyne.io/fyne/v2/canvas"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
"fyne.io/fyne/v2/widget" "fyne.io/fyne/v2/widget"
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/localizer" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/localizer"
"github.com/nicksnyder/go-i18n/v2/i18n" "github.com/nicksnyder/go-i18n/v2/i18n"
"golang.org/x/image/colornames" "golang.org/x/image/colornames"
"net/url" "net/url"

View File

@ -1,7 +1,7 @@
package migration package migration
import ( import (
"git.kor-elf.net/kor-elf/gui-for-ffmpeg/src/setting" "git.kor-elf.net/kor-elf/gui-for-ffmpeg/setting"
"gorm.io/gorm" "gorm.io/gorm"
) )