diff --git a/.gitignore b/.gitignore index f58f295..5f076b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ control-panel-dns /files/* /*.deb +*.swp diff --git a/.gui.go.swp b/.gui.go.swp new file mode 100644 index 0000000..c5183e5 Binary files /dev/null and b/.gui.go.swp differ diff --git a/gui.go b/gui.go index 9750ce3..55ed340 100644 --- a/gui.go +++ b/gui.go @@ -14,12 +14,17 @@ import ( // This initializes the first window func initGUI() { + /* gui.Config.Title = "DNS and IPv6 Control Panel" gui.Config.Width = 1024 gui.Config.Height = 480 gui.Config.Exit = myDefaultExit + */ - me.window = gui.NewWindow() + // me.window = gui.NewWindow() + me.window = myGui.New2().Window().Standard() + sleep(1) + me.window.Dump(true) addDNSTab("DNS") if (args.GuiDebug) { @@ -179,6 +184,9 @@ func nsupdateGroup(w *gui.Node) { if (me.uid != nil) { me.uid.SetText(user.Username + " (" + strconv.Itoa(os.Getuid()) + ")") } + me.tab.Margin() + me.tab.Pad() + grid.Pad() }) } diff --git a/main.go b/main.go index 92fb100..1a232e1 100644 --- a/main.go +++ b/main.go @@ -13,6 +13,7 @@ import ( ) var p *arg.Parser +var myGui *gui.Node func main() { p = arg.MustParse(&args) @@ -24,7 +25,6 @@ func main() { me.ifmap = make(map[int]*IFtype) me.dnsTTL = 5 // recheck DNS is working every 2 minutes // TODO: watch rx packets? - go checkNetworkChanges() log() log(true, "this is true") @@ -41,7 +41,12 @@ func main() { log("Toolkit = ", args.Toolkit) // gui.InitPlugins([]string{"andlabs"}) // gui.SetDebug(true) - gui.Main(initGUI) + // myGui = gui.Main(initGUI) + myGui = gui.Start() + sleep(1) + initGUI() + sleep(1) + checkNetworkChanges() } /*