Merge pull request 'Версия 0.1.1' (#1) from develop into main

Reviewed-on: kor-elf/ffmpeg-gui#1

src/convertor/view.go

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

src/handler/convertor.go

@@ -9,6 +9,7 @@ import (
 	"fyne.io/fyne/v2/widget"
 	"io"
 	"regexp"
+	"runtime"
 	"strconv"
 	"strings"
 )
@@ -68,7 +69,12 @@ func (h ConvertorHandler) checkingFFPathUtilities() bool {
 		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 {
 		ffmpegChecking, _ := h.convertorService.ChangeFFmpegPath(item.FFmpeg)
 		if ffmpegChecking == false {

src/handler/convertor_anyos.go

@@ -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"}}
-}

src/handler/convertor_windows.go

@@ -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"}}
-}

src/helper/helper.go

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

src/helper/path_separator.go

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

src/helper/path_separator_window.go

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

src/main.go

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

src/setting/view.go

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