diff options
72 files changed, 109 insertions, 103 deletions
@@ -4,12 +4,9 @@ *.so examples/buttons/buttons +examples/cloudflare/cloudflare examples/console-ui-helloworld/console-ui-helloworld -examples/debug/debug examples/helloworld/helloworld -examples/textbox/textbox -examples/cloudflare/cloudflare -examples/*/helloconsole # protobuf compiled files protobuf/*.pb.go @@ -17,7 +14,3 @@ protobuf/*.pb.go # temporary files when building debian packages /*.deb /files -/ - -# ignore the generated readme -/README-goreadme.md @@ -84,10 +84,6 @@ goget: make -C toolkit/gocui goget make -C toolkit/andlabs goget -# GO111MODULE=on go install github.com/posener/goreadme/cmd/goreadme@latest (worked Oct 20 2022) -README.md: doc.go - -goreadme -factories -types -functions -variabless > README-goreadme.md - clean: rm -f toolkit/*.so cd debian && make clean @@ -1,7 +1,7 @@ package gui import ( - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) func (parent *Node) NewBox(name string, b bool) *Node { @@ -1,6 +1,6 @@ package gui -import "git.wit.org/wit/gui/toolkit" +import "go.wit.com/gui/toolkit" func (parent *Node) NewButton(name string, custom func()) *Node { newNode := parent.newNode(name, toolkit.Button) @@ -6,7 +6,7 @@ package gui import ( // "regexp" - // "git.wit.org/wit/gui/toolkit" + // "go.wit.com/gui/toolkit" "sync" "runtime" "github.com/sourcegraph/conc" diff --git a/checkbox.go b/checkbox.go index db3eb19..1e72a7c 100644 --- a/checkbox.go +++ b/checkbox.go @@ -1,6 +1,6 @@ package gui -import "git.wit.org/wit/gui/toolkit" +import "go.wit.com/gui/toolkit" func (n *Node) Checked() bool { return n.B @@ -4,7 +4,7 @@ package gui import ( "regexp" - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) // functions for handling text related GUI elements @@ -5,7 +5,7 @@ package gui import ( "strconv" - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) // various debugging flags diff --git a/debugWidget.go b/debugWidget.go index 385f47a..d290e59 100644 --- a/debugWidget.go +++ b/debugWidget.go @@ -2,7 +2,7 @@ package gui import ( "strconv" - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) diff --git a/debugWindow.go b/debugWindow.go index 338461e..cc0c8a8 100644 --- a/debugWindow.go +++ b/debugWindow.go @@ -1,7 +1,7 @@ package gui import ( -// "git.wit.org/wit/gui/toolkit" +// "go.wit.com/gui/toolkit" ) // TODO: move all this shit into somewhere not global @@ -7,7 +7,7 @@ package gui import ( - "git.wit.org/wit/gui/toolkit/andlabs-direct" + "go.wit.com/gui/toolkit/andlabs-direct" ) func trythis() { @@ -22,8 +22,10 @@ This worked on debian sid (mate-desktop) on 2023/12/03 I didn't record the dependances needed (gtk-dev) export GO111MODULE="off" - make + go get go.wit.com/gui +When I am working on toolkit plugins, then I work +directly from ~/go/src/go.wit.com/gui/ Hello World Example @@ -32,24 +34,19 @@ Hello World Example import ( "log" - "git.wit.org/wit/gui" + "go.wit.com/gui" ) - var window *gui.Node // This is the beginning of the binary tree of widgets + var myGui *gui.Node // This is the beginning of the binary tree of widgets // go will sit here until the window exits func main() { - gui.Init() - gui.Main(helloworld) + myGui = gui.New() } // This initializes the first window and 2 tabs func helloworld() { - gui.Config.Title = "Hello World golang wit/gui Window" - gui.Config.Width = 640 - gui.Config.Height = 480 - - window := gui.NewWindow() + window := myGui.NewWindow("hello world") addTab(window, "A Simple Tab Demo") addTab(window, "A Second Tab") } @@ -63,6 +60,9 @@ Hello World Example }) } +Hopefully this code example will remain syntactically +consistant. + External Toolkits * andlabs - https://github.com/andlabs/ui @@ -89,7 +89,7 @@ external things which might be useful * [MS Windows Application Library Kit](https://github.com/lxn/walk) * [Federated git pull](https://github.com/forgefed/forgefed) Hopefully this will work for me with gitea * [Github mirror](https://github.com/wit-go/gui) This repo on mirror. Hopefully I won't have to use this. -* [WIT GO projects](https://go.wit.org/) Attempt to model go.uber.org +* [WIT GO projects](https://go.wit.com/) Attempt to model go.uber.org */ package gui diff --git a/dropdown.go b/dropdown.go index cd00bf3..e3bfe2b 100644 --- a/dropdown.go +++ b/dropdown.go @@ -6,7 +6,7 @@ package gui // since it is the same. confusing names? maybe... import ( - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) // add a new entry to the dropdown name diff --git a/examples/buttons/log.go b/examples/buttons/log.go index 7d65d05..bf3d1a5 100644 --- a/examples/buttons/log.go +++ b/examples/buttons/log.go @@ -4,8 +4,8 @@ package main import ( "fmt" arg "github.com/alexflint/go-arg" - "git.wit.org/wit/gui" - log "git.wit.org/wit/gui/log" + "go.wit.com/gui" + log "go.wit.com/gui/log" ) diff --git a/examples/buttons/main.go b/examples/buttons/main.go index 3200e9e..e76aaac 100644 --- a/examples/buttons/main.go +++ b/examples/buttons/main.go @@ -5,7 +5,7 @@ import ( "fmt" "log" "strconv" - "git.wit.org/wit/gui" + "go.wit.com/gui" ) var title string = "Demo Plugin Window" diff --git a/examples/cloudflare/api.go b/examples/cloudflare/api.go index 9522b07..c65fbde 100644 --- a/examples/cloudflare/api.go +++ b/examples/cloudflare/api.go @@ -80,7 +80,7 @@ func getZonefile(c *configT) *DNSRecords { This will talk to the cloudflare API and generate a resource record in the zonefile: For example: - gitea.wit.com. 3600 IN CNAME git.wit.org. + gitea.wit.com. 3600 IN CNAME git.wit.com. go.wit.com. 3600 IN A 1.1.1.9 test.wit.com. 3600 IN NS ns1.wit.com. */ diff --git a/examples/cloudflare/argv.go b/examples/cloudflare/argv.go index 38579c7..49167cd 100644 --- a/examples/cloudflare/argv.go +++ b/examples/cloudflare/argv.go @@ -4,8 +4,8 @@ package main import ( "fmt" arg "github.com/alexflint/go-arg" - "git.wit.org/wit/gui" - log "git.wit.org/wit/gui/log" + "go.wit.com/gui" + log "go.wit.com/gui/log" ) diff --git a/examples/cloudflare/gui.go b/examples/cloudflare/gui.go index ed08482..587a9bc 100644 --- a/examples/cloudflare/gui.go +++ b/examples/cloudflare/gui.go @@ -5,7 +5,7 @@ import ( "log" "strconv" - "git.wit.org/jcarr/control-panel-dns/cloudflare" + "go.wit.com/control-panel-dns/cloudflare" ) func loadDNS(c *configT) { diff --git a/examples/cloudflare/main.go b/examples/cloudflare/main.go index aeb8570..64dabc5 100644 --- a/examples/cloudflare/main.go +++ b/examples/cloudflare/main.go @@ -8,8 +8,8 @@ import ( "bufio" "strings" - "git.wit.org/wit/gui" - "git.wit.org/jcarr/control-panel-dns/cloudflare" + "go.wit.com/gui" + "go.wit.com/control-panel-dns/cloudflare" ) var title string = "Cloudflare DNS Control Panel" diff --git a/examples/cloudflare/structs.go b/examples/cloudflare/structs.go index 50647d7..fa5516b 100644 --- a/examples/cloudflare/structs.go +++ b/examples/cloudflare/structs.go @@ -2,7 +2,7 @@ package main import ( - "git.wit.org/wit/gui" + "go.wit.com/gui" ) var cloudflareURL string = "https://api.cloudflare.com/client/v4/zones/" diff --git a/examples/example_test.go b/examples/example_test.go index f65cad1..0086908 100644 --- a/examples/example_test.go +++ b/examples/example_test.go @@ -17,7 +17,7 @@ package gui_test import ( - "git.wit.org/wit/gui" + "go.wit.com/gui" ) // This example demonstrates how to create a NewWindow() diff --git a/examples/helloworld/main.go b/examples/helloworld/main.go index 3d8ba40..06c1da5 100644 --- a/examples/helloworld/main.go +++ b/examples/helloworld/main.go @@ -3,7 +3,7 @@ package main import ( "log" - "git.wit.org/wit/gui" + "go.wit.com/gui" ) func main() { @@ -1,26 +1,28 @@ -module gui +module go.wit.com/gui go 1.21.1 require ( - git.wit.org/wit/gui v0.8.6 + git.wit.org/jcarr/control-panel-dns v0.1.2 github.com/alexflint/go-arg v1.4.3 github.com/andlabs/ui v0.0.0-20200610043537-70a69d6ae31e github.com/awesome-gocui/gocui v1.1.0 + github.com/davecgh/go-spew v1.1.1 + github.com/golang/protobuf v1.5.3 + github.com/sourcegraph/conc v0.3.0 ) require ( github.com/alexflint/go-scalar v1.2.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect github.com/gdamore/encoding v1.0.0 // indirect github.com/gdamore/tcell/v2 v2.6.0 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect github.com/mattn/go-runewidth v0.0.14 // indirect github.com/rivo/uniseg v0.4.4 // indirect - github.com/sourcegraph/conc v0.3.0 // indirect go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.9.0 // indirect golang.org/x/sys v0.5.0 // indirect golang.org/x/term v0.5.0 // indirect golang.org/x/text v0.7.0 // indirect + google.golang.org/protobuf v1.26.0 // indirect ) @@ -1,5 +1,5 @@ -git.wit.org/wit/gui v0.8.6 h1:n4V1eSm2LPmObGniX8kTQPT07xxumV5rPuDlXVGz/n8= -git.wit.org/wit/gui v0.8.6/go.mod h1:Bzt8Nzznjmo4AjBZtMg+wJEFNdpGvP6amxacVLgVCWg= +git.wit.org/jcarr/control-panel-dns v0.1.2 h1:sir4X2vyIInDLfFNTP6PjsbsVbeZ5Izg75PNmA2dd4A= +git.wit.org/jcarr/control-panel-dns v0.1.2/go.mod h1:F4AHUeumaEZqQwLpca0tNcHT2xYXLAd8H6WahG73zpw= github.com/alexflint/go-arg v1.4.3 h1:9rwwEBpMXfKQKceuZfYcwuc/7YY7tWJbFsgG5cAU/uo= github.com/alexflint/go-arg v1.4.3/go.mod h1:3PZ/wp/8HuqRZMUUgu7I+e1qcpUbvmS258mRXkFH4IA= github.com/alexflint/go-scalar v1.1.0/go.mod h1:LoFvNMqS1CPrMVltza4LvnGKhaSpc3oyLEBUZVhhS2o= @@ -17,12 +17,18 @@ github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo github.com/gdamore/tcell/v2 v2.4.0/go.mod h1:cTTuF84Dlj/RqmaCIV5p4w8uG1zWdk0SF6oBpwHp4fU= github.com/gdamore/tcell/v2 v2.6.0 h1:OKbluoP9VYmJwZwq/iLb4BxwKcwGthaa1YNBJIyCySg= github.com/gdamore/tcell/v2 v2.6.0/go.mod h1:be9omFATkdr0D9qewWW3d+MEvl5dha+Etb5y65J2H8Y= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= @@ -35,6 +41,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -69,5 +77,12 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= @@ -1,7 +1,7 @@ package gui import ( - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) // Grid numbering examples (H) or (W,H) @@ -1,7 +1,7 @@ package gui import ( - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) // TODO: make a "Group" a "Grid" ? @@ -1,7 +1,7 @@ package gui import ( - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) func (parent *Node) NewImage(name string) *Node { @@ -1,7 +1,7 @@ package gui import ( - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) func (parent *Node) NewLabel(text string) *Node { @@ -1,7 +1,7 @@ package gui import ( - witlog "git.wit.org/wit/gui/log" + witlog "go.wit.com/gui/log" ) // various debugging flags @@ -2,13 +2,13 @@ package gui import ( "os" - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) // TODO: make a fake 'plugin' channel of communication to andlabs for mswindows // Windows doesn't support plugins. How can I keep andlabs and only compile it on windows? // https://forum.heroiclabs.com/t/setting-up-goland-to-compile-plugins-on-windows/594/5 -// import toolkit "git.wit.org/wit/gui/toolkit/andlabs" +// import toolkit "go.wit.com/gui/toolkit/andlabs" const Xaxis = 0 // stack things horizontally const Yaxis = 1 // stack things vertically @@ -1,6 +1,6 @@ package gui -import "git.wit.org/wit/gui/toolkit" +import "go.wit.com/gui/toolkit" /* generic function to create a new node on the binary tree @@ -10,7 +10,7 @@ import ( "embed" "plugin" - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) var err error @@ -107,7 +107,7 @@ func sendCallback(p *aplug, funcName string) func(chan toolkit.Action) { TODO: use LD_LIBRARY_PATH ? This searches in the following order for the plugin .so files: ./toolkit/ - ~/go/src/go.wit.org/gui/toolkit/ + ~/go/src/go.wit.com/gui/toolkit/ /usr/lib/go-gui/ */ func searchPaths(name string) *aplug { @@ -143,7 +143,7 @@ func searchPaths(name string) *aplug { if err != nil { log(logError, "searchPaths() error. exiting here?") } else { - filename = homeDir + "/go/src/git.wit.org/wit/gui/toolkit/" + name + ".so" + filename = homeDir + "/go/src/go.wit.com/gui/toolkit/" + name + ".so" p = initToolkit(name, filename) if (p != nil) { return p @@ -1,7 +1,7 @@ package gui import ( - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) // This recreates the whole GUI for a plugin @@ -1,7 +1,7 @@ package gui import ( - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) func (parent *Node) NewSlider(name string, x int, y int) *Node { @@ -1,7 +1,7 @@ package gui import ( - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) func (parent *Node) NewSpinner(name string, x int, y int) *Node { @@ -3,7 +3,7 @@ package gui import ( "sync" "embed" - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) // @@ -1,7 +1,7 @@ package gui import ( - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) // This function should make a new node with the parent and @@ -1,7 +1,7 @@ package gui import ( - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) func (parent *Node) NewTextbox(name string) *Node { diff --git a/toolkit/andlabs/action.go b/toolkit/andlabs/action.go index 5352fc8..9f68b69 100644 --- a/toolkit/andlabs/action.go +++ b/toolkit/andlabs/action.go @@ -3,7 +3,7 @@ package main import ( "strconv" "github.com/andlabs/ui" - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) func (n *node) show(b bool) { diff --git a/toolkit/andlabs/add.go b/toolkit/andlabs/add.go index 82d962f..b3cf61a 100644 --- a/toolkit/andlabs/add.go +++ b/toolkit/andlabs/add.go @@ -4,7 +4,7 @@ import ( "github.com/andlabs/ui" _ "github.com/andlabs/ui/winmanifest" - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) func actionDump(b bool, a *toolkit.Action) { diff --git a/toolkit/andlabs/debug.go b/toolkit/andlabs/debug.go index d9f8e58..7a28b7d 100644 --- a/toolkit/andlabs/debug.go +++ b/toolkit/andlabs/debug.go @@ -2,7 +2,7 @@ package main import ( "strconv" - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) var defaultBehavior bool = true diff --git a/toolkit/andlabs/delete.go b/toolkit/andlabs/delete.go index 82727fe..e6fea35 100644 --- a/toolkit/andlabs/delete.go +++ b/toolkit/andlabs/delete.go @@ -2,7 +2,7 @@ package main // if you include more than just this import // then your plugin might be doing something un-ideal (just a guess from 2023/02/27) -import "git.wit.org/wit/gui/toolkit" +import "go.wit.com/gui/toolkit" // delete the child widget from the parent // p = parent, c = child diff --git a/toolkit/andlabs/dropdown.go b/toolkit/andlabs/dropdown.go index e811a71..70ea0d1 100644 --- a/toolkit/andlabs/dropdown.go +++ b/toolkit/andlabs/dropdown.go @@ -4,7 +4,7 @@ import ( "github.com/andlabs/ui" _ "github.com/andlabs/ui/winmanifest" - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) func (p *node) newDropdown(n *node) { diff --git a/toolkit/andlabs/log.go b/toolkit/andlabs/log.go index 5dbb914..77bd451 100644 --- a/toolkit/andlabs/log.go +++ b/toolkit/andlabs/log.go @@ -1,7 +1,7 @@ package main import ( - witlog "git.wit.org/wit/gui/log" + witlog "go.wit.com/gui/log" ) // various debugging flags diff --git a/toolkit/andlabs/main.go b/toolkit/andlabs/main.go index 3430769..23aa3df 100644 --- a/toolkit/andlabs/main.go +++ b/toolkit/andlabs/main.go @@ -2,7 +2,7 @@ package main import ( "sync" - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" "github.com/andlabs/ui" // the _ means we only need this for the init() diff --git a/toolkit/andlabs/setText.go b/toolkit/andlabs/setText.go index a3332f5..1ad6bf0 100644 --- a/toolkit/andlabs/setText.go +++ b/toolkit/andlabs/setText.go @@ -1,7 +1,7 @@ package main import ( - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) func (n *node) setText(a *toolkit.Action) { diff --git a/toolkit/andlabs/structs.go b/toolkit/andlabs/structs.go index 02b9204..9f20510 100644 --- a/toolkit/andlabs/structs.go +++ b/toolkit/andlabs/structs.go @@ -1,6 +1,6 @@ package main -// import "git.wit.org/wit/gui/toolkit" +// import "go.wit.com/gui/toolkit" import "github.com/andlabs/ui" import _ "github.com/andlabs/ui/winmanifest" diff --git a/toolkit/andlabs/tab.go b/toolkit/andlabs/tab.go index aa851d1..617753c 100644 --- a/toolkit/andlabs/tab.go +++ b/toolkit/andlabs/tab.go @@ -1,7 +1,7 @@ package main import ( - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" "github.com/andlabs/ui" _ "github.com/andlabs/ui/winmanifest" diff --git a/toolkit/andlabs/widget.go b/toolkit/andlabs/widget.go index 9155530..71629af 100644 --- a/toolkit/andlabs/widget.go +++ b/toolkit/andlabs/widget.go @@ -1,7 +1,7 @@ package main import ( - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) // this is specific to the nocui toolkit diff --git a/toolkit/gocui/add.go b/toolkit/gocui/add.go index 446d70c..c93880b 100644 --- a/toolkit/gocui/add.go +++ b/toolkit/gocui/add.go @@ -1,7 +1,7 @@ package main import ( - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) var fakeStartWidth int = me.FakeW diff --git a/toolkit/gocui/checkbox.go b/toolkit/gocui/checkbox.go index a1fe27c..5973dca 100644 --- a/toolkit/gocui/checkbox.go +++ b/toolkit/gocui/checkbox.go @@ -2,7 +2,7 @@ package main import ( // "github.com/awesome-gocui/gocui" - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) func (n *node) setCheckbox(b bool) { diff --git a/toolkit/gocui/click.go b/toolkit/gocui/click.go index 7c9ab24..27f6b53 100644 --- a/toolkit/gocui/click.go +++ b/toolkit/gocui/click.go @@ -3,7 +3,7 @@ package main import ( "fmt" "github.com/awesome-gocui/gocui" - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) // set isCurrent = false everywhere @@ -194,7 +194,7 @@ func (n *node) doWidgetClick() { tk.v.Wrap = true tk.v.Frame = true tk.v.Clear() - fmt.Fprint(tk.v, "example.com\nwit.org\nwit.com") + fmt.Fprint(tk.v, "example.com\nwit.com") me.ddview.SetVisible(true) return } diff --git a/toolkit/gocui/debug.go b/toolkit/gocui/debug.go index 2669067..c19fef3 100644 --- a/toolkit/gocui/debug.go +++ b/toolkit/gocui/debug.go @@ -2,7 +2,7 @@ package main import ( "fmt" - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) func (n *node) dumpTree(draw bool) { diff --git a/toolkit/gocui/keybindings.go b/toolkit/gocui/keybindings.go index 38ada12..9473943 100644 --- a/toolkit/gocui/keybindings.go +++ b/toolkit/gocui/keybindings.go @@ -7,7 +7,7 @@ package main import ( "os" "github.com/awesome-gocui/gocui" - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) func defaultKeybindings(g *gocui.Gui) error { diff --git a/toolkit/gocui/log.go b/toolkit/gocui/log.go index baf57d9..b334658 100644 --- a/toolkit/gocui/log.go +++ b/toolkit/gocui/log.go @@ -4,7 +4,7 @@ import ( "io" // "fmt" // "strings" - witlog "git.wit.org/wit/gui/log" + witlog "go.wit.com/gui/log" ) // various debugging flags diff --git a/toolkit/gocui/main.go b/toolkit/gocui/main.go index 11f525a..987a05b 100644 --- a/toolkit/gocui/main.go +++ b/toolkit/gocui/main.go @@ -6,7 +6,7 @@ package main import ( "os" - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) // sets defaults and establishes communication diff --git a/toolkit/gocui/place.go b/toolkit/gocui/place.go index f020257..2221bca 100644 --- a/toolkit/gocui/place.go +++ b/toolkit/gocui/place.go @@ -2,7 +2,7 @@ package main import ( "strings" - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) func (n *node) placeBox(startW int, startH int) { diff --git a/toolkit/gocui/plugin.go b/toolkit/gocui/plugin.go index 18cb71f..af7297d 100644 --- a/toolkit/gocui/plugin.go +++ b/toolkit/gocui/plugin.go @@ -3,7 +3,7 @@ package main import ( // if you include more than just this import // then your plugin might be doing something un-ideal (just a guess from 2023/02/27) - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) func action(a *toolkit.Action) { diff --git a/toolkit/gocui/showStdout.go b/toolkit/gocui/showStdout.go index 34f7e7b..1eb552f 100644 --- a/toolkit/gocui/showStdout.go +++ b/toolkit/gocui/showStdout.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/awesome-gocui/gocui" - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) var outputW int = 180 diff --git a/toolkit/gocui/structs.go b/toolkit/gocui/structs.go index ff97d23..d5586fa 100644 --- a/toolkit/gocui/structs.go +++ b/toolkit/gocui/structs.go @@ -15,7 +15,7 @@ import ( "sync" "strings" "github.com/awesome-gocui/gocui" -// "git.wit.org/wit/gui/toolkit" +// "go.wit.com/gui/toolkit" ) // It's probably a terrible idea to call this 'me' diff --git a/toolkit/gocui/tab.go b/toolkit/gocui/tab.go index 90c2d1a..6466af1 100644 --- a/toolkit/gocui/tab.go +++ b/toolkit/gocui/tab.go @@ -4,7 +4,7 @@ package main import ( "strings" - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) func (w *guiWidget) Width() int { diff --git a/toolkit/gocui/view.go b/toolkit/gocui/view.go index 28b80e0..17863d8 100644 --- a/toolkit/gocui/view.go +++ b/toolkit/gocui/view.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/awesome-gocui/gocui" - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) func splitLines(s string) []string { diff --git a/toolkit/gocui/widget.go b/toolkit/gocui/widget.go index 4afe08b..3d5cb64 100644 --- a/toolkit/gocui/widget.go +++ b/toolkit/gocui/widget.go @@ -2,7 +2,7 @@ package main import ( "strconv" - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) func initWidget(n *node) *guiWidget { diff --git a/toolkit/nocui/action.go b/toolkit/nocui/action.go index 2e5f20b..0455cdb 100644 --- a/toolkit/nocui/action.go +++ b/toolkit/nocui/action.go @@ -1,7 +1,7 @@ package main import ( - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) func (n *node) show(b bool) { diff --git a/toolkit/nocui/common.go b/toolkit/nocui/common.go index 786bf39..5817432 100644 --- a/toolkit/nocui/common.go +++ b/toolkit/nocui/common.go @@ -12,7 +12,7 @@ package main */ import ( - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) // this is the channel we send user events like diff --git a/toolkit/nocui/event.go b/toolkit/nocui/event.go index 1075266..fca1d01 100644 --- a/toolkit/nocui/event.go +++ b/toolkit/nocui/event.go @@ -1,7 +1,7 @@ package main import ( - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) func (n *node) doWidgetClick() { diff --git a/toolkit/nocui/log.go b/toolkit/nocui/log.go index 306feed..193a5a2 100644 --- a/toolkit/nocui/log.go +++ b/toolkit/nocui/log.go @@ -1,7 +1,7 @@ package main import ( - witlog "git.wit.org/wit/gui/log" + witlog "go.wit.com/gui/log" ) // various debugging flags diff --git a/toolkit/nocui/main.go b/toolkit/nocui/main.go index 942a195..22cf7da 100644 --- a/toolkit/nocui/main.go +++ b/toolkit/nocui/main.go @@ -2,7 +2,7 @@ package main import ( "sync" - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) var muAction sync.Mutex diff --git a/toolkit/nocui/stdin.go b/toolkit/nocui/stdin.go index 0738d00..98285c0 100644 --- a/toolkit/nocui/stdin.go +++ b/toolkit/nocui/stdin.go @@ -7,7 +7,7 @@ import ( "strings" "strconv" - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) func simpleStdin() { diff --git a/toolkit/nocui/structs.go b/toolkit/nocui/structs.go index 90c2c1e..387ac51 100644 --- a/toolkit/nocui/structs.go +++ b/toolkit/nocui/structs.go @@ -1,6 +1,6 @@ package main -// import "git.wit.org/wit/gui/toolkit" +// import "go.wit.com/gui/toolkit" // stores the raw toolkit internals type guiWidget struct { diff --git a/toolkit/nocui/widget.go b/toolkit/nocui/widget.go index 9155530..71629af 100644 --- a/toolkit/nocui/widget.go +++ b/toolkit/nocui/widget.go @@ -1,7 +1,7 @@ package main import ( - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) // this is specific to the nocui toolkit @@ -1,7 +1,7 @@ package gui import ( - "git.wit.org/wit/gui/toolkit" + "go.wit.com/gui/toolkit" ) // This routine creates a blank window with a Title and size (W x H) |