diff options
Diffstat (limited to 'doGui.go')
| -rw-r--r-- | doGui.go | 23 |
1 files changed, 8 insertions, 15 deletions
@@ -77,9 +77,7 @@ func doGui() { me.myGui.SetAppDefaultPlugin(me.forge.Config.DefaultGui) // sets the default GUI plugin to use me.myGui.Default() - mainWindow := gadgets.RawBasicWindow("Forge: (this kinda works sometimes)") - mainWindow.Make() - mainWindow.Show() + mainWindow := gadgets.NewGenericWindow("Forge: (this kinda works sometimes)", "Current Settings") mainWindow.Custom = func() { log.Warn("MAIN WINDOW CLOSE") now := time.Now() @@ -99,15 +97,8 @@ func doGui() { } -func drawWindow(win *gadgets.BasicWindow) { - box := win.Box() - - vbox := box.NewVerticalBox("BOX2") - - group1 := vbox.NewGroup("Current Settings") - grid := group1.NewGrid("buildOptions", 0, 0) - - // me.autoWorkingPwd = gadgets.NewOneLiner(grid, "working directory (pwd)") +func drawWindow(win *gadgets.GenericWindow) { + grid := win.Group.RawGrid() me.goSrcPwd = gadgets.NewOneLiner(grid, "repo src home") grid.NewLabel("") var howtoWin *GenericWindow @@ -134,7 +125,9 @@ func drawWindow(win *gadgets.BasicWindow) { me.gitAuthor.SetText(author) } - me.forgeMode = gadgets.NewOneLiner(grid, "Forge mode") + group1 := win.Stack.NewGroup("Forge Mode") + grid = group1.RawGrid() + me.forgeMode = grid.NewLabel("") me.forgeMode.SetText(me.forge.GetMode()) me.newBranch = grid.NewDropdown() @@ -194,7 +187,7 @@ func drawWindow(win *gadgets.BasicWindow) { grid.NextRow() - groupM := vbox.NewGroup("Mode Windows") + groupM := win.Stack.NewGroup("Mode Windows") gridM := groupM.RawGrid() me.modeReleaseW = gridM.NewButton("Release Window", func() { log.Info("todo: move releaser here") @@ -333,7 +326,7 @@ func drawWindow(win *gadgets.BasicWindow) { }) grid.NextRow() - group2 := vbox.NewGroup("Repos") + group2 := win.Stack.NewGroup("Repos") grid = group2.RawGrid() me.repoDirtyB = grid.NewButton("dirty", func() { |