Compare commits

..

2 Commits

Author SHA1 Message Date
Lea Anthony 5ef32760f0 Update task 2023-01-18 22:08:25 +11:00
Lea Anthony 81645190f0 merge exp branch 2023-01-18 21:42:49 +11:00
16 changed files with 37 additions and 26 deletions
+1 -1
View File
@@ -141,7 +141,7 @@ func (a *App) start() error {
// Defer the shutdown
defer a.shutdown()
// run the renderer
// Run the renderer
err = a.renderer.Run()
if err != nil {
return err
+1 -1
View File
@@ -55,7 +55,7 @@ func newIPCMessage(incomingMessage string, responseFunction func(*ipcResponse) e
// hasCallbackID checks if the message can send an error back to the frontend
func (m *ipcMessage) hasCallbackID() error {
if m.CallbackID == "" {
return fmt.Errorf("attempted to return error to message with no callback ID")
return fmt.Errorf("attempted to return error to message with no Callback ID")
}
return nil
}
+2 -2
View File
@@ -186,7 +186,7 @@ func (w *WebView) evalJSSync(js string) error {
go func() {
exit := false
// We are done when we receive the callback ID
// We are done when we receive the Callback ID
w.log.Debug("SyncJS: sending with ID = " + ID)
w.eventManager.On(ID, func(...interface{}) {
w.log.Debug("SyncJS: Got callback ID = " + ID)
@@ -361,7 +361,7 @@ func (w *WebView) focus() {
// callback sends a callback to the frontend
func (w *WebView) callback(data string) error {
callbackCMD := fmt.Sprintf("window.wails._.callback('%s');", data)
callbackCMD := fmt.Sprintf("window.wails._.Callback('%s');", data)
return w.evalJS(callbackCMD)
}
+1 -1
View File
@@ -53,7 +53,7 @@ func main() {
// create windows programmatically and be able to show/hide
// them from the systray with something like:
//
// myWindow := mainApp.NewWebviewWindow(...)
// myWindow := mainApp.NewWindow(...)
// mainApp.NewSystemTray(&options.SystemTray{
// OnLeftClick: func() {
// myWindow.SetVisibility(!myWindow.IsVisible())
@@ -26,8 +26,6 @@ import (
"github.com/wailsapp/wails/v2/pkg/assetserver"
"github.com/wailsapp/wails/v2/pkg/assetserver/webview"
"github.com/wailsapp/wails/v2/pkg/assetserver"
"github.com/wailsapp/wails/v2/internal/binding"
"github.com/wailsapp/wails/v2/internal/frontend"
"github.com/wailsapp/wails/v2/internal/frontend/runtime"
@@ -329,7 +327,7 @@ func (f *Frontend) processMessage(message string) {
switch result[0] {
case 'c':
// callback from a method call
// Callback from a method call
f.Callback(result[1:])
default:
f.logger.Info("Unknown message returned from dispatcher: %+v", result)
@@ -339,7 +337,7 @@ func (f *Frontend) processMessage(message string) {
}
func (f *Frontend) Callback(message string) {
f.ExecJS(`window.wails.callback(` + strconv.Quote(message) + `);`)
f.ExecJS(`window.wails.Callback(` + strconv.Quote(message) + `);`)
}
func (f *Frontend) ExecJS(js string) {
@@ -428,7 +428,7 @@ func (f *Frontend) processMessage(message string) {
switch result[0] {
case 'c':
// callback from a method call
// Callback from a method call
f.Callback(result[1:])
default:
f.logger.Info("Unknown message returned from dispatcher: %+v", result)
@@ -437,7 +437,7 @@ func (f *Frontend) processMessage(message string) {
}
func (f *Frontend) Callback(message string) {
f.ExecJS(`window.wails.callback(` + strconv.Quote(message) + `);`)
f.ExecJS(`window.wails.Callback(` + strconv.Quote(message) + `);`)
}
func (f *Frontend) startDrag() {
@@ -628,7 +628,7 @@ func (f *Frontend) processMessage(message string) {
switch result[0] {
case 'c':
// callback from a method call
// Callback from a method call
f.Callback(result[1:])
default:
f.logger.Info("Unknown message returned from dispatcher: %+v", result)
@@ -638,7 +638,7 @@ func (f *Frontend) processMessage(message string) {
func (f *Frontend) Callback(message string) {
f.mainWindow.Invoke(func() {
f.chromium.Eval(`window.wails.callback(` + strconv.Quote(message) + `);`)
f.chromium.Eval(`window.wails.Callback(` + strconv.Quote(message) + `);`)
})
}
+1 -1
View File
@@ -129,7 +129,7 @@ func (e *Events) notifyBackend(eventName string, data ...interface{}) {
// We have a dirty flag to indicate that there are items to delete
itemsToDelete := false
// callback in goroutine
// Callback in goroutine
for _, listener := range listeners {
if listener.counter > 0 {
listener.counter--
+1 -2
View File
@@ -2,7 +2,6 @@ package menumanager
import (
"fmt"
"github.com/wailsapp/wails/v2/pkg/menu"
)
@@ -91,7 +90,7 @@ func (m *Manager) ProcessClick(menuID string, data string, menuType string, pare
return fmt.Errorf("No callback for menu '%s'", menuItem.Label)
}
// Create new callback struct
// Create new Callback struct
callbackData := &menu.CallbackData{
MenuItem: menuItem,
//ContextData: data,
+2 -2
View File
@@ -26,8 +26,8 @@ type TrayMenu struct {
// Tooltip
Tooltip string
// callback function when menu clicked
//Click callback `json:"-"`
// Callback function when menu clicked
//Click Callback `json:"-"`
// Disabled makes the item unselectable
Disabled bool
+3
View File
@@ -0,0 +1,3 @@
# v3
This directory is experimental. It probably won't work for you. There's no support for this directory. Dragons be here. You have been warned!
+10 -2
View File
@@ -74,6 +74,14 @@ NOTE: Whilst the tool will work for 32-bit Windows, it is not supported. Please
#### defaults
```bash
wails icon -input myicon.png -sizes "32,64,128" -windowsFilename myicon.ico -macFilename myicon.icns
wails generate defaults
```
This will generate all the default assets and resources in the current directory. I
This will generate all the default assets and resources in the current directory.
#### bindings
```bash
wails generate bindings
```
Generates bindings and models for your bound Go methods and structs.
+1 -1
View File
@@ -10,7 +10,7 @@ import (
)
func main() {
app := clir.NewCli("wails", "The Wails CLI", "v3")
app := clir.NewCli("Wails", "The Wails CLI", "v3")
app.NewSubCommandFunction("init", "Initialise a new project", commands.Init)
task := app.NewSubCommand("task", "Run and list tasks")
task.NewSubCommandFunction("run", "Run a task", commands.RunTask)
+1 -3
View File
@@ -3,7 +3,7 @@ module github.com/wailsapp/wails/v3
go 1.19
require (
github.com/go-task/task/v3 v3.19.1
github.com/go-task/task/v3 v3.20.0
github.com/jackmordaunt/icns/v2 v2.2.1
github.com/leaanthony/clir v1.5.0
github.com/leaanthony/winicon v1.0.0
@@ -52,5 +52,3 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
mvdan.cc/sh/v3 v3.6.0 // indirect
)
replace github.com/go-task/task/v3 v3.19.1 => github.com/wailsapp/task/v3 v3.19.1
+2
View File
@@ -23,6 +23,8 @@ github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYF
github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
github.com/go-task/task/v3 v3.20.0 h1:pTavuhP+AiEpKLzh5I6Lja9Ux7ypYO5QMsEPTbhYEDc=
github.com/go-task/task/v3 v3.20.0/go.mod h1:y7rWakbLR5gFElGgo6rA2dyr6vU/zNIDVfn3S4Of6OI=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/gookit/color v1.4.2/go.mod h1:fqRyamkC1W8uxl+lxCQxOT09l/vYfZ+QeiX3rKQHCoQ=
github.com/gookit/color v1.5.0/go.mod h1:43aQb+Zerm/BWh2GnrgOQm7ffz7tvQXEKV6BFMl7wAo=
+5 -2
View File
@@ -39,7 +39,10 @@ func ListTasks(options *ListTaskOptions) error {
if err := e.Setup(); err != nil {
return err
}
tasks := e.GetTaskList()
tasks, err := e.GetTaskList()
if err != nil {
return err
}
if len(tasks) == 0 {
return fmt.Errorf("no tasks found. Ensure there is a `Taskfile.yml` in your project. You can generate a default takfile by running `wails generate defaults`")
}
@@ -57,7 +60,7 @@ func ListTasks(options *ListTaskOptions) error {
thisRow[1] = thisTask.Summary
tableData = append(tableData, thisRow)
}
err := pterm.DefaultTable.WithHasHeader(true).WithHeaderRowSeparator("-").WithData(tableData).Render()
err = pterm.DefaultTable.WithHasHeader(true).WithHeaderRowSeparator("-").WithData(tableData).Render()
if err != nil {
return err
}