summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doGui.go10
-rw-r--r--windowRepos.go3
2 files changed, 7 insertions, 6 deletions
diff --git a/doGui.go b/doGui.go
index 8e562ee..ea8b614 100644
--- a/doGui.go
+++ b/doGui.go
@@ -96,7 +96,7 @@ func globalBuildOptions(vbox *gui.Node) {
// this lets you select your user branch, but, when you are happy
// you can merge everything into the devel branch and make sure it actually
// works. Then, when that is good, merge and version everything in master
- me.setBranchB = grid.NewButton("set current branches to:", func() {
+ me.setBranchB = grid.NewButton("git checkout", func() {
targetName := me.newBranch.String()
log.Warn("setting all branches to", targetName)
if targetName == "devel" {
@@ -116,14 +116,14 @@ func globalBuildOptions(vbox *gui.Node) {
log.Info("switching to user branches failed")
}
})
- me.newBranch = grid.NewCombobox()
+ me.newBranch = grid.NewDropdown()
me.newBranch.AddText("master")
me.newBranch.AddText("devel")
me.newBranch.AddText(usr.Username)
me.newBranch.SetText(usr.Username)
// checking this will automatically make the branches off of devel
- me.autoCreateBranches = grid.NewCheckbox("create if missing").SetChecked(true)
+ me.autoCreateBranches = grid.NewCheckbox("auto create branches").SetChecked(true)
grid.NextRow()
var reposWin *repoWindow
@@ -152,4 +152,8 @@ func globalBuildOptions(vbox *gui.Node) {
patchWin.initWindow()
patchWin.Show()
})
+
+ grid.NewButton("forge ConfigSave()", func() {
+ me.forge.ConfigSave()
+ })
}
diff --git a/windowRepos.go b/windowRepos.go
index 810651d..f4dae40 100644
--- a/windowRepos.go
+++ b/windowRepos.go
@@ -113,9 +113,6 @@ func (r *repoWindow) repoMenu() *gui.Node {
}
})
*/
- box2.NewButton("forge ConfigSave()", func() {
- me.forge.ConfigSave()
- })
/*
box2.NewButton("Table()", func() {
me.found = new(gitpb.Repos)