Compare commits
No commits in common. "d0539f5e90733a39f435883b487ef80cbe838af8" and "0d05fdb30703bf82b20d752128f496ab13e339ed" have entirely different histories.
d0539f5e90
...
0d05fdb307
@ -29,7 +29,7 @@ func (v View) blockDownloadFFmpeg(
|
||||
|
||||
var buttonDownloadFFmpeg *widget.Button
|
||||
|
||||
buttonDownloadFFmpeg = widget.NewButton(v.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
|
||||
buttonDownloadFFmpeg = widget.NewButton(v.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "download",
|
||||
}), func() {
|
||||
buttonDownloadFFmpeg.Disable()
|
||||
@ -42,13 +42,13 @@ func (v View) blockDownloadFFmpeg(
|
||||
buttonDownloadFFmpeg.Enable()
|
||||
})
|
||||
|
||||
downloadFFmpegFromSiteMessage := v.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
|
||||
downloadFFmpegFromSiteMessage := v.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "downloadFFmpegFromSite",
|
||||
})
|
||||
|
||||
return container.NewVBox(
|
||||
canvas.NewLine(colornames.Darkgreen),
|
||||
widget.NewCard(v.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
|
||||
widget.NewCard(v.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "buttonDownloadFFmpeg",
|
||||
}), "", container.NewVBox(
|
||||
widget.NewRichTextFromMarkdown(
|
||||
|
@ -29,7 +29,7 @@ func (h ConvertorHandler) downloadFFmpeg(progressBar *widget.ProgressBar, progre
|
||||
return err
|
||||
}
|
||||
}
|
||||
progressMessage.Text = h.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
|
||||
progressMessage.Text = h.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "downloadRun",
|
||||
})
|
||||
progressMessage.Refresh()
|
||||
@ -38,7 +38,7 @@ func (h ConvertorHandler) downloadFFmpeg(progressBar *widget.ProgressBar, progre
|
||||
return err
|
||||
}
|
||||
|
||||
progressMessage.Text = h.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
|
||||
progressMessage.Text = h.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "unzipRun",
|
||||
})
|
||||
progressMessage.Refresh()
|
||||
@ -48,7 +48,7 @@ func (h ConvertorHandler) downloadFFmpeg(progressBar *widget.ProgressBar, progre
|
||||
}
|
||||
_ = os.Remove("ffmpeg/ffmpeg.zip")
|
||||
|
||||
progressMessage.Text = h.app.GetLocalizerService().GetMessage(&i18n.LocalizeConfig{
|
||||
progressMessage.Text = h.localizerService.GetMessage(&i18n.LocalizeConfig{
|
||||
MessageID: "testFF",
|
||||
})
|
||||
progressMessage.Refresh()
|
||||
|
38
main.go
38
main.go
@ -18,7 +18,7 @@ import (
|
||||
"os"
|
||||
)
|
||||
|
||||
var application kernel.AppContract
|
||||
var app kernel.AppContract
|
||||
var ffPathUtilities *kernel.FFPathUtilities
|
||||
|
||||
func init() {
|
||||
@ -41,7 +41,7 @@ func init() {
|
||||
localizerService.AddListener(layoutLocalizerListener)
|
||||
|
||||
queue := kernel.NewQueueList()
|
||||
application = kernel.NewApp(
|
||||
app = kernel.NewApp(
|
||||
appMetadata,
|
||||
localizerService,
|
||||
queue,
|
||||
@ -51,17 +51,17 @@ func init() {
|
||||
}
|
||||
|
||||
func main() {
|
||||
errorView := error2.NewView(application)
|
||||
errorView := error2.NewView(app)
|
||||
if canCreateFile("data/database") != true {
|
||||
errorView.PanicErrorWriteDirectoryData()
|
||||
application.GetWindow().ShowAndRun()
|
||||
app.GetWindow().ShowAndRun()
|
||||
return
|
||||
}
|
||||
|
||||
db, err := gorm.Open(sqlite.Open("data/database"), &gorm.Config{})
|
||||
if err != nil {
|
||||
errorView.PanicError(err)
|
||||
application.GetWindow().ShowAndRun()
|
||||
app.GetWindow().ShowAndRun()
|
||||
return
|
||||
}
|
||||
|
||||
@ -70,7 +70,7 @@ func main() {
|
||||
err = migration.Run(db)
|
||||
if err != nil {
|
||||
errorView.PanicError(err)
|
||||
application.GetWindow().ShowAndRun()
|
||||
app.GetWindow().ShowAndRun()
|
||||
return
|
||||
}
|
||||
|
||||
@ -79,7 +79,7 @@ func main() {
|
||||
pathFFmpeg, err := convertorRepository.GetPathFfmpeg()
|
||||
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) == false {
|
||||
errorView.PanicError(err)
|
||||
application.GetWindow().ShowAndRun()
|
||||
app.GetWindow().ShowAndRun()
|
||||
return
|
||||
}
|
||||
ffPathUtilities.FFmpeg = pathFFmpeg
|
||||
@ -87,29 +87,29 @@ func main() {
|
||||
pathFFprobe, err := convertorRepository.GetPathFfprobe()
|
||||
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) == false {
|
||||
errorView.PanicError(err)
|
||||
application.GetWindow().ShowAndRun()
|
||||
app.GetWindow().ShowAndRun()
|
||||
return
|
||||
}
|
||||
ffPathUtilities.FFprobe = pathFFprobe
|
||||
|
||||
application.RunConvertor()
|
||||
defer application.AfterClosing()
|
||||
app.RunConvertor()
|
||||
defer app.AfterClosing()
|
||||
|
||||
localizerView := localizer.NewView(application)
|
||||
convertorView := convertor.NewView(application)
|
||||
convertorHandler := handler.NewConvertorHandler(application, convertorView, convertorRepository)
|
||||
localizerView := localizer.NewView(app)
|
||||
convertorView := convertor.NewView(app)
|
||||
convertorHandler := handler.NewConvertorHandler(app, convertorView, convertorRepository)
|
||||
|
||||
localizerRepository := localizer.NewRepository(settingRepository)
|
||||
menuView := menu.NewView(application)
|
||||
menuView := menu.NewView(app)
|
||||
localizerListener := handler.NewLocalizerListener()
|
||||
application.GetLocalizerService().AddListener(localizerListener)
|
||||
mainMenu := handler.NewMenuHandler(application, convertorHandler, menuView, localizerView, localizerRepository, localizerListener)
|
||||
app.GetLocalizerService().AddListener(localizerListener)
|
||||
mainMenu := handler.NewMenuHandler(app, convertorHandler, menuView, localizerView, localizerRepository, localizerListener)
|
||||
|
||||
mainHandler := handler.NewMainHandler(application, convertorHandler, mainMenu, localizerRepository)
|
||||
mainHandler := handler.NewMainHandler(app, convertorHandler, mainMenu, localizerRepository)
|
||||
mainHandler.Start()
|
||||
|
||||
application.GetWindow().SetMainMenu(mainMenu.GetMainMenu())
|
||||
application.GetWindow().ShowAndRun()
|
||||
app.GetWindow().SetMainMenu(mainMenu.GetMainMenu())
|
||||
app.GetWindow().ShowAndRun()
|
||||
}
|
||||
|
||||
func appCloseWithDb(db *gorm.DB) {
|
||||
|
Loading…
Reference in New Issue
Block a user