diff --git a/ds_files/ds_types.anubis b/ds_files/ds_types.anubis index eccd69b..0848b31 100644 --- a/ds_files/ds_types.anubis +++ b/ds_files/ds_types.anubis @@ -250,6 +250,9 @@ public define List(DS_Type_File) hayamiki_lib_types_description = alternative("column", [ component(string, "column_name") ]), + alternative("column_label", [ + component(string, "column_name") + ]), alternative("label", [ component(string, "label"), ]), diff --git a/view/types/hk_editor_table.anubis b/view/types/hk_editor_table.anubis index 62ae5eb..2886da6 100644 --- a/view/types/hk_editor_table.anubis +++ b/view/types/hk_editor_table.anubis @@ -1,8 +1,8 @@ /* * Created by 伝作 (Densaku). * Types & Messages generator written by フランスのトトロ aka (David RENÉ) - * Date: 2017-04-19 - * Time: 16:17:58 + * Date: 2017-04-25 + * Time: 19:28:19 * */ @@ -32,6 +32,9 @@ public type HK_Editor_Table_Cell: column( String column_name ), + column_label( + String column_name + ), label( String label ), @@ -88,6 +91,12 @@ public define Message // [type = String] column.column_name forget(add_string(_hk_editor_table_cell_message, "column_name", _column_name)), + //Alternative column_label + column_label(_column_name) then + forget(add_string(_hk_editor_table_cell_message, "__TYPE_ALT__", "column_label")); + // [type = String] column_label.column_name + forget(add_string(_hk_editor_table_cell_message, "column_name", _column_name)), + //Alternative label label(_label) then forget(add_string(_hk_editor_table_cell_message, "__TYPE_ALT__", "label")); @@ -122,6 +131,13 @@ public define Maybe(HK_Editor_Table_Cell) success(column(_column_name_)) } + else //Alternative column_label + if __type_alt__ = "column_label" then //Alternative column_label + // [type = String] column_label.column_name + if find_string(_hk_editor_table_cell_message, "column_name") is {failure then failure, success(_column_name_) then + + success(column_label(_column_name_)) + } else //Alternative label if __type_alt__ = "label" then //Alternative label // [type = String] label.label -- libgit2 0.21.4