From 505bb51a27262dd81140f32d21048f33f6a646df Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Sun, 5 Sep 2021 16:21:24 +1000 Subject: [PATCH] [v2] Tidy up. --- v2/cmd/wails/internal/commands/dev/dev.go | 12 ++---------- v2/cmd/wails/internal/commands/doctor/doctor.go | 2 ++ v2/pkg/options/options.go | 3 +-- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/v2/cmd/wails/internal/commands/dev/dev.go b/v2/cmd/wails/internal/commands/dev/dev.go index 72df9c90..03bd0bc7 100644 --- a/v2/cmd/wails/internal/commands/dev/dev.go +++ b/v2/cmd/wails/internal/commands/dev/dev.go @@ -69,14 +69,6 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error { extensions := "go" command.StringFlag("e", "Extensions to trigger rebuilds (comma separated) eg go", &extensions) - // extensions to trigger reloads in the application - reloadEnabled := true - command.BoolFlag("r", "Reload on asset changes", &reloadEnabled) - - // extensions to trigger rebuilds - showWarnings := false - command.BoolFlag("w", "Show warnings", &showWarnings) - openBrowser := false command.BoolFlag("browser", "Open application in browser", &openBrowser) @@ -84,11 +76,11 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error { command.BoolFlag("noreload", "Disable reload on asset change", &noreload) wailsjsdir := "" - command.StringFlag("wailsjsdir", "Directory to generate api module", &wailsjsdir) + command.StringFlag("wailsjsdir", "Directory to generate the Wails JS modules", &wailsjsdir) // Verbosity verbosity := 1 - command.IntFlag("v", "Verbosity level (0 - silent, 1 - default, 2 - verbose)", &verbosity) + command.IntFlag("v", "Verbosity level (0 - silent, 1 - standard, 2 - verbose)", &verbosity) loglevel := "" command.StringFlag("loglevel", "Loglevel to use - Trace, Dev, Info, Warning, Error", &loglevel) diff --git a/v2/cmd/wails/internal/commands/doctor/doctor.go b/v2/cmd/wails/internal/commands/doctor/doctor.go index ced0af84..0075a7ef 100644 --- a/v2/cmd/wails/internal/commands/doctor/doctor.go +++ b/v2/cmd/wails/internal/commands/doctor/doctor.go @@ -35,6 +35,8 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error { } logger.Println("Done.") + logger.Println("") + // Start a new tabwriter w := new(tabwriter.Writer) w.Init(os.Stdout, 8, 8, 0, '\t', 0) diff --git a/v2/pkg/options/options.go b/v2/pkg/options/options.go index 60170895..a7cec7c8 100644 --- a/v2/pkg/options/options.go +++ b/v2/pkg/options/options.go @@ -10,7 +10,6 @@ import ( "github.com/imdario/mergo" "github.com/wailsapp/wails/v2/pkg/logger" - "github.com/wailsapp/wails/v2/pkg/options/mac" ) // App contains options for creating the App @@ -40,7 +39,7 @@ type App struct { //ContextMenus []*menu.ContextMenu //TrayMenus []*menu.TrayMenu Windows *windows.Options - Mac *mac.Options + //Mac *mac.Options } // MergeDefaults will set the minimum default values for an application