global protobuf name conflict
This commit is contained in:
parent
8185d8bc1a
commit
fefa99920b
2
Makefile
2
Makefile
|
@ -49,5 +49,5 @@ redomod:
|
||||||
GO111MODULE= go mod tidy
|
GO111MODULE= go mod tidy
|
||||||
|
|
||||||
proto:
|
proto:
|
||||||
autogenpb --proto view.proto
|
autogenpb --proto gocuiView.proto
|
||||||
make goimports
|
make goimports
|
||||||
|
|
|
@ -28,16 +28,16 @@ message Tree {
|
||||||
}
|
}
|
||||||
|
|
||||||
// this is the gocui 'view' in binary tree form
|
// this is the gocui 'view' in binary tree form
|
||||||
message View {
|
message GocuiView {
|
||||||
int64 widgetId = 3; // `autogenpb:unique` `autogenpb:sort`
|
int64 widgetId = 3; // `autogenpb:unique` `autogenpb:sort`
|
||||||
string name = 4; // `autogenpb:unique` `autogenpb:sort`
|
string name = 4; // `autogenpb:unique` `autogenpb:sort`
|
||||||
GocuiState state = 7;
|
GocuiState state = 7;
|
||||||
}
|
}
|
||||||
|
|
||||||
message Views { // `autogenpb:marshal` `autogenpb:mutex`
|
message GocuiViews { // `autogenpb:marshal` `autogenpb:mutex`
|
||||||
string uuid = 1; // `autogenpb:uuid:d19c1fbb-32c2-4957-aee6-f8128a511dca`
|
string uuid = 1; // `autogenpb:uuid:d19c1fbb-32c2-4957-aee6-f8128a511dca`
|
||||||
string version = 2; // `autogenpb:version:v0.0.1`
|
string version = 2; // `autogenpb:version:v0.0.1`
|
||||||
repeated View Views = 3;
|
repeated GocuiView GocuiViews = 3;
|
||||||
Tree tree = 4;
|
Tree tree = 4;
|
||||||
map<string, string> junk = 5;
|
map<string, string> junk = 5;
|
||||||
ViewSettings settings = 6;
|
ViewSettings settings = 6;
|
2
help.go
2
help.go
|
@ -25,7 +25,7 @@ import (
|
||||||
|
|
||||||
var helpText []string = []string{"Help Menu",
|
var helpText []string = []string{"Help Menu",
|
||||||
"",
|
"",
|
||||||
"H: toggle (H)elp",
|
"H: toggle z(H)elp",
|
||||||
"D: toggle light/dark mode",
|
"D: toggle light/dark mode",
|
||||||
"Tab: toggle through windows",
|
"Tab: toggle through windows",
|
||||||
"q: quit()",
|
"q: quit()",
|
||||||
|
|
16
init.go
16
init.go
|
@ -50,16 +50,22 @@ func init() {
|
||||||
me.textbox.wId = -55
|
me.textbox.wId = -55
|
||||||
me.stdout.wId = -4
|
me.stdout.wId = -4
|
||||||
|
|
||||||
// macos iterm2 really only works with dark mode right now
|
|
||||||
if runtime.GOOS == "macos" {
|
|
||||||
me.dark = true
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set(&me, "dense")
|
// Set(&me, "dense")
|
||||||
|
|
||||||
me.myTree = tree.New()
|
me.myTree = tree.New()
|
||||||
me.myTree.PluginName = "gocui"
|
me.myTree.PluginName = "gocui"
|
||||||
|
|
||||||
|
if val, err := me.myTree.ConfigFind("dark"); err == nil {
|
||||||
|
if val == "true" {
|
||||||
|
me.dark = true
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// macos iterm2 really only works with dark mode right now
|
||||||
|
if runtime.GOOS == "macos" {
|
||||||
|
me.dark = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
me.myTree.NodeAction = newaction
|
me.myTree.NodeAction = newaction
|
||||||
me.myTree.Add = newAdd
|
me.myTree.Add = newAdd
|
||||||
me.myTree.SetTitle = newSetTitle
|
me.myTree.SetTitle = newSetTitle
|
||||||
|
|
Loading…
Reference in New Issue