no longer need these

1 files changed, 19 insertions, 51 deletions

diff --git a/table.proto b/table.proto
index 3154568..b06aac5 100644
--- a/table.proto
+++ b/table.proto
@@ -25,62 +25,30 @@ message ColAttr {
                 DURATION = 4;
                 BYTES = 5;
         }
-        int32                                pad            = 1;
-        int32                                width          = 2;
-        bool                                 click          = 3;
-        VarType                              type           = 4;
-}
-message StringCol {
-        Widget                               header         = 1;
-        repeated Widget                      widgets        = 2;
-        ColAttr                              attr           = 3;
-        repeated string                      vals           = 4;  // deprecate
-}
-
-message ButtonCol {
-        Widget                               header         = 1;
-        repeated Widget                      widgets        = 2;
-        ColAttr                              attr           = 3;
-        repeated string                      vals           = 4;  // deprecate
-}
 
-message IntCol {
-        Widget                               header         = 1;
-        repeated Widget                      widgets        = 2;
-        ColAttr                              attr           = 3;
-        repeated int64                       vals           = 4;  // deprecate
+        int32                          pad         = 1;
+        int32                          width       = 2;
+        bool                           click       = 3;
+        VarType                        type        = 4;
 }
-
-message TimeCol {
-        Widget                               header         = 1;
-        repeated Widget                      widgets        = 2;
-        ColAttr                              attr           = 3;
-        repeated google.protobuf.Timestamp   vals           = 4;  // deprecate
-}
-
 message AnyCol {
-        Widget                               header         = 1;
-        repeated Widget                      widgets        = 2;
-        ColAttr                              attr           = 3;
-        repeated google.protobuf.Any         vals           = 4;  // deprecate
+        Widget                         header      = 1;
+        repeated Widget                widgets     = 2;
+        ColAttr                        attr        = 3;
+        repeated google.protobuf.Any   vals        = 4;  // deprecate
 }
 
-message Table {                                                   // `autogenpb:marshal`
-        string                               uuid           = 1;
-        string                               title          = 2;
-        Widget                               parent         = 3;
-        Widget                               grid           = 4;
-        repeated string                      order          = 5;
-        repeated StringCol                   stringCols     = 6;
-        repeated IntCol                      intCols        = 7;
-        repeated TimeCol                     timeCols       = 8;
-        repeated ButtonCol                   buttonCols     = 10;
-        repeated AnyCol                      anyCols        = 11;
-        int64                                height         = 12; // the number of rows
+message Table {                                          // `autogenpb:marshal`
+        string                         uuid        = 1;
+        string                         title       = 2;
+        Widget                         parent      = 3;
+        Widget                         grid        = 4;
+        repeated AnyCol                anyCols     = 11;
+        int64                          height      = 12; // the number of rows
 }
 
-message Tables {                                                  // `autogenpb:marshal`
-        string                               uuid           = 1;  // `autogenpb:uuid:c328aa62-3c4f-4d00-9244-cc44ae75ab1b`
-        string                               version        = 2;  // `autogenpb:version:v1`
-        repeated Table                       Tables         = 3;
+message Tables {                                         // `autogenpb:marshal`
+        string                         uuid        = 1;  // `autogenpb:uuid:c328aa62-3c4f-4d00-9244-cc44ae75ab1b`
+        string                         version     = 2;  // `autogenpb:version:v1`
+        repeated Table                 Tables      = 3;
 }