From 9b0f58ddf5fd412fcd8516f37bc8852e042bda7e Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Sat, 26 Sep 2020 16:08:55 +1000 Subject: [PATCH] Support OpenDialog --- lib/interfaces/renderer.go | 2 +- lib/renderer/bridge/bridge.go | 6 +++--- lib/renderer/webview.go | 4 ++-- runtime/dialog.go | 6 +++--- v2/internal/runtime/goruntime/dialog.go | 6 +++--- v2/test/runtime/runtime.go | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/interfaces/renderer.go b/lib/interfaces/renderer.go index d65a86b6..88744da5 100644 --- a/lib/interfaces/renderer.go +++ b/lib/interfaces/renderer.go @@ -18,7 +18,7 @@ type Renderer interface { // Dialog Runtime SelectFile(title string, filter string) string - SelectDirectory() []string + OpenDialog() []string SelectSaveFile(title string, filter string) string // Window Runtime diff --git a/lib/renderer/bridge/bridge.go b/lib/renderer/bridge/bridge.go index f7afd14d..58811799 100644 --- a/lib/renderer/bridge/bridge.go +++ b/lib/renderer/bridge/bridge.go @@ -119,10 +119,10 @@ func (h *Bridge) SelectFile(title string, filter string) string { return "" } -// SelectDirectory is unsupported for Bridge but required +// OpenDialog is unsupported for Bridge but required // for the Renderer interface -func (h *Bridge) SelectDirectory() string { - h.log.Warn("SelectDirectory() unsupported in bridge mode") +func (h *Bridge) OpenDialog() string { + h.log.Warn("OpenDialog() unsupported in bridge mode") return "" } diff --git a/lib/renderer/webview.go b/lib/renderer/webview.go index 46d98a94..36c4396e 100644 --- a/lib/renderer/webview.go +++ b/lib/renderer/webview.go @@ -263,8 +263,8 @@ func (w *WebView) SelectFile(title string, filter string) string { return result } -// SelectDirectory opens a dialog that allows the user to select a directory -func (w *WebView) SelectDirectory() []string { +// OpenDialog opens a dialog that allows the user to select a directory +func (w *WebView) OpenDialog() []string { var result string // We need to run this on the main thread, however Dispatch is // non-blocking so we launch this in a goroutine and wait for diff --git a/runtime/dialog.go b/runtime/dialog.go index 5d310821..a5f42cac 100644 --- a/runtime/dialog.go +++ b/runtime/dialog.go @@ -31,9 +31,9 @@ func (r *Dialog) SelectFile(params ...string) string { return r.renderer.SelectFile(title, filter) } -// SelectDirectory prompts the user to select a directory -func (r *Dialog) SelectDirectory() []string { - return r.renderer.SelectDirectory() +// OpenDialog prompts the user to select a directory +func (r *Dialog) OpenDialog() []string { + return r.renderer.OpenDialog() } // SelectSaveFile prompts the user to select a file for saving diff --git a/v2/internal/runtime/goruntime/dialog.go b/v2/internal/runtime/goruntime/dialog.go index 17735b08..20d017c8 100644 --- a/v2/internal/runtime/goruntime/dialog.go +++ b/v2/internal/runtime/goruntime/dialog.go @@ -11,7 +11,7 @@ import ( type Dialog interface { SaveFile(params ...string) string SelectFile(params ...string) string - SelectDirectory(params ...string) []string + OpenDialog(params ...string) []string } // dialog exposes the Dialog interface @@ -107,8 +107,8 @@ func (r *dialog) SaveFile(params ...string) string { return result.Data().(string) } -// SelectDirectory prompts the user to select a file -func (r *dialog) SelectDirectory(params ...string) []string { +// OpenDialog prompts the user to select a file +func (r *dialog) OpenDialog(params ...string) []string { // Extract title + filter title, filter := r.processTitleAndFilter(params...) diff --git a/v2/test/runtime/runtime.go b/v2/test/runtime/runtime.go index ca5f7103..bfc40d16 100644 --- a/v2/test/runtime/runtime.go +++ b/v2/test/runtime/runtime.go @@ -76,9 +76,9 @@ func (r *RuntimeTest) SaveFile(title string, filter string) string { return r.runtime.Dialog.SaveFile(title, filter) } -// SelectDirectory will call the Runtime.Dialog.OpenDirectory method -func (r *RuntimeTest) SelectDirectory(title string, filter string) []string { - return r.runtime.Dialog.SelectDirectory(title, filter) +// OpenDialog will call the Runtime.Dialog.OpenDirectory method +func (r *RuntimeTest) OpenDialog(title string, filter string) []string { + return r.runtime.Dialog.OpenDialog(title, filter) } // HideWindow will call the Runtime.Window.Hide method and then call