Compare commits

..

No commits in common. "846986279c1cdb75a793dd672fd8aa50deeca209" and "7cc22e1553f87e8198ba1473ff9a93cf41d0c339" have entirely different histories.

10 changed files with 13 additions and 51 deletions

View File

@ -2,7 +2,6 @@ package convertor
import ( import (
"errors" "errors"
"ffmpegGui/helper"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/canvas" "fyne.io/fyne/v2/canvas"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
@ -132,7 +131,6 @@ func (v View) getButtonFileVideoForConversion(form *widget.Form, progress *widge
progress.Refresh() progress.Refresh()
conversionMessage.Text = "" conversionMessage.Text = ""
}, v.w) }, v.w)
helper.FileDialogResize(fileDialog, v.w)
fileDialog.Show() fileDialog.Show()
}) })
@ -164,7 +162,6 @@ func (v View) getButtonForSelectingDirectoryForSaving() (button *widget.Button,
buttonMessage.Text = r.Path() buttonMessage.Text = r.Path()
setStringSuccessStyle(buttonMessage) setStringSuccessStyle(buttonMessage)
}, v.w) }, v.w)
helper.FileDialogResize(fileDialog, v.w)
fileDialog.Show() fileDialog.Show()
}) })

View File

@ -9,6 +9,7 @@ import (
"fyne.io/fyne/v2/widget" "fyne.io/fyne/v2/widget"
"io" "io"
"regexp" "regexp"
"runtime"
"strconv" "strconv"
"strings" "strings"
) )
@ -68,7 +69,12 @@ func (h ConvertorHandler) checkingFFPathUtilities() bool {
return true return true
} }
pathsToFF := getPathsToFF() var pathsToFF []convertor.FFPathUtilities
if runtime.GOOS == "windows" {
pathsToFF = []convertor.FFPathUtilities{{"ffmpeg\\bin\\ffmpeg.exe", "ffmpeg\\bin\\ffprobe.exe"}}
} else {
pathsToFF = []convertor.FFPathUtilities{{"ffmpeg/bin/ffmpeg", "ffmpeg/bin/ffprobe"}, {"ffmpeg", "ffprobe"}}
}
for _, item := range pathsToFF { for _, item := range pathsToFF {
ffmpegChecking, _ := h.convertorService.ChangeFFmpegPath(item.FFmpeg) ffmpegChecking, _ := h.convertorService.ChangeFFmpegPath(item.FFmpeg)
if ffmpegChecking == false { if ffmpegChecking == false {

View File

@ -1,10 +0,0 @@
//go:build !windows
// +build !windows
package handler
import "ffmpegGui/convertor"
func getPathsToFF() []convertor.FFPathUtilities {
return []convertor.FFPathUtilities{{"ffmpeg/bin/ffmpeg", "ffmpeg/bin/ffprobe"}, {"ffmpeg", "ffprobe"}}
}

View File

@ -1,8 +0,0 @@
//go:build windows
// +build windows
package handler
func getPathsToFF() []convertor.FFPathUtilities {
return []convertor.FFPathUtilities{{"ffmpeg\\bin\\ffmpeg.exe", "ffmpeg\\bin\\ffprobe.exe"}}
}

View File

@ -1,11 +1,10 @@
package helper package helper
import ( import "runtime"
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/dialog"
)
func FileDialogResize(fileDialog *dialog.FileDialog, w fyne.Window) { func PathSeparator() string {
contentSize := w.Content().Size() if runtime.GOOS == "windows" {
fileDialog.Resize(fyne.Size{Width: contentSize.Width - 50, Height: contentSize.Height - 50}) return "\\"
}
return "/"
} }

View File

@ -1,8 +0,0 @@
//go:build !windows
// +build !windows
package helper
func PathSeparator() string {
return "/"
}

View File

@ -1,8 +0,0 @@
//go:build windows
// +build windows
package helper
func PathSeparator() string {
return "\\"
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

View File

@ -19,10 +19,6 @@ import (
func main() { func main() {
a := app.New() a := app.New()
iconResource, err := fyne.LoadResourceFromPath("icon.png")
if err == nil {
a.SetIcon(iconResource)
}
w := a.NewWindow("GUI FFMpeg!") w := a.NewWindow("GUI FFMpeg!")
w.Resize(fyne.Size{Width: 800, Height: 600}) w.Resize(fyne.Size{Width: 800, Height: 600})
w.CenterOnScreen() w.CenterOnScreen()

View File

@ -1,7 +1,6 @@
package setting package setting
import ( import (
"ffmpegGui/helper"
"fyne.io/fyne/v2" "fyne.io/fyne/v2"
"fyne.io/fyne/v2/canvas" "fyne.io/fyne/v2/canvas"
"fyne.io/fyne/v2/container" "fyne.io/fyne/v2/container"
@ -82,7 +81,6 @@ func (v View) getButtonSelectFile() (filePath *string, button *widget.Button, bu
buttonMessage.Text = r.URI().Path() buttonMessage.Text = r.URI().Path()
setStringSuccessStyle(buttonMessage) setStringSuccessStyle(buttonMessage)
}, v.w) }, v.w)
helper.FileDialogResize(fileDialog, v.w)
fileDialog.Show() fileDialog.Show()
}) })