From d44c8eba1cc400259c56ff5f5d0f2b6d2dbc54f9 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Mon, 28 Aug 2023 20:30:40 +1000 Subject: [PATCH] [v3] Use system logger instead of println --- v3/pkg/application/application.go | 4 ++-- v3/pkg/application/application_windows.go | 2 +- v3/pkg/application/dialogs_windows.go | 2 +- v3/pkg/application/menuitem.go | 5 +++-- v3/pkg/application/systemtray_darwin.go | 2 +- v3/pkg/application/systemtray_windows.go | 2 +- v3/pkg/application/webview_window_darwin.go | 4 ++-- v3/pkg/w32/theme.go | 6 +----- v3/plugins/kvstore/kvstore.go | 2 +- 9 files changed, 13 insertions(+), 16 deletions(-) diff --git a/v3/pkg/application/application.go b/v3/pkg/application/application.go index bb1df4615..1e8bcfc6a 100644 --- a/v3/pkg/application/application.go +++ b/v3/pkg/application/application.go @@ -88,7 +88,7 @@ func New(appOptions Options) *App { result.bindings, err = NewBindings(appOptions.Bind, appOptions.BindAliases) if err != nil { - println("Fatal error in application initialisation: ", err.Error()) + globalApplication.fatal("Fatal error in application initialisation: " + err.Error()) os.Exit(1) } @@ -101,7 +101,7 @@ func New(appOptions Options) *App { err = result.bindings.AddPlugins(appOptions.Plugins) if err != nil { - println("Fatal error in application initialisation: ", err.Error()) + globalApplication.fatal("Fatal error in application initialisation: " + err.Error()) os.Exit(1) } diff --git a/v3/pkg/application/application_windows.go b/v3/pkg/application/application_windows.go index 4a1b3d280..196abc611 100644 --- a/v3/pkg/application/application_windows.go +++ b/v3/pkg/application/application_windows.go @@ -306,7 +306,7 @@ func (m *windowsApp) unregisterWindow(w *windowsWebviewWindow) { func newPlatformApp(app *App) *windowsApp { err := w32.SetProcessDPIAware() if err != nil { - println("Fatal error in application initialisation: ", err.Error()) + globalApplication.fatal("Fatal error in application initialisation: ", err.Error()) os.Exit(1) } diff --git a/v3/pkg/application/dialogs_windows.go b/v3/pkg/application/dialogs_windows.go index 1ccf48600..b8fbd0e21 100644 --- a/v3/pkg/application/dialogs_windows.go +++ b/v3/pkg/application/dialogs_windows.go @@ -204,7 +204,7 @@ func showCfdDialog(newDlg func() (cfd.Dialog, error), isMultiSelect bool) (any, defer func() { err := dlg.Release() if err != nil { - println("ERROR: Unable to release dialog:", err.Error()) + globalApplication.error("Unable to release dialog: " + err.Error()) } }() diff --git a/v3/pkg/application/menuitem.go b/v3/pkg/application/menuitem.go index 74ed4ada4..bdbd7367f 100644 --- a/v3/pkg/application/menuitem.go +++ b/v3/pkg/application/menuitem.go @@ -1,6 +1,7 @@ package application import ( + "fmt" "os" "sync" "sync/atomic" @@ -179,7 +180,7 @@ func newRole(role Role) *MenuItem { return newFullScreenMenuItem() default: - println("No support for role:", role) + globalApplication.error(fmt.Sprintf("No support for role: %v", role)) os.Exit(1) } return nil @@ -219,7 +220,7 @@ func (m *MenuItem) handleClick() { func (m *MenuItem) SetAccelerator(shortcut string) *MenuItem { accelerator, err := parseAccelerator(shortcut) if err != nil { - println("ERROR: invalid accelerator:", err.Error()) + globalApplication.error("invalid accelerator:", err.Error()) return m } m.accelerator = accelerator diff --git a/v3/pkg/application/systemtray_darwin.go b/v3/pkg/application/systemtray_darwin.go index a454ccfef..1ff3357ce 100644 --- a/v3/pkg/application/systemtray_darwin.go +++ b/v3/pkg/application/systemtray_darwin.go @@ -46,7 +46,7 @@ func systrayClickCallback(id C.long, buttonID C.int) { // Get the system tray systemTray := systemTrayMap[uint(id)] if systemTray == nil { - println("system tray not found") + globalApplication.error("system tray not found", "id", id) return } systemTray.processClick(button(buttonID)) diff --git a/v3/pkg/application/systemtray_windows.go b/v3/pkg/application/systemtray_windows.go index 4ff7d8bd5..d40739b1a 100644 --- a/v3/pkg/application/systemtray_windows.go +++ b/v3/pkg/application/systemtray_windows.go @@ -167,7 +167,7 @@ func (s *windowsSystemTray) run() { // Set Default Callbacks if s.parent.clickHandler == nil { s.parent.clickHandler = func() { - println("Left Button Clicked") + globalApplication.info("Left Button Clicked") } } if s.parent.rightClickHandler == nil { diff --git a/v3/pkg/application/webview_window_darwin.go b/v3/pkg/application/webview_window_darwin.go index de7f7efc1..eab98a764 100644 --- a/v3/pkg/application/webview_window_darwin.go +++ b/v3/pkg/application/webview_window_darwin.go @@ -846,12 +846,12 @@ func (w *macosWebviewWindow) toggleDevTools() { func (w *macosWebviewWindow) reload() { //TODO: Implement - println("reload called on WebviewWindow", w.parent.id) + globalApplication.info("reload called on WebviewWindow", "parentID", w.parent.id) } func (w *macosWebviewWindow) forceReload() { //TODO: Implement - println("forceReload called on WebviewWindow", w.parent.id) + globalApplication.info("force reload called on WebviewWindow", "parentID", w.parent.id) } func (w *macosWebviewWindow) center() { diff --git a/v3/pkg/w32/theme.go b/v3/pkg/w32/theme.go index 3c2d42158..40ebb69bd 100644 --- a/v3/pkg/w32/theme.go +++ b/v3/pkg/w32/theme.go @@ -64,11 +64,7 @@ func SetTheme(hwnd uintptr, useDarkMode bool) { } func EnableTranslucency(hwnd uintptr, backdrop int32) { - if SupportsBackdropTypes() { - dwmSetWindowAttribute(hwnd, DwmwaSystemBackdropType, unsafe.Pointer(&backdrop), unsafe.Sizeof(backdrop)) - } else { - println("Warning: Translucency type unavailable on Windows < 22621") - } + dwmSetWindowAttribute(hwnd, DwmwaSystemBackdropType, unsafe.Pointer(&backdrop), unsafe.Sizeof(backdrop)) } func SetTitleBarColour(hwnd uintptr, titleBarColour int32) { diff --git a/v3/plugins/kvstore/kvstore.go b/v3/plugins/kvstore/kvstore.go index 62637578e..50370ffba 100644 --- a/v3/plugins/kvstore/kvstore.go +++ b/v3/plugins/kvstore/kvstore.go @@ -39,7 +39,7 @@ func (kvs *KeyValueStore) Shutdown() { if kvs.unsaved { err := kvs.Save() if err != nil { - println("Error saving store: " + err.Error()) + application.Get().Logger.Error("Error saving store: " + err.Error()) } } }