wit
/
wit-debian-gui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GOOD: remove cruft 

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2021-11-04 08:44:01 -05:00
parent 1acd29f3b6
commit 66be964e01
5 changed files with 22 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -3,7 +3,6 @@ module git.wit.org/wit/debian-gui
go 1.17
require (
git.wit.org/jcarr/log v0.0.5
git.wit.org/wit/gui v0.0.6-0.20211031175754-d38d60bcc38b
github.com/davecgh/go-spew v1.1.1
github.com/getlantern/systray v1.1.0
@ -12,7 +11,6 @@ require (
require (
github.com/andlabs/ui v0.0.0-20200610043537-70a69d6ae31e // indirect
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
github.com/getlantern/context v0.0.0-20190109183933-c447772a6520 // indirect
github.com/getlantern/errors v1.0.1 // indirect
github.com/getlantern/golog v0.0.0-20210606115803-bce9f9fe5a5f // indirect
@ -25,8 +23,6 @@ require (
github.com/joho/godotenv v1.4.0 // indirect
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
github.com/rogpeppe/go-internal v1.8.0 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/wercker/journalhook v0.0.0-20180428041537-5d0a5ae867b3 // indirect
golang.org/x/image v0.0.0-20211028202545-6944b10bf410 // indirect
golang.org/x/sys v0.0.0-20211031064116-611d5d643895 // indirect
)

9
go.sum
View File

@ -1,5 +1,3 @@
git.wit.org/jcarr/log v0.0.5 h1:PeMbp5s+FMwjPfXc2qUyDuGHostXz9kOjUP3vBSDzpU=
git.wit.org/jcarr/log v0.0.5/go.mod h1:rD4mfBZHXgbcFT9Hh4+gGBbWZ/kId2qVnwYUzLhJO6Q=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/andlabs/ui v0.0.0-20200610043537-70a69d6ae31e h1:wSQCJiig/QkoUnpvelSPbLiZNWvh2yMqQTQvIQqSUkU=
github.com/andlabs/ui v0.0.0-20200610043537-70a69d6ae31e/go.mod h1:5G2EjwzgZUPnnReoKvPWVneT8APYbyKkihDVAHUi0II=
@ -7,8 +5,6 @@ github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU=
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@ -72,8 +68,6 @@ github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUA
github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
@ -87,8 +81,6 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
github.com/wercker/journalhook v0.0.0-20180428041537-5d0a5ae867b3 h1:shC1HB1UogxN5Ech3Yqaaxj1X/P656PPCB4RbojIJqc=
github.com/wercker/journalhook v0.0.0-20180428041537-5d0a5ae867b3/go.mod h1:XCsSkdKK4gwBMNrOCZWww0pX6AOt+2gYc5Z6jBRrNVg=
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@ -104,7 +96,6 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20211031064116-611d5d643895 h1:iaNpwpnrgL5jzWS0vCNnfa8HqzxveCFpFx3uC/X4Tps=
golang.org/x/sys v0.0.0-20211031064116-611d5d643895/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

15
main.go
View File

@ -1,15 +1,16 @@
package main
import (
origlog "log"
"log"
"os"
"time"
"git.wit.org/jcarr/log"
"git.wit.org/wit/gui"
"github.com/gobuffalo/packr"
)
// origlog "log"
// "git.wit.org/jcarr/log"
// "github.com/davecgh/go-spew/spew"
var GITCOMMIT string // this is passed in as an ldflag
@ -31,7 +32,7 @@ var firefox = []string{"firefox", "--new-window"}
var packrBox packr.Box
func customExit(n *gui.Node) {
origlog.Println("Should Exit Here")
log.Println("Should Exit Here")
closed = true
log.Println("")
log.Println("CLEAN EXIT")
@ -46,12 +47,6 @@ type game struct {
}
func main() {
log.Println("starting my Control Panel")
log.Println("GOVERSION =", GOVERSION)
log.Println("GITCOMMIT =", GITCOMMIT)
log.Println("packr ./resources box")
g := &game{
w: 5,
h: 20,
@ -95,7 +90,7 @@ func delayedTabs() {
}
func normalWindowClose(n *gui.Node) {
origlog.Println("TODO: close this window correctly and empty the node")
log.Println("TODO: close this window correctly and empty the node")
n.Dump()
name := n.Name
// TODO: this is probably some sort of terrible and wrong memory leak

7
window-main.go
View File

@ -1,13 +1,14 @@
package main
import (
// "log"
// "log"
"git.wit.org/wit/gui"
)
func mainWindow(w *gui.Node) *gui.Node {
if (w == nil) {
gui.Config.Title = "WIT Debian Control Panel " + VERSION
if w == nil {
gui.Config.Title = "Debian SID Mate Control Panel " + VERSION
gui.Config.Width = 101
gui.Config.Height = 101
w = gui.NewWindow()

22
window-resets.go
View File

@ -1,11 +1,13 @@
package main
import ( "log"
import (
"log"
"git.wit.org/wit/gui"
)
func tabResets(w *gui.Node) *gui.Node {
if (w == nil) {
if w == nil {
gui.Config.Title = "resets window"
gui.Config.Width = 240
gui.Config.Height = 280
@ -20,20 +22,20 @@ func tabResets(w *gui.Node) *gui.Node {
g1.NewLabel("Working Stuff")
g1.AddButton("Configure resolv.conf", func (*gui.Node) {
g1.AddButton("Configure resolv.conf", func(*gui.Node) {
log.Println("supposed to make the resolv.conf window")
resolvWindow(nil)
})
g1.AddButton("Generic SSH Window", func (*gui.Node) {
g1.AddButton("Generic SSH Window", func(*gui.Node) {
sshGenericWindow(nil)
})
g1.AddButton("Configure xterm", func (*gui.Node) {
g1.AddButton("Configure xterm", func(*gui.Node) {
xtermSettings(nil)
})
g1.AddButton("update DNS (IPv6)", func (*gui.Node) {
g1.AddButton("update DNS (IPv6)", func(*gui.Node) {
updateDNS(nil)
})
@ -47,13 +49,15 @@ func tabResets(w *gui.Node) *gui.Node {
/////////////////////////////////////////////////////////////////////////////
gn := newTab.AddGroup("GO")
gn.AddButton("go install golang.org/x/tools/gopls@latest", func (*gui.Node) {
gn.AddButton("go install golang.org/x/tools/gopls@latest", func(*gui.Node) {
xterm("go install golang.org/x/tools/gopls@latest")
})
gn.AddButton("vim-go clone", func (*gui.Node) {
g := newTab.AddGroup("VIM")
g.AddButton("vim-go clone", func(*gui.Node) {
xterm("git clone https://github.com/fatih/vim-go.git ~/.vim/pack/plugins/start/vim-go")
})
gn.AddButton("vim-go vimrc settings", func (*gui.Node) {
g.AddButton("vim-go vimrc settings", func(*gui.Node) {
log.Println("echo", "let g:go_def_mode='gopls'\nlet g:go_info_mode='gopls'")
// xterm("echo", "let g:go_def_mode='gopls'\nlet g:go_info_mode='gopls'")
})