jcarr
/
forge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch to GenericWindow()

This commit is contained in:
Jeff Carr 2025-03-03 23:49:24 -06:00
parent 2dc7e87e96
commit 7364eb1ebf
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
doGui.go
View File

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

2
structs.go
View File

@ -55,7 +55,7 @@ type mainType struct {
goSrcPwd *gadgets.OneLiner // what is being used as primary directory for your work goSrcPwd *gadgets.OneLiner // what is being used as primary directory for your work
gitAuthor *gadgets.OneLiner // ENV GIT_AUTHOR NAME and EMAIL gitAuthor *gadgets.OneLiner // ENV GIT_AUTHOR NAME and EMAIL
forgeMode *gadgets.OneLiner // is the user in 'master', 'devel' or 'user' branches forgeMode *gui.Node // is the user in 'master', 'devel' or 'user' branches
// these hold the branches that the user can switch all // these hold the branches that the user can switch all
// the repositories to them // the repositories to them