global protobuf name conflict

4 files changed, 16 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index 11df1fb..1ae6757 100644
--- a/Makefile
+++ b/Makefile
@@ -49,5 +49,5 @@ redomod:
 	GO111MODULE= go mod tidy
 
 proto:
-	autogenpb --proto view.proto
+	autogenpb --proto gocuiView.proto
 	make goimports
diff --git a/view.proto.new b/gocuiView.proto
index dd2f708..5dab35d 100644
--- a/view.proto.new
+++ b/gocuiView.proto
@@ -28,16 +28,16 @@ message Tree {
 }
 
 // this is the gocui 'view' in binary tree form
-message View {
+message GocuiView {
         int64                 widgetId      = 3;  // `autogenpb:unique` `autogenpb:sort`
         string                name          = 4;  // `autogenpb:unique` `autogenpb:sort`
         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                version       = 2;  // `autogenpb:version:v0.0.1`
-        repeated View         Views         = 3;
+        repeated GocuiView         GocuiViews         = 3;
         Tree                  tree          = 4;
         map<string, string>   junk          = 5;
         ViewSettings          settings      = 6;
diff --git a/help.go b/help.go
index 1948fa8..6a64bc4 100644
--- a/help.go
+++ b/help.go
@@ -25,7 +25,7 @@ import (
 
 var helpText []string = []string{"Help Menu",
 	"",
-	"H: toggle (H)elp",
+	"H: toggle z(H)elp",
 	"D: toggle light/dark mode",
 	"Tab: toggle through windows",
 	"q: quit()",
diff --git a/init.go b/init.go
index a53076f..7545da0 100644
--- a/init.go
+++ b/init.go
@@ -50,16 +50,22 @@ func init() {
 	me.textbox.wId = -55
 	me.stdout.wId = -4
 
-	// macos iterm2 really only works with dark mode right now
-	if runtime.GOOS == "macos" {
-		me.dark = true
-	}
-
 	// Set(&me, "dense")
 
 	me.myTree = tree.New()
 	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.Add = newAdd
 	me.myTree.SetTitle = newSetTitle