allow nested messages to be unset aka nil

rogchap · Aug 9, 2020 · a116f59 · a116f59
1 parent 6749997
commit a116f59
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 6 deletions.
diff --git a/darwin/Contents/Info.plist b/darwin/Contents/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.0-alpha</string>
+	<string>0.2.0-alpha</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.11</string>
 	<key>NSPrincipalClass</key>

diff --git a/internal/app/startup.go b/internal/app/startup.go
@@ -20,7 +20,7 @@ import (
 // The following variables are set via LDFlags at build time
 var (
 	appname = "Wombat"
-	semver  = "0.1.0-alpha.1"
+	semver  = "0.2.0-alpha"
 	isDebug = true
 )
 

diff --git a/internal/app/workspace_controller.go b/internal/app/workspace_controller.go
@@ -195,20 +195,28 @@ func (c *workspaceController) send(service, method string) error {
 }
 
 func processMessage(msg *model.Message) *dynamic.Message {
+	if !msg.IsEnabled() {
+		return nil
+	}
 	dm := dynamic.NewMessage(msg.Ref)
 	for _, f := range msg.Fields() {
 		switch f.FdType {
 		case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
 			if f.IsRepeated {
 				var fields []interface{}
 				for _, v := range f.ValueListModel().Values() {
-					fields = append(fields, processMessage(v.MsgValue()))
+					m := processMessage(v.MsgValue())
+					if m != nil {
+						fields = append(fields, m)
+					}
 				}
 				dm.SetFieldByNumber(f.Tag(), fields)
 				break
 			}
-			dm.SetFieldByNumber(f.Tag(), processMessage(f.Message()))
-
+			m := processMessage(f.Message())
+			if m != nil {
+				dm.SetFieldByNumber(f.Tag(), m)
+			}
 		default:
 			if f.IsRepeated {
 				var fields []interface{}

diff --git a/internal/model/input.go b/internal/model/input.go
@@ -47,6 +47,7 @@ type Message struct {
 
 	_ map[int]*core.QByteArray `property:"roles"`
 	_ string                   `property:"label"`
+	_ bool                     `property:"enabled"`
 	_ []*Field                 `property:"fields"`
 
 	_ func(row int, val string) `slot:"updateFieldValue"`
@@ -64,6 +65,10 @@ func (i *Message) init() {
 		FieldEnum:     core.NewQByteArray2("enumListModel", -1),
 	})
 
+	// TODO: [RC] Should we default to enabled for nested meeasges?
+	// Maybe this should be a setting?
+	i.SetEnabled(true)
+
 	i.ConnectData(i.data)
 	i.ConnectRowCount(i.rowCount)
 	i.ConnectColumnCount(i.columnCount)

diff --git a/qml/views/DelegateMessageField.qml b/qml/views/DelegateMessageField.qml
@@ -22,16 +22,28 @@ Item {
     }
 
     Label {
+        id: msgType
         anchors.left: msgLabel.right
         anchors.leftMargin: 10
         color: Qt.darker(Style.textColor3, 1.6)
         text: message.label
     }
 
+    CheckBox{
+        id: enabled
+        anchors.left: msgType.right
+        anchors.leftMargin: 10
+        anchors.verticalCenter: msgType.verticalCenter
+        checked: (msgOverride || message).enabled
+        onCheckedChanged: (msgOverride || message).enabled = checked 
+    }
+
     Pane {
         id: msgPane
 
-        implicitHeight: msgLoader.height
+        visible: enabled.checked
+
+        implicitHeight: visible ? msgLoader.height : 0
         anchors.top: msgLabel.bottom
 
         Loader {