diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 7314736fb..d6c0d6503 100644 --- a/Configuration/GlobalAssemblyInfo.cs +++ b/Configuration/GlobalAssemblyInfo.cs @@ -15,7 +15,7 @@ internal static class RevisionClass public const string Major = "2"; public const string Minor = "2"; public const string Build = "0"; - public const string Revision = "960"; + public const string Revision = "961"; public const string MainVersion = Major + "." + Minor; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; diff --git a/Configuration/Version.defs b/Configuration/Version.defs index 9dd380a16..92b78ff54 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ %MINOR%=2 -%REVISION%=960 +%REVISION%=961 %MAJOR%=2 %COREVERSION%=0 diff --git a/ParserTools/SyntaxTreeVisitors/SyntaxTreeComparer.cs b/ParserTools/SyntaxTreeVisitors/SyntaxTreeComparer.cs index 039b809cb..ce4848f33 100644 --- a/ParserTools/SyntaxTreeVisitors/SyntaxTreeComparer.cs +++ b/ParserTools/SyntaxTreeVisitors/SyntaxTreeComparer.cs @@ -648,8 +648,8 @@ namespace PascalABCCompiler.SyntaxTree CompareInternal(left as indexer, right as indexer); else if (left is ident_with_templateparams) CompareInternal(left as ident_with_templateparams, right as ident_with_templateparams); - else if (left is assign) - CompareInternal(left as assign, right as assign); + //else if (left is assign) // SSM 12/06/15 + // CompareInternal(left as assign, right as assign); else if (left is typeof_operator) CompareInternal(left as typeof_operator, right as typeof_operator); else if (left is function_lambda_call) @@ -1637,8 +1637,8 @@ namespace PascalABCCompiler.SyntaxTree CompareInternal(left as statement_list, right as statement_list); else if (left is inherited_method_call) CompareInternal(left as inherited_method_call, right as inherited_method_call); - else if (left is expression) - CompareInternal(left as expression, right as expression); + //else if (left is expression) // SSM 12/06/15 + // CompareInternal(left as expression, right as expression); else throw new NotImplementedException(left.GetType().ToString()); } diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascalParserTools.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascalParserTools.cs index 1fd74da2e..50136a055 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascalParserTools.cs +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascalParserTools.cs @@ -42,7 +42,7 @@ namespace PascalABCSavParser // SSM: Errors инициализируется в другом месте - сюда только передается! public List errors; public System.Collections.Stack NodesStack; // SSM: для каких-то вспомогательных целей в двух правилах - public bool build_tree_for_brackets = false; // SSM: тоже ерунда какая-то + public bool build_tree_for_brackets = false; public string CurrentFileName; diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index b00cbc4eb..316856e71 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '2.2.0.960' \ No newline at end of file +!define VERSION '2.2.0.961' \ No newline at end of file diff --git a/SyntaxTree/tree/NodesGenerator.exe b/SyntaxTree/tree/NodesGenerator.exe index e87881b0a..4d1bfe975 100644 Binary files a/SyntaxTree/tree/NodesGenerator.exe and b/SyntaxTree/tree/NodesGenerator.exe differ diff --git a/SyntaxTree/tree/SyntaxTreeStreamReader.cs b/SyntaxTree/tree/SyntaxTreeStreamReader.cs index 9595a9b47..c15747dcc 100644 --- a/SyntaxTree/tree/SyntaxTreeStreamReader.cs +++ b/SyntaxTree/tree/SyntaxTreeStreamReader.cs @@ -502,7 +502,7 @@ namespace PascalABCCompiler.SyntaxTree public void read_expression(expression _expression) { - read_statement(_expression); + read_declaration(_expression); } @@ -569,7 +569,7 @@ namespace PascalABCCompiler.SyntaxTree public void read_assign(assign _assign) { - read_expression(_assign); + read_statement(_assign); _assign.to = _read_node() as addressed_value; _assign.from = _read_node() as expression; _assign.operator_type = (Operators)br.ReadByte(); diff --git a/SyntaxTree/tree/SyntaxTreeStreamWriter.cs b/SyntaxTree/tree/SyntaxTreeStreamWriter.cs index 38ac2d2ce..d5a7e791d 100644 --- a/SyntaxTree/tree/SyntaxTreeStreamWriter.cs +++ b/SyntaxTree/tree/SyntaxTreeStreamWriter.cs @@ -63,7 +63,7 @@ namespace PascalABCCompiler.SyntaxTree public void write_expression(expression _expression) { - write_statement(_expression); + write_declaration(_expression); } @@ -159,7 +159,7 @@ namespace PascalABCCompiler.SyntaxTree public void write_assign(assign _assign) { - write_expression(_assign); + write_statement(_assign); if (_assign.to == null) { bw.Write((byte)0); diff --git a/SyntaxTree/tree/Tree.cs b/SyntaxTree/tree/Tree.cs index 47f127ed6..3ad1553b8 100644 --- a/SyntaxTree/tree/Tree.cs +++ b/SyntaxTree/tree/Tree.cs @@ -110,7 +110,7 @@ namespace PascalABCCompiler.SyntaxTree ///Выражение /// [Serializable] - public class expression : statement + public class expression : declaration { /// @@ -452,6 +452,11 @@ namespace PascalABCCompiler.SyntaxTree } + public override string ToString() + { + return name; + } + /// ///Свойство для получения количества всех подузлов. Подузлом также считается каждый элемент поля типа List /// @@ -507,7 +512,7 @@ namespace PascalABCCompiler.SyntaxTree ///Оператор присваивания /// [Serializable] - public class assign : expression + public class assign : statement { /// @@ -597,6 +602,10 @@ namespace PascalABCCompiler.SyntaxTree { } public assign(string left,expression ex): this(new ident(left),ex) { } + public override string ToString() + { + return string.Format("{0} {1} {2}",to,OperatorServices.ToString(operator_type,LanguageId.PascalABCNET),from); + } /// ///Свойство для получения количества всех подузлов. Подузлом также считается каждый элемент поля типа List @@ -745,6 +754,11 @@ namespace PascalABCCompiler.SyntaxTree } + public override string ToString() + { + return string.Format("{0} {2} {1}",left,right,OperatorServices.ToString(operation_type,LanguageId.PascalABCNET)); + } + /// ///Свойство для получения количества всех подузлов. Подузлом также считается каждый элемент поля типа List /// @@ -1036,6 +1050,13 @@ namespace PascalABCCompiler.SyntaxTree } + public override string ToString() + { + if (val) + return "True"; + else return "False"; + } + /// ///Свойство для получения количества всех подузлов. Подузлом также считается каждый элемент поля типа List /// @@ -1765,6 +1786,14 @@ namespace PascalABCCompiler.SyntaxTree source_context = sc; return this; } + public override string ToString() + { + var sb = new System.Text.StringBuilder(); + sb.Append(names[0].ToString()); + for (int i=1; i ///Свойство для получения количества всех подузлов. Подузлом также считается каждый элемент поля типа List @@ -1904,6 +1933,15 @@ namespace PascalABCCompiler.SyntaxTree source_context = sc; return this; } + public override string ToString() + { + var sb = new System.Text.StringBuilder(); + sb.Append("var "); + for (int i=0; i ///Свойство для получения количества всех подузлов. Подузлом также считается каждый элемент поля типа List @@ -2058,6 +2096,14 @@ namespace PascalABCCompiler.SyntaxTree source_context = sc; return this; } + public override string ToString() + { + var sb = new System.Text.StringBuilder(); + sb.Append(idents[0].ToString()); + for (int i=1; i ///Свойство для получения количества всех подузлов. Подузлом также считается каждый элемент поля типа List @@ -2255,6 +2301,20 @@ namespace PascalABCCompiler.SyntaxTree { } public var_def_statement(string name, type_definition type): this(new ident(name),type) { } + public override string ToString() + { + var sb = new System.Text.StringBuilder(); + sb.Append(vars.ToString()); + sb.Append(": "); + sb.Append(vars_type.ToString()); + if (inital_value!=null) + { + sb.Append(" := "); + sb.Append(inital_value.ToString()); + } + + return sb.ToString(); + } /// ///Свойство для получения количества всех подузлов. Подузлом также считается каждый элемент поля типа List @@ -2746,6 +2806,11 @@ namespace PascalABCCompiler.SyntaxTree } + public override string ToString() + { + return prog_name.ToString(); + } + /// ///Свойство для получения количества всех подузлов. Подузлом также считается каждый элемент поля типа List /// @@ -2847,6 +2912,11 @@ namespace PascalABCCompiler.SyntaxTree } + public override string ToString() + { + return "'"+Value+"'"; + } + /// ///Свойство для получения количества всех подузлов. Подузлом также считается каждый элемент поля типа List /// @@ -2963,6 +3033,19 @@ namespace PascalABCCompiler.SyntaxTree source_context = sc; return this; } + public override string ToString() + { + if (expressions.Count == 0) + return ""; + var sb = new System.Text.StringBuilder(); + sb.Append(expressions[0].ToString()); + for (int i=1; i ///Свойство для получения количества всех подузлов. Подузлом также считается каждый элемент поля типа List @@ -3082,6 +3165,11 @@ namespace PascalABCCompiler.SyntaxTree } + public override string ToString() + { + return dereferencing_value.ToString(); + } + /// ///Свойство для получения количества всех подузлов. Подузлом также считается каждый элемент поля типа List /// @@ -3730,6 +3818,11 @@ namespace PascalABCCompiler.SyntaxTree } + public override string ToString() + { + return "while " + expr.ToString() + " do\n" + statements.ToString(); + } + /// ///Свойство для получения количества всех подузлов. Подузлом также считается каждый элемент поля типа List /// @@ -4571,6 +4664,11 @@ namespace PascalABCCompiler.SyntaxTree } + public override string ToString() + { + return "label "+labels.ToString(); + } + /// ///Свойство для получения количества всех подузлов. Подузлом также считается каждый элемент поля типа List /// @@ -8964,6 +9062,11 @@ namespace PascalABCCompiler.SyntaxTree } + public override string ToString() + { + return label_name.ToString() + ": "+to_statement.ToString(); + } + /// ///Свойство для получения количества всех подузлов. Подузлом также считается каждый элемент поля типа List /// @@ -9213,6 +9316,11 @@ namespace PascalABCCompiler.SyntaxTree } + public override string ToString() + { + return dereferencing_value.ToString()+"("+parameters.ToString()+")"; + } + /// ///Свойство для получения количества всех подузлов. Подузлом также считается каждый элемент поля типа List /// @@ -13736,6 +13844,11 @@ namespace PascalABCCompiler.SyntaxTree } + public override string ToString() + { + return func_name.ToString(); + } + /// ///Свойство для получения количества всех подузлов. Подузлом также считается каждый элемент поля типа List /// @@ -16904,6 +17017,11 @@ namespace PascalABCCompiler.SyntaxTree } + public override string ToString() + { + return text.ToLower(); + } + /// ///Свойство для получения количества всех подузлов. Подузлом также считается каждый элемент поля типа List /// @@ -25668,6 +25786,11 @@ namespace PascalABCCompiler.SyntaxTree } + public override string ToString() + { + return "("+expr.ToString()+")"; + } + /// ///Свойство для получения количества всех подузлов. Подузлом также считается каждый элемент поля типа List /// diff --git a/SyntaxTree/tree/WalkingVisitor.cs b/SyntaxTree/tree/WalkingVisitor.cs index 61f7f5c6f..5cec0333b 100644 --- a/SyntaxTree/tree/WalkingVisitor.cs +++ b/SyntaxTree/tree/WalkingVisitor.cs @@ -20,18 +20,23 @@ namespace PascalABCCompiler.SyntaxTree protected VisitorDelegate OnEnter; protected VisitorDelegate OnLeave; - public virtual void ProcessNode(syntax_tree_node Node) - { - if (Node != null) - { - if(OnEnter != null) + protected bool visitNode = true; // OnEnter false + + public virtual void ProcessNode(syntax_tree_node Node) + { + if (Node != null) + { + if (OnEnter != null) OnEnter(Node); - Node.visit(this); + + if (visitNode) + Node.visit(this); + else visitNode = true; if (OnLeave != null) - OnLeave(Node); - } - } + OnLeave(Node); + } + } //0 public override void visit(default_operator _default_operator) diff --git a/SyntaxTree/tree/tree.nin b/SyntaxTree/tree/tree.nin index 1d940c511..a459d09f8 100644 Binary files a/SyntaxTree/tree/tree.nin and b/SyntaxTree/tree/tree.nin differ diff --git a/TreeConverter/TreeConversion/syntax_tree_visitor.cs b/TreeConverter/TreeConversion/syntax_tree_visitor.cs index fb96f8351..6ff05c790 100644 --- a/TreeConverter/TreeConversion/syntax_tree_visitor.cs +++ b/TreeConverter/TreeConversion/syntax_tree_visitor.cs @@ -741,10 +741,10 @@ namespace PascalABCCompiler.TreeConverter return ret.visit_symbol_info(tn); }*/ - //(ssyy) DS, сделай нормальное дерево! - private SyntaxTree.statement prepare_statement(SyntaxTree.statement st) + //(ssyy) DS, сделай нормальное дерево! // 2015 год - проблема по-прежнему актуальна: expression не должно быть потомком statement + private SyntaxTree.statement prepare_statement(SyntaxTree.statement st) // логика: если это вызов функции, то сделать из него вызов процедуры. И это - единственное место для преобразования { - SyntaxTree.method_call mc = st as SyntaxTree.method_call; + SyntaxTree.method_call mc = null; // st as SyntaxTree.method_call; if (mc == null) { return st; @@ -17119,9 +17119,11 @@ namespace PascalABCCompiler.TreeConverter location loc1 = get_location(node.expr1); statements_list head_stmts = new statements_list(loc1); convertion_data_and_alghoritms.statement_list_stack_push(head_stmts); - statement_node sn_init = convert_weak((SyntaxTree.statement)node.expr1); + //statement_node sn_init = convert_weak((SyntaxTree.statement)node.expr1); // SSM 12/06/15 - всё равно c-узлы никому не нужны + statement_node sn_init = convert_weak(node.expr1); // SSM 12/06/15 expression_node sn_cond = convert_weak(node.expr2); - statement_node sn_next = convert_weak((SyntaxTree.statement)node.expr3); + //statement_node sn_next = convert_weak((SyntaxTree.statement)node.expr3); // SSM 12/06/15 + statement_node sn_next = convert_weak(node.expr3); // SSM 12/06/15 CheckToEmbeddedStatementCannotBeADeclaration(node.stmt); diff --git a/Utils/NodesGeneratorNew/Form1.cs b/Utils/NodesGeneratorNew/Form1.cs index ec64975f0..e58ef5c97 100644 --- a/Utils/NodesGeneratorNew/Form1.cs +++ b/Utils/NodesGeneratorNew/Form1.cs @@ -357,12 +357,13 @@ namespace NodesGenerator // NavigationPanel // this.NavigationPanel.Font = new System.Drawing.Font("Tahoma", 9F); + this.NavigationPanel.ImageScalingSize = new System.Drawing.Size(20, 20); this.NavigationPanel.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripDropDownButton1, this.toolStripStatusLabel2}); - this.NavigationPanel.Location = new System.Drawing.Point(0, 700); + this.NavigationPanel.Location = new System.Drawing.Point(0, 696); this.NavigationPanel.Name = "NavigationPanel"; - this.NavigationPanel.Size = new System.Drawing.Size(1088, 24); + this.NavigationPanel.Size = new System.Drawing.Size(1088, 28); this.NavigationPanel.SizingGrip = false; this.NavigationPanel.TabIndex = 18; this.NavigationPanel.Resize += new System.EventHandler(this.NavigationPanel_Resize); @@ -375,16 +376,17 @@ namespace NodesGenerator this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(29, 20); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(34, 24); this.toolStripDropDownButton1.Text = "toolStripDropDownButton1"; // // toolStripStatusLabel2 // this.toolStripStatusLabel2.Name = "toolStripStatusLabel2"; - this.toolStripStatusLabel2.Size = new System.Drawing.Size(0, 19); + this.toolStripStatusLabel2.Size = new System.Drawing.Size(0, 23); // // mainToolStrip // + this.mainToolStrip.ImageScalingSize = new System.Drawing.Size(20, 20); this.mainToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripButtonNew, this.toolStripOpenButton, @@ -397,7 +399,7 @@ namespace NodesGenerator this.toolStripGenerateButton}); this.mainToolStrip.Location = new System.Drawing.Point(0, 0); this.mainToolStrip.Name = "mainToolStrip"; - this.mainToolStrip.Size = new System.Drawing.Size(1088, 25); + this.mainToolStrip.Size = new System.Drawing.Size(1088, 27); this.mainToolStrip.TabIndex = 19; this.mainToolStrip.Text = "toolStrip1"; // @@ -407,7 +409,7 @@ namespace NodesGenerator this.toolStripButtonNew.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonNew.Image"))); this.toolStripButtonNew.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonNew.Name = "toolStripButtonNew"; - this.toolStripButtonNew.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonNew.Size = new System.Drawing.Size(24, 24); this.toolStripButtonNew.Text = ""; this.toolStripButtonNew.Click += new System.EventHandler(this.newToolStripMenuItem_Click); // @@ -417,7 +419,7 @@ namespace NodesGenerator this.toolStripOpenButton.Image = ((System.Drawing.Image)(resources.GetObject("toolStripOpenButton.Image"))); this.toolStripOpenButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripOpenButton.Name = "toolStripOpenButton"; - this.toolStripOpenButton.Size = new System.Drawing.Size(23, 22); + this.toolStripOpenButton.Size = new System.Drawing.Size(24, 24); this.toolStripOpenButton.Text = "..."; this.toolStripOpenButton.Click += new System.EventHandler(this.open_Click); // @@ -427,7 +429,7 @@ namespace NodesGenerator this.toolStripSaveButton.Image = ((System.Drawing.Image)(resources.GetObject("toolStripSaveButton.Image"))); this.toolStripSaveButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripSaveButton.Name = "toolStripSaveButton"; - this.toolStripSaveButton.Size = new System.Drawing.Size(23, 22); + this.toolStripSaveButton.Size = new System.Drawing.Size(24, 24); this.toolStripSaveButton.Text = ""; this.toolStripSaveButton.Click += new System.EventHandler(this.save_Click); // @@ -437,7 +439,7 @@ namespace NodesGenerator this.toolStripSaveAsButton.Image = ((System.Drawing.Image)(resources.GetObject("toolStripSaveAsButton.Image"))); this.toolStripSaveAsButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripSaveAsButton.Name = "toolStripSaveAsButton"; - this.toolStripSaveAsButton.Size = new System.Drawing.Size(23, 22); + this.toolStripSaveAsButton.Size = new System.Drawing.Size(24, 24); this.toolStripSaveAsButton.Text = " ..."; this.toolStripSaveAsButton.Click += new System.EventHandler(this.save_as_Click); // @@ -447,14 +449,14 @@ namespace NodesGenerator this.toolStripButtonSaveStore.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonSaveStore.Image"))); this.toolStripButtonSaveStore.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonSaveStore.Name = "toolStripButtonSaveStore"; - this.toolStripButtonSaveStore.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonSaveStore.Size = new System.Drawing.Size(24, 24); this.toolStripButtonSaveStore.Text = " "; this.toolStripButtonSaveStore.Click += new System.EventHandler(this.toolStripButtonSaveStore_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 27); // // toolStripOptionsButton // @@ -462,14 +464,14 @@ namespace NodesGenerator this.toolStripOptionsButton.Image = ((System.Drawing.Image)(resources.GetObject("toolStripOptionsButton.Image"))); this.toolStripOptionsButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripOptionsButton.Name = "toolStripOptionsButton"; - this.toolStripOptionsButton.Size = new System.Drawing.Size(23, 22); + this.toolStripOptionsButton.Size = new System.Drawing.Size(24, 24); this.toolStripOptionsButton.Text = "..."; this.toolStripOptionsButton.Click += new System.EventHandler(this.toolStripOptionsButton_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 27); // // toolStripGenerateButton // @@ -477,7 +479,7 @@ namespace NodesGenerator this.toolStripGenerateButton.Image = ((System.Drawing.Image)(resources.GetObject("toolStripGenerateButton.Image"))); this.toolStripGenerateButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripGenerateButton.Name = "toolStripGenerateButton"; - this.toolStripGenerateButton.Size = new System.Drawing.Size(23, 22); + this.toolStripGenerateButton.Size = new System.Drawing.Size(24, 24); this.toolStripGenerateButton.Text = ""; this.toolStripGenerateButton.Click += new System.EventHandler(this.toolStripGenerateButton_Click); // @@ -488,7 +490,7 @@ namespace NodesGenerator this.groupBox1.Dock = System.Windows.Forms.DockStyle.Left; this.groupBox1.Location = new System.Drawing.Point(0, 164); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(295, 536); + this.groupBox1.Size = new System.Drawing.Size(295, 532); this.groupBox1.TabIndex = 20; this.groupBox1.TabStop = false; this.groupBox1.Text = ":"; @@ -500,10 +502,10 @@ namespace NodesGenerator this.nodes_list.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); this.nodes_list.IntegralHeight = false; this.nodes_list.ItemHeight = 20; - this.nodes_list.Location = new System.Drawing.Point(3, 43); + this.nodes_list.Location = new System.Drawing.Point(3, 45); this.nodes_list.Name = "nodes_list"; this.nodes_list.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended; - this.nodes_list.Size = new System.Drawing.Size(289, 490); + this.nodes_list.Size = new System.Drawing.Size(289, 484); this.nodes_list.TabIndex = 4; this.nodes_list.SelectedIndexChanged += new System.EventHandler(this.nodes_list_SelectedIndexChanged); this.nodes_list.KeyDown += new System.Windows.Forms.KeyEventHandler(this.nodes_list_KeyDown); @@ -512,6 +514,7 @@ namespace NodesGenerator // // nodesContextMenu // + this.nodesContextMenu.ImageScalingSize = new System.Drawing.Size(20, 20); this.nodesContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.addToolStripMenuItem, this.toolStripMenuItem6, @@ -520,26 +523,26 @@ namespace NodesGenerator this.toolStripMenuItem7, this.deleteToolStripMenuItem}); this.nodesContextMenu.Name = "contextMenuStrip1"; - this.nodesContextMenu.Size = new System.Drawing.Size(212, 104); + this.nodesContextMenu.Size = new System.Drawing.Size(216, 120); // // addToolStripMenuItem // this.addToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("addToolStripMenuItem.Image"))); this.addToolStripMenuItem.Name = "addToolStripMenuItem"; - this.addToolStripMenuItem.Size = new System.Drawing.Size(211, 22); + this.addToolStripMenuItem.Size = new System.Drawing.Size(215, 26); this.addToolStripMenuItem.Text = ""; this.addToolStripMenuItem.Click += new System.EventHandler(this.add_Click); // // toolStripMenuItem6 // this.toolStripMenuItem6.Name = "toolStripMenuItem6"; - this.toolStripMenuItem6.Size = new System.Drawing.Size(208, 6); + this.toolStripMenuItem6.Size = new System.Drawing.Size(212, 6); // // moveUpToolStripMenuItem // this.moveUpToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("moveUpToolStripMenuItem.Image"))); this.moveUpToolStripMenuItem.Name = "moveUpToolStripMenuItem"; - this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(211, 22); + this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(215, 26); this.moveUpToolStripMenuItem.Text = " "; this.moveUpToolStripMenuItem.Click += new System.EventHandler(this.Up_Click); // @@ -547,25 +550,26 @@ namespace NodesGenerator // this.moveDownToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("moveDownToolStripMenuItem.Image"))); this.moveDownToolStripMenuItem.Name = "moveDownToolStripMenuItem"; - this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(211, 22); + this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(215, 26); this.moveDownToolStripMenuItem.Text = " "; this.moveDownToolStripMenuItem.Click += new System.EventHandler(this.Down_Click); // // toolStripMenuItem7 // this.toolStripMenuItem7.Name = "toolStripMenuItem7"; - this.toolStripMenuItem7.Size = new System.Drawing.Size(208, 6); + this.toolStripMenuItem7.Size = new System.Drawing.Size(212, 6); // // deleteToolStripMenuItem // this.deleteToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("deleteToolStripMenuItem.Image"))); this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; - this.deleteToolStripMenuItem.Size = new System.Drawing.Size(211, 22); + this.deleteToolStripMenuItem.Size = new System.Drawing.Size(215, 26); this.deleteToolStripMenuItem.Text = ""; this.deleteToolStripMenuItem.Click += new System.EventHandler(this.delete_Click); // // nodesToolStrip // + this.nodesToolStrip.ImageScalingSize = new System.Drawing.Size(20, 20); this.nodesToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripButtonAddNode, this.toolStripSeparator3, @@ -579,7 +583,7 @@ namespace NodesGenerator this.toolStripButtonTagSelected}); this.nodesToolStrip.Location = new System.Drawing.Point(3, 18); this.nodesToolStrip.Name = "nodesToolStrip"; - this.nodesToolStrip.Size = new System.Drawing.Size(289, 25); + this.nodesToolStrip.Size = new System.Drawing.Size(289, 27); this.nodesToolStrip.TabIndex = 27; this.nodesToolStrip.Text = "toolStrip2"; // @@ -589,14 +593,14 @@ namespace NodesGenerator this.toolStripButtonAddNode.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonAddNode.Image"))); this.toolStripButtonAddNode.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonAddNode.Name = "toolStripButtonAddNode"; - this.toolStripButtonAddNode.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonAddNode.Size = new System.Drawing.Size(24, 24); this.toolStripButtonAddNode.Text = "Add Node"; this.toolStripButtonAddNode.Click += new System.EventHandler(this.add_Click); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator3.Size = new System.Drawing.Size(6, 27); // // toolStripButtonMoveUp // @@ -604,7 +608,7 @@ namespace NodesGenerator this.toolStripButtonMoveUp.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonMoveUp.Image"))); this.toolStripButtonMoveUp.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonMoveUp.Name = "toolStripButtonMoveUp"; - this.toolStripButtonMoveUp.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonMoveUp.Size = new System.Drawing.Size(24, 24); this.toolStripButtonMoveUp.Text = "Move Up"; this.toolStripButtonMoveUp.Click += new System.EventHandler(this.Up_Click); // @@ -614,14 +618,14 @@ namespace NodesGenerator this.toolStripButtonMoveDown.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonMoveDown.Image"))); this.toolStripButtonMoveDown.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonMoveDown.Name = "toolStripButtonMoveDown"; - this.toolStripButtonMoveDown.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonMoveDown.Size = new System.Drawing.Size(24, 24); this.toolStripButtonMoveDown.Text = "Move Down"; this.toolStripButtonMoveDown.Click += new System.EventHandler(this.Down_Click); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator4.Size = new System.Drawing.Size(6, 27); // // toolStripButtonDeleteNode // @@ -629,14 +633,14 @@ namespace NodesGenerator this.toolStripButtonDeleteNode.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonDeleteNode.Image"))); this.toolStripButtonDeleteNode.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonDeleteNode.Name = "toolStripButtonDeleteNode"; - this.toolStripButtonDeleteNode.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonDeleteNode.Size = new System.Drawing.Size(24, 24); this.toolStripButtonDeleteNode.Text = "Delete Node"; this.toolStripButtonDeleteNode.Click += new System.EventHandler(this.delete_Click); // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator5.Size = new System.Drawing.Size(6, 27); // // toolStripButtonSort // @@ -645,14 +649,14 @@ namespace NodesGenerator this.toolStripButtonSort.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonSort.Image"))); this.toolStripButtonSort.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonSort.Name = "toolStripButtonSort"; - this.toolStripButtonSort.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonSort.Size = new System.Drawing.Size(24, 24); this.toolStripButtonSort.Text = "Sort"; this.toolStripButtonSort.CheckedChanged += new System.EventHandler(this.toolStripButton1_CheckedChanged); // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator7.Size = new System.Drawing.Size(6, 27); // // toolStripButtonTagSelected // @@ -660,7 +664,7 @@ namespace NodesGenerator this.toolStripButtonTagSelected.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonTagSelected.Image"))); this.toolStripButtonTagSelected.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonTagSelected.Name = "toolStripButtonTagSelected"; - this.toolStripButtonTagSelected.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonTagSelected.Size = new System.Drawing.Size(24, 24); this.toolStripButtonTagSelected.Text = " "; this.toolStripButtonTagSelected.Click += new System.EventHandler(this.saveTempFilter_Click); // @@ -675,7 +679,7 @@ namespace NodesGenerator this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox2.Location = new System.Drawing.Point(295, 164); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(793, 536); + this.groupBox2.Size = new System.Drawing.Size(793, 532); this.groupBox2.TabIndex = 21; this.groupBox2.TabStop = false; this.groupBox2.Text = " :"; @@ -687,7 +691,7 @@ namespace NodesGenerator this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; this.panel3.Location = new System.Drawing.Point(3, 73); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(787, 169); + this.panel3.Size = new System.Drawing.Size(787, 165); this.panel3.TabIndex = 29; // // scintilla1 @@ -699,9 +703,9 @@ namespace NodesGenerator this.scintilla1.Dock = System.Windows.Forms.DockStyle.Fill; this.scintilla1.Indentation.IndentWidth = 2; this.scintilla1.Indentation.SmartIndentType = ScintillaNET.SmartIndent.CPP; - this.scintilla1.Location = new System.Drawing.Point(0, 25); + this.scintilla1.Location = new System.Drawing.Point(0, 27); this.scintilla1.Name = "scintilla1"; - this.scintilla1.Size = new System.Drawing.Size(787, 144); + this.scintilla1.Size = new System.Drawing.Size(787, 138); this.scintilla1.Styles.BraceBad.Size = 7F; this.scintilla1.Styles.BraceLight.Size = 7F; this.scintilla1.Styles.ControlChar.Size = 7F; @@ -715,6 +719,7 @@ namespace NodesGenerator // // edtiorToolStrip // + this.edtiorToolStrip.ImageScalingSize = new System.Drawing.Size(20, 20); this.edtiorToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripButtonCut, this.toolStripButtonCopy, @@ -724,7 +729,7 @@ namespace NodesGenerator this.toolStripButtonRedo}); this.edtiorToolStrip.Location = new System.Drawing.Point(0, 0); this.edtiorToolStrip.Name = "edtiorToolStrip"; - this.edtiorToolStrip.Size = new System.Drawing.Size(787, 25); + this.edtiorToolStrip.Size = new System.Drawing.Size(787, 27); this.edtiorToolStrip.TabIndex = 24; this.edtiorToolStrip.Text = "toolStrip3"; // @@ -734,7 +739,7 @@ namespace NodesGenerator this.toolStripButtonCut.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonCut.Image"))); this.toolStripButtonCut.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonCut.Name = "toolStripButtonCut"; - this.toolStripButtonCut.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonCut.Size = new System.Drawing.Size(24, 24); this.toolStripButtonCut.Text = "Cut"; this.toolStripButtonCut.Click += new System.EventHandler(this.toolStripButtonCut_Click); // @@ -744,7 +749,7 @@ namespace NodesGenerator this.toolStripButtonCopy.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonCopy.Image"))); this.toolStripButtonCopy.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonCopy.Name = "toolStripButtonCopy"; - this.toolStripButtonCopy.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonCopy.Size = new System.Drawing.Size(24, 24); this.toolStripButtonCopy.Text = "Copy"; this.toolStripButtonCopy.Click += new System.EventHandler(this.toolStripButtonCopy_Click); // @@ -754,14 +759,14 @@ namespace NodesGenerator this.toolStripButtonPaste.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonPaste.Image"))); this.toolStripButtonPaste.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonPaste.Name = "toolStripButtonPaste"; - this.toolStripButtonPaste.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonPaste.Size = new System.Drawing.Size(24, 24); this.toolStripButtonPaste.Text = "Paste"; this.toolStripButtonPaste.Click += new System.EventHandler(this.toolStripButtonPaste_Click); // // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator6.Size = new System.Drawing.Size(6, 27); // // toolStripButtonUndo // @@ -769,7 +774,7 @@ namespace NodesGenerator this.toolStripButtonUndo.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonUndo.Image"))); this.toolStripButtonUndo.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonUndo.Name = "toolStripButtonUndo"; - this.toolStripButtonUndo.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonUndo.Size = new System.Drawing.Size(24, 24); this.toolStripButtonUndo.Text = "Undo"; this.toolStripButtonUndo.Click += new System.EventHandler(this.toolStripButtonUndo_Click); // @@ -779,7 +784,7 @@ namespace NodesGenerator this.toolStripButtonRedo.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonRedo.Image"))); this.toolStripButtonRedo.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonRedo.Name = "toolStripButtonRedo"; - this.toolStripButtonRedo.Size = new System.Drawing.Size(23, 22); + this.toolStripButtonRedo.Size = new System.Drawing.Size(24, 24); this.toolStripButtonRedo.Text = "Redo"; this.toolStripButtonRedo.Click += new System.EventHandler(this.toolStripButtonRedo_Click); // @@ -787,7 +792,7 @@ namespace NodesGenerator // this.splitter2.Cursor = System.Windows.Forms.Cursors.HSplit; this.splitter2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.splitter2.Location = new System.Drawing.Point(3, 242); + this.splitter2.Location = new System.Drawing.Point(3, 238); this.splitter2.MinExtra = 40; this.splitter2.MinSize = 40; this.splitter2.Name = "splitter2"; @@ -800,7 +805,7 @@ namespace NodesGenerator this.panel2.Controls.Add(this.help_context); this.panel2.Controls.Add(this.label3); this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel2.Location = new System.Drawing.Point(3, 245); + this.panel2.Location = new System.Drawing.Point(3, 241); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(787, 117); this.panel2.TabIndex = 28; @@ -827,7 +832,7 @@ namespace NodesGenerator // this.splitter1.Cursor = System.Windows.Forms.Cursors.HSplit; this.splitter1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.splitter1.Location = new System.Drawing.Point(3, 362); + this.splitter1.Location = new System.Drawing.Point(3, 358); this.splitter1.MinExtra = 40; this.splitter1.MinSize = 40; this.splitter1.Name = "splitter1"; @@ -842,7 +847,7 @@ namespace NodesGenerator this.panel4.Controls.Add(this.tagCategories); this.panel4.Controls.Add(this.label4); this.panel4.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel4.Location = new System.Drawing.Point(3, 365); + this.panel4.Location = new System.Drawing.Point(3, 361); this.panel4.Name = "panel4"; this.panel4.Size = new System.Drawing.Size(787, 168); this.panel4.TabIndex = 27; @@ -971,9 +976,9 @@ namespace NodesGenerator this.panel6.Controls.Add(this.filterCategories); this.panel6.Controls.Add(this.panelFilterButtons); this.panel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel6.Location = new System.Drawing.Point(0, 25); + this.panel6.Location = new System.Drawing.Point(0, 27); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(1088, 110); + this.panel6.Size = new System.Drawing.Size(1088, 108); this.panel6.TabIndex = 20; // // filterItems @@ -985,7 +990,7 @@ namespace NodesGenerator this.filterItems.Location = new System.Drawing.Point(322, 0); this.filterItems.MultiSelect = false; this.filterItems.Name = "filterItems"; - this.filterItems.Size = new System.Drawing.Size(766, 110); + this.filterItems.Size = new System.Drawing.Size(766, 108); this.filterItems.TabIndex = 5; this.filterItems.UseCompatibleStateImageBehavior = false; this.filterItems.View = System.Windows.Forms.View.List; @@ -993,6 +998,7 @@ namespace NodesGenerator // // filtersPanelContextMenu // + this.filtersPanelContextMenu.ImageScalingSize = new System.Drawing.Size(20, 20); this.filtersPanelContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.editInTagsCollectionToolStripMenuItem}); this.filtersPanelContextMenu.Name = "filtersPanelContextMenu"; @@ -1014,7 +1020,7 @@ namespace NodesGenerator this.filterCategories.ItemHeight = 16; this.filterCategories.Location = new System.Drawing.Point(140, 0); this.filterCategories.Name = "filterCategories"; - this.filterCategories.Size = new System.Drawing.Size(182, 110); + this.filterCategories.Size = new System.Drawing.Size(182, 108); this.filterCategories.TabIndex = 6; this.filterCategories.SelectedIndexChanged += new System.EventHandler(this.filterCategories_SelectedIndexChanged); // @@ -1026,7 +1032,7 @@ namespace NodesGenerator this.panelFilterButtons.Dock = System.Windows.Forms.DockStyle.Left; this.panelFilterButtons.Location = new System.Drawing.Point(0, 0); this.panelFilterButtons.Name = "panelFilterButtons"; - this.panelFilterButtons.Size = new System.Drawing.Size(140, 110); + this.panelFilterButtons.Size = new System.Drawing.Size(140, 108); this.panelFilterButtons.TabIndex = 3; // // filterSelected @@ -1039,7 +1045,7 @@ namespace NodesGenerator this.filterSelected.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); this.filterSelected.Location = new System.Drawing.Point(0, 29); this.filterSelected.Name = "filterSelected"; - this.filterSelected.Size = new System.Drawing.Size(140, 52); + this.filterSelected.Size = new System.Drawing.Size(140, 50); this.filterSelected.TabIndex = 1; this.filterSelected.Text = " "; this.filterSelected.UseVisualStyleBackColor = true; @@ -1052,7 +1058,7 @@ namespace NodesGenerator this.filterAncestors.FlatAppearance.BorderColor = System.Drawing.Color.Black; this.filterAncestors.FlatAppearance.MouseDownBackColor = System.Drawing.SystemColors.ButtonShadow; this.filterAncestors.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.filterAncestors.Location = new System.Drawing.Point(0, 81); + this.filterAncestors.Location = new System.Drawing.Point(0, 79); this.filterAncestors.Name = "filterAncestors"; this.filterAncestors.Size = new System.Drawing.Size(140, 29); this.filterAncestors.TabIndex = 2; @@ -1094,7 +1100,7 @@ namespace NodesGenerator this.newToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("newToolStripMenuItem.Image"))); this.newToolStripMenuItem.Name = "newToolStripMenuItem"; this.newToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); - this.newToolStripMenuItem.Size = new System.Drawing.Size(269, 22); + this.newToolStripMenuItem.Size = new System.Drawing.Size(273, 26); this.newToolStripMenuItem.Text = ""; this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click); // @@ -1103,7 +1109,7 @@ namespace NodesGenerator this.openToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripMenuItem.Image"))); this.openToolStripMenuItem.Name = "openToolStripMenuItem"; this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.openToolStripMenuItem.Size = new System.Drawing.Size(269, 22); + this.openToolStripMenuItem.Size = new System.Drawing.Size(273, 26); this.openToolStripMenuItem.Text = "..."; this.openToolStripMenuItem.Click += new System.EventHandler(this.open_Click); // @@ -1112,7 +1118,7 @@ namespace NodesGenerator this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.saveToolStripMenuItem.Size = new System.Drawing.Size(269, 22); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(273, 26); this.saveToolStripMenuItem.Text = ""; this.saveToolStripMenuItem.Click += new System.EventHandler(this.save_Click); // @@ -1122,7 +1128,7 @@ namespace NodesGenerator this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; this.saveAsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Alt) | System.Windows.Forms.Keys.S))); - this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(269, 22); + this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(273, 26); this.saveAsToolStripMenuItem.Text = " ..."; this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.save_as_Click); // @@ -1130,18 +1136,18 @@ namespace NodesGenerator // this.saveAndStoreToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveAndStoreToolStripMenuItem.Image"))); this.saveAndStoreToolStripMenuItem.Name = "saveAndStoreToolStripMenuItem"; - this.saveAndStoreToolStripMenuItem.Size = new System.Drawing.Size(269, 22); + this.saveAndStoreToolStripMenuItem.Size = new System.Drawing.Size(273, 26); this.saveAndStoreToolStripMenuItem.Text = " "; // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(266, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(270, 6); // // quitToolStripMenuItem // this.quitToolStripMenuItem.Name = "quitToolStripMenuItem"; - this.quitToolStripMenuItem.Size = new System.Drawing.Size(269, 22); + this.quitToolStripMenuItem.Size = new System.Drawing.Size(273, 26); this.quitToolStripMenuItem.Text = ""; this.quitToolStripMenuItem.Click += new System.EventHandler(this.quitToolStripMenuItem_Click); // @@ -1167,20 +1173,20 @@ namespace NodesGenerator this.addNodeToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("addNodeToolStripMenuItem.Image"))); this.addNodeToolStripMenuItem.Name = "addNodeToolStripMenuItem"; this.addNodeToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); - this.addNodeToolStripMenuItem.Size = new System.Drawing.Size(275, 22); + this.addNodeToolStripMenuItem.Size = new System.Drawing.Size(279, 26); this.addNodeToolStripMenuItem.Text = " "; this.addNodeToolStripMenuItem.Click += new System.EventHandler(this.add_Click); // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(272, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(276, 6); // // moveNodeUpToolStripMenuItem // this.moveNodeUpToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("moveNodeUpToolStripMenuItem.Image"))); this.moveNodeUpToolStripMenuItem.Name = "moveNodeUpToolStripMenuItem"; - this.moveNodeUpToolStripMenuItem.Size = new System.Drawing.Size(275, 22); + this.moveNodeUpToolStripMenuItem.Size = new System.Drawing.Size(279, 26); this.moveNodeUpToolStripMenuItem.Text = " "; this.moveNodeUpToolStripMenuItem.Click += new System.EventHandler(this.Up_Click); // @@ -1188,33 +1194,33 @@ namespace NodesGenerator // this.moveNodeDownToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("moveNodeDownToolStripMenuItem.Image"))); this.moveNodeDownToolStripMenuItem.Name = "moveNodeDownToolStripMenuItem"; - this.moveNodeDownToolStripMenuItem.Size = new System.Drawing.Size(275, 22); + this.moveNodeDownToolStripMenuItem.Size = new System.Drawing.Size(279, 26); this.moveNodeDownToolStripMenuItem.Text = " "; this.moveNodeDownToolStripMenuItem.Click += new System.EventHandler(this.Down_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(272, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(276, 6); // // deleteNodeToolStripMenuItem // this.deleteNodeToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("deleteNodeToolStripMenuItem.Image"))); this.deleteNodeToolStripMenuItem.Name = "deleteNodeToolStripMenuItem"; - this.deleteNodeToolStripMenuItem.Size = new System.Drawing.Size(275, 22); + this.deleteNodeToolStripMenuItem.Size = new System.Drawing.Size(279, 26); this.deleteNodeToolStripMenuItem.Text = " "; this.deleteNodeToolStripMenuItem.Click += new System.EventHandler(this.delete_Click); // // toolStripMenuItem4 // this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(272, 6); + this.toolStripMenuItem4.Size = new System.Drawing.Size(276, 6); // // sortToolStripMenuItem // this.sortToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("sortToolStripMenuItem.Image"))); this.sortToolStripMenuItem.Name = "sortToolStripMenuItem"; - this.sortToolStripMenuItem.Size = new System.Drawing.Size(275, 22); + this.sortToolStripMenuItem.Size = new System.Drawing.Size(279, 26); this.sortToolStripMenuItem.Text = " "; this.sortToolStripMenuItem.Click += new System.EventHandler(this.sortToolStripMenuItem_Click); // @@ -1222,14 +1228,14 @@ namespace NodesGenerator // this.ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("ToolStripMenuItem.Image"))); this.ToolStripMenuItem.Name = "ToolStripMenuItem"; - this.ToolStripMenuItem.Size = new System.Drawing.Size(275, 22); + this.ToolStripMenuItem.Size = new System.Drawing.Size(279, 26); this.ToolStripMenuItem.Text = " "; this.ToolStripMenuItem.Click += new System.EventHandler(this.saveTempFilter_Click); // // globalRenamerToolStripMenuItem // this.globalRenamerToolStripMenuItem.Name = "globalRenamerToolStripMenuItem"; - this.globalRenamerToolStripMenuItem.Size = new System.Drawing.Size(275, 22); + this.globalRenamerToolStripMenuItem.Size = new System.Drawing.Size(279, 26); this.globalRenamerToolStripMenuItem.Text = " "; this.globalRenamerToolStripMenuItem.Click += new System.EventHandler(this.globalRenamerToolStripMenuItem_Click); // @@ -1251,7 +1257,7 @@ namespace NodesGenerator this.cutToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("cutToolStripMenuItem.Image"))); this.cutToolStripMenuItem.Name = "cutToolStripMenuItem"; this.cutToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X))); - this.cutToolStripMenuItem.Size = new System.Drawing.Size(220, 22); + this.cutToolStripMenuItem.Size = new System.Drawing.Size(224, 26); this.cutToolStripMenuItem.Text = ""; this.cutToolStripMenuItem.Click += new System.EventHandler(this.toolStripButtonCut_Click); // @@ -1260,7 +1266,7 @@ namespace NodesGenerator this.copyToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("copyToolStripMenuItem.Image"))); this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; this.copyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.copyToolStripMenuItem.Size = new System.Drawing.Size(220, 22); + this.copyToolStripMenuItem.Size = new System.Drawing.Size(224, 26); this.copyToolStripMenuItem.Text = ""; this.copyToolStripMenuItem.Click += new System.EventHandler(this.toolStripButtonCopy_Click); // @@ -1269,21 +1275,21 @@ namespace NodesGenerator this.pasteToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("pasteToolStripMenuItem.Image"))); this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem"; this.pasteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V))); - this.pasteToolStripMenuItem.Size = new System.Drawing.Size(220, 22); + this.pasteToolStripMenuItem.Size = new System.Drawing.Size(224, 26); this.pasteToolStripMenuItem.Text = ""; this.pasteToolStripMenuItem.Click += new System.EventHandler(this.toolStripButtonPaste_Click); // // toolStripMenuItem5 // this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(217, 6); + this.toolStripMenuItem5.Size = new System.Drawing.Size(221, 6); // // undoToolStripMenuItem // this.undoToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("undoToolStripMenuItem.Image"))); this.undoToolStripMenuItem.Name = "undoToolStripMenuItem"; this.undoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z))); - this.undoToolStripMenuItem.Size = new System.Drawing.Size(220, 22); + this.undoToolStripMenuItem.Size = new System.Drawing.Size(224, 26); this.undoToolStripMenuItem.Text = ""; this.undoToolStripMenuItem.Click += new System.EventHandler(this.toolStripButtonUndo_Click); // @@ -1293,7 +1299,7 @@ namespace NodesGenerator this.redoToolStripMenuItem.Name = "redoToolStripMenuItem"; this.redoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.Z))); - this.redoToolStripMenuItem.Size = new System.Drawing.Size(220, 22); + this.redoToolStripMenuItem.Size = new System.Drawing.Size(224, 26); this.redoToolStripMenuItem.Text = ""; this.redoToolStripMenuItem.Click += new System.EventHandler(this.toolStripButtonRedo_Click); // @@ -1311,7 +1317,7 @@ namespace NodesGenerator this.filterPanelToolStripMenuItem.CheckOnClick = true; this.filterPanelToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.filterPanelToolStripMenuItem.Name = "filterPanelToolStripMenuItem"; - this.filterPanelToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.filterPanelToolStripMenuItem.Size = new System.Drawing.Size(191, 26); this.filterPanelToolStripMenuItem.Text = " "; this.filterPanelToolStripMenuItem.CheckedChanged += new System.EventHandler(this.filterPanelToolStripMenuItem_CheckedChanged); // @@ -1352,18 +1358,19 @@ namespace NodesGenerator this.generateToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("generateToolStripMenuItem.Image"))); this.generateToolStripMenuItem.Name = "generateToolStripMenuItem"; this.generateToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F9; - this.generateToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.generateToolStripMenuItem.Size = new System.Drawing.Size(205, 26); this.generateToolStripMenuItem.Text = ""; this.generateToolStripMenuItem.Click += new System.EventHandler(this.toolStripGenerateButton_Click); // // grammarBrowserToolStripMenuItem // this.grammarBrowserToolStripMenuItem.Name = "grammarBrowserToolStripMenuItem"; - this.grammarBrowserToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.grammarBrowserToolStripMenuItem.Size = new System.Drawing.Size(205, 26); this.grammarBrowserToolStripMenuItem.Text = " ..."; // // mainMenu // + this.mainMenu.ImageScalingSize = new System.Drawing.Size(20, 20); this.mainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.contentsToolStripMenuItem, @@ -2200,8 +2207,6 @@ namespace NodesGenerator if (show_mes_id < _parseTree.ParserMessages.Count) { - /* MessageBox.Show(_parseTree.ParserMessages[show_mes_id].Message + " @ Line " + _parseTree.ParserMessages[show_mes_id].Location.Line.ToString(), - _parseTree.ParserMessages[show_mes_id].Message, MessageBoxButtons.OK, MessageBoxIcon.Error);*/ MessageBox.Show("Some Syntax Error @ Line " + _parseTree.ParserMessages[show_mes_id].Location.Line.ToString(), _parseTree.ParserMessages[show_mes_id].Message, MessageBoxButtons.OK, MessageBoxIcon.Error); scintilla1.Caret.LineNumber = _parseTree.ParserMessages[show_mes_id].Location.Line - 1; diff --git a/Utils/NodesGeneratorNew/Form1.resx b/Utils/NodesGeneratorNew/Form1.resx index be828f1aa..b269b00f7 100644 --- a/Utils/NodesGeneratorNew/Form1.resx +++ b/Utils/NodesGeneratorNew/Form1.resx @@ -130,7 +130,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc @@ -148,21 +148,21 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHeSURBVDhPtZK9a1NRGMZjjKjdXMXBUlwFFxE6ZKodrHES - BZc6qX+CCHYoBY2DiOAiooMgLYKzKBVaAhUUEXMLVtOQ3PNxP2OkaUzu1+N7zq3oQdEsHvjB5fA+v/c5 - cAs7Z/JGdQEm87h75xoWH19B7flpfFidhFM/8marMfGw3zx6ftsuHwLO7tZpFciyzCCJAgy+PsM2O4fu - xmGE9V2aYO3AYKsxbvXbJ65/k1PjhiAIAvi+D9/hCOUyQms/hYpEAWkcatS3EjWtUhyJ6cuGQIU914Xn - fEZH3KfBPdREIo2EQUKsLJWySJx8Ygg814PrSniyji6rkqCkh/8kCK0SBnx6zRA4jgMpJVyxji/8Nnqt - MkmKVP1ni2RIYXoCbx+PYnnqnSFQYSEEJPuEgD9Fz76gW2RZorfmSL29z6e6QzHzwhCoMOccjLcg7dfo - UIvQ2ksNPC1SpLGv72IxU0ucypwh4IyBEbZtE5tw7FV02D0KjNHGi8QsOutjeF+bReKcuTT0KscMQR78 - lU2I9lu49ksEbIlYRNpfwaMHV5H5lYNolvf9Q6BoEQ0we4P4iDTpoXprHsBcUYfV+bvgB21Nmqb6V9+J - 5mc0QY6a+3+CUfldcHPhlbocGZrPk4XCd87f8uptj9hAAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHfSURBVDhPtZK9a1NRGMZjjKjdXMXBUlwFFxE6ZKodrHES + BZc6qX+CCHYoBY2DiOAiooOgFcFZLCqWQAVFxNyC1TQk93zczxhpGpP79fiecyt6UDSLB35wObzP730O + 3MLWmbxSXYDJPG7euITF+xdQe3ocH5Yn4dQPvNloTNztNw+e3rTL+4CT23VaBbIsM0iiAIOvT7DJTqG7 + th9hfZsmWNkz2GiMW/32kcvf5NS4IQiCAL7vw3c4QvkcobWbQkWigDQONepbiZpWKY7E9HlDoMKe68Jz + PqMjbtPgDmoikUbCICFePixlkTj6wBB4rgfXlfBkHV1WJUFJD/9JEFolDPj0iiFwHAdSSrhiFV/4dfRa + ZZIUqfrPFsmQwvQE3j4cxfLYO0OgwkIISPYJAX+Mnn1Gt8iyRG/NkXp7n091h2LmmSFQYc45GG9B2q/R + oRahtZMaeFqkSGNf38VippY4lTlDwBkDI2zbJtbh2MvosFsUGKONZ4lZdFbH8L42i8Q5cW7oVQ4Zgjz4 + K+sQ7bdw7SUE7BGxiLT/CvfuXETmV/aiWd71D4GiRTTA7DXiI9Kkh+q1eQBzRR1W5++CH7Q1aZrqX30r + mp/RBDlq7v8JRuV3wdWFF+pyZGg+TxYK3wHCkfLmeZh0BAAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFmSURBVDhPzZJNS0JBGIVdFe0r+gP9iDZtahFkf6FdbqIP + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFmSURBVDhPzZJNS0JBGIVdFe0r+gP9iDZtahFkf6FdbqIP 2oRBm3JToBul6GOhQcuCiCxLCoqKgopALL8wyBCyRaGlM+Od08w416si0rIXHs6Zd+Y9d7j32v5HhT1t I6fudtQie3q7dZnDnHOAb1dpDDTRY1bJphpmfnATGhAqoHIdEHsSv9LjpY76EBXwvQH+s64wlNdr4Q2t 5n7zgE8vDMHlanfTa7dCBZTfl5FPzuJipROyeOmmCiRFy2ejm2A0DVpM1AS8LiB5OIBEaBhG4QzlnEfg @@ -174,7 +174,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKgSURBVDhPpZPbSxRRHMf3tf6DoIiKCnzoQkhCeXnILiAp + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAKgSURBVDhPpZPbSxRRHMf3tf6DoIiKCnzoQkhCeXnILiAp KIUJmS9qF4W0elBoqYeiqEQSLVNZsAiTMhSDtLRkZdFNm73o6qqo4N53nZ0Zd3d2LvvtN7oRa/nUF74c Dofv53x/Zxidpu07Orp3XzLJ54uHIwVkbc3ewufye2K7L5jkbTs7B9fDmjIqGLxdBgQpBk0SOULmFSCa 2Nir2gFpNcKhps+DvWU2JOM6XWb2sGqwSwizPECBqAhwRAhyQIClkEBw2ssE9PuDqHyzhP2UScZ1urTr @@ -191,7 +191,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMaSURBVDhPpZJfTJNXGMZ7pd6YxYUlTpToIGEQXHSiiQqK + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAMaSURBVDhPpZJfTJNXGMZ7pd6YxYUlTpToIGEQXHSiiQqK GI1zc9MsCzfGP4kR54VWJJuaMrZEcGMjDgQZIKzghGQFWcUq6mKZRREcUCG1igirrij1+yhCS7+vLf52 KF0gu92TPDnnPXmf33lPcjTTynlrytkRU/5hhv+t899MfvujzTXayP7vt8ea0mLejw5FZ80r+SJmTUPL qtSLLSs31FkSU+osy5KFUwxinXStJXHDZUtcQrG5VLdDYvQgnlsLKUyLsYQAS/fce1Vm9dE/OMZz2c8z @@ -211,44 +211,44 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL3SURBVDhPpZN/LJRxHMcff9Vaq1hbVtqRSqPFOReG/Lhy - zRCV37G1kfXLjVUK9Wh+HGuNGOOxSZkZTnk2v+aY+a2bkEzFiCW0PUfhRnfOu+/dxG792Wd77bvv5/l+ - Xp/Pvt89lC52BXjX8J7xNI7ZLiqnbDeVY5arSpjlpBJKdTgbYJtuu6Y7uzvEU64v1gU/zwqlQwr8WldB - q9VibWMDy4TFdTVWNBv6vYbkdd+4lSXEVSbjVP5RbJVTxkZGRkitegUlt4QbMTcQn3Afz3MLoMvrsLWz - x+T0AtIzMmFubq7PmQYc2NyqpygT/v5Nv9goTE5Nw8TEBB3d/fpDTfJuTM0tI+zadTxMSQOdmgEezxx3 - aySwLzmh3SqnKEsPM+3BI6bIyX0BgUCAhsbm7e5/cT3niRQ6HeERkbhTHQc+c3xHYE1bb+zZtxcWFhaQ - SqXgOE4/SSeZRLn8G/PKNcz8WEXS4zSEhUfhtiwOgpJjhgK/2Eh9J477QS5LjaKiwu3uxsbGyM3NRyqd - hkjdBDIJEVgaCqRtpXij+IDq/kFU9LxDeVcfyjp68LK9C8XyVhTJW1DW3oPipjZE18VAyJw0FCQ2ZyKi - LhRXa/wRJLuEQJkPQQx/mYjghYu1LnB9awcxexaXWRGcGBtDQXxjMsKqQ9GrGMfs3DzGxr9hYOQr3hNG - J2bxurEDZjnB8Kg7g0DWEy7MaUPBnYYERFVGYWF2FtFlCWjp/IhNtRKrPzmyLhLRJATlrhCxfPizZBrG - 1lBwu0GCsMpgDAyM4VDyTUhK07HIfceXiRnMEWlL5zBEVe7wZh3gwwr+FcTWx+JKhR9aWxXgF7ohiSnA - p9HP6O0fxdDQGGobehBUFQxxnRBerBXOMfwdgSjPHZLmpwipDEBHuwJ95CX6egehUIwQPmD4/Qjq5f1I - rM9EALlAMWsDL0a4/S9Qh285dPoViTUX6PPqeJpWP6EZdSJZ7xEeEB4RbhF8aV+1iHZWexTzNGYSwfBW - +f8ERf0BwjsIXtndjNMAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAL2SURBVDhPpZN7SFNRHMevfxURlRIkZUyzMizSOZeKb1cu + JE0r3ykEPkjNoVRWWtfwMSMiMwy9glkios7ygi+cIr5t+E6sFE3JfMCdlja0zfntbJgy+rMffDic3z2/ + z+/HOVxKF7v8vat4T3kahyfOKscnriqHHBeVMMdRJZTqcDLAJtNmTXd2d7CnXF+sC36eFYoHFfi5roJW + q8XaxgZWCEvraqxqNvR7DcnrvnGry0gsT8Wpl0exVU4ZGxkZIb3iDZTcMmKiY5CUfAfPcvOhy+uwsbXD + 5PQCMrOyYW5urs+Z+h/Y3KqnKBP+/k3f2EhMTk3DxMQEbZ29+kMN8k5Mza0g9PoN3EvLAJ2eBR7PHLeq + JLArOqHdKqcoS3cz7cEjpnie+wICgQB19Y3b3f/i4uaJNDoTYeERSKhMBJ85viOwpq039uzbCwsLC0il + UnAcp5+knUyiXPmNeeUaZhZ/4cHDDISGRSJelghB0TFDgW9shL4Txy2Sy1KjoODVdndjY2Pk5r5EOp2B + CN0EMgkRWBoKpC3FeKcYRmXvAMq6PqC0owclbV143dqBQnkzCuRNKGntQmFDC6JqoiFkThoKUhqzEV4T + gmtVfgiUXUaAzIcghp9MRPDCxWpnuLy3hZg9hyusCI7MaUNBUn0qQitD0K0Yx+zcPMbGv6Fv5Cv6CaMT + s3hb3waz50HwqDmLANYTzswZQ0FCXTIiyyOxMDuLqJJkNLV/xKZaiV8/OLIuEdEkBKUuELF8+LFkGsbG + UBBfJ0FoeRD6+sZwKPUmJMWZWOK+48vEDOaItKl9CKIKd3iz9vBhBf8KYmtjcbXMF83NCvBfueIBk49P + o5/R3TuKwcExVNd1IbAiCOIaIbxYK7gx/B2BKM8dksbHCC73R1urAj3kJXq6B6BQjBCGMdQ/glp5L1Jq + s+FPLlDMnoYXI9z+F6jDcfbtvgVizQX6vDqJptWPaEadQtbbhLuE+4Q4wiX6klpEO6k9CnkaM4lgaKv8 + f4Ki/gC/NQhdkMvTDQAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKxSURBVDhPbVJRSJNRFP61pKgoUGxRb8NKqsdtvgwVxsgI - xJcItPBJRYUiZK+NuenenMp0buZklSIK28QE3dzcEmWbTv/B5oN7a0kj9zL3UATtdr7rr7HswOE/3PN9 - 537/d67wb+j1+nK73V5htVpvraysGFdXV02oOzs7K9CTYP8Pp9N5NxgMuv1+/4fh4eFn0WiUEalosVie - Ly4uugKBgMfhcNyT4OeifGpqypFIJFh/f3+Rbk6hRqI2GAxFo9FYJDXvgD2hSDE+Pn6fQOb29vZXAKXT - aXZwcMBisRhP1DhDr6Oj43UkEjFPT0/XSnThIoGWMpkMW19f/z02Nlbc2Njg0k+TZDOcoQcMsPF4fBlc - oaam5rrNZgtNTEwUc7kci+/ucjJJTjU1NemRFEmcEYkBAyypDsvl8huQf3NgYOAFGfelUCgwj8fDaAvf - KisrH9ANZciqqqpaIh263W52fFxgPp8vMzg4+BJcYW1tbTSbzbJ8Ps+ne71eRq57uby/cWFkZMSN3tFR - jmPBoa1YsTob5GFlyVQKjrP5+Xk/kUoGLCws+NADBngkce2CUqlUNDc3v3W5XF+3t7dZlFwnl39S8zER - sa6yyclJLZ39QG9nZ4fRBg5bWlr0CoVCKZBJl+bm5t5jIm6IkBIYmUwmf4miuEW5iRpn0WiMkVdcAQ39 - 2NDQcFmQyWRXyfHNU1nIUCjMRDHB9vf3eYr0mELhcMlq6U1sVVdXX+M/WF9fr6W3vqTRaCxozszMwAe+ - ESTq2dlZPkCtVluAbWxsxC+eBf71islkGh0aGuLAvr6+77S6sxpfpE6nswIrcUqirK6u7klvb+9eT0/P - Z61W+8ZsNvMBqLu6ukLd3d2iSqV6CuwJ5XygIaNHdIe287C1tfVTW1vbMrn9iB7TbfQkjBSC8AcOju2G - gJbsgQAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAKwSURBVDhPbVJdSJNhFP60pKgomNii7oaVVJeb3ow5GCMj + EG8i0MIrFRWKkN02x+Z256YO52ZOVimisE1M0M2fraHsx+k32LzQu5YkuRvdRRG0t/O8fhpmBx6+w3ue + 57zne84r/BtGo7Hc7XZXOJ3OWwsLC+bFxUUL8vb29grUJNr/w+v13l1ZWfGHw+EPDofjWSKRYCQq2e32 + 57Ozs77l5eWAx+O5J9HPRfnY2Jgnk8mw3t7eEt2cQw4gRyOTyVSiad6BeyyRYnh4+D6RbK2tra9A2t3d + ZTs7OyyZTHIgxxlqbW1tr+PxuG18fLxGkgsXiTSXz+fZ6urq76GhoVIsFuOjn4DGZjhDDRxw0+n0PLRC + dXX1dZfLFaEpSoVCgaU3N7mYbss1NDQYAYoszkjEwAGXEFUoFDcw/s2+vr4XZNyXYrHIAoEAoy18k8lk + D+iGMqCysrJmZGRkz+/3s6OjIguFQnmr1foSWmFpaWlwf3+fHR4e8u7BYJCR60E+3t+4MDAw4Eft4KDA + udDQVpxYnQvjYWXZXA6Os+np6TCJzjSYmZkJoQYO+ABp3YJKpVI2Nja+9fl8X1OpFEuQ6+TyTyo+JiHW + VTY6Oqqnsx+obWxsMNrAXlNTk1GpVKoEMunS1NTUe3TEDXGaBEZms9lfoiiuE9aQ4yyRSDLyik9ATT/W + 19dfFuRy+VVyfO1kLCASiTJRzLDt7W0OkR5TJBo9s1qz2bxeVVV1jf+gRqPR01uf0+l0dhQnJibgA98I + gHxycpI3UKvVdnC1Wi1+8TTwr1csFstgf38/J/b09Hyn1Z3m+AIGg8EJrqQ5E2V1dXVPuru7t7q6uj7r + 9fo3NpuNN0De0dER6ezsFGtra5+Ceyw5HyjI6RHdoe08bG5u/tTS0jJPbj+ix3QbNYkjhSD8AWfn7VCn + kasKAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAj5SURBVFhHrZf5U5PnFseZuT91pj91xj+i3nZcigpeJCyy + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAj5SURBVFhHrZf5U5PnFseZuT91pj91xj+i3nZcigpeJCyy CIgECPse9iUJECArCZCNQCAQNkHUqpGteKFYBIEgW4QWUTYV3LrMvbe36v3pVutcZr73eR5CK4pLOz0z 72SyvO/nnPOc8z0nTr/HTPb8D1RjRcGlI8VSxXBBq2I4v086KOwruZzXWjyQIy3oywzO78r/wPHzP8/K xyTBFTZpv2qo5Jl6pAilw2IohgogGxJBOihAyUAuir7MRmFfJvh/5z/L6+H353SlBDtu/+OmmZAd1I5J @@ -364,7 +364,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALzSURBVDhPhZLJT1NhFMWf/wfpzgQIUBmDIEMJKkYhAgWr + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAALzSURBVDhPhZLJT1NhFMWf/wfpzgQIUBmDIEMJKkYhAgWr gSLK2L4CpTwKlA4UaCmdqEwFGSIOMYiaUECJWChDS0sZujPGLWFBwk5YYHJ87/kwoiSe5Nvd3/3uPecS fyt/NCNMOJZZXzCSOZ3rTPfnDqT67ziuTd+2pdbn9CSFcWUXSziRRRY6M/aVs5UwuVtg39DAtq6BcUkJ +ZtHuNmbuJ9tSCK58j8E4lLxZGZ/82wFhvwGjOyaYNlSQ7+pgN7XCHOgHc4dEwa8XSBfipGpT+xnGI4m @@ -383,7 +383,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGdSURBVDhPldHrK0NhHAfw/UteaZuMM9vygjJrF2zKrc1l + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGdSURBVDhPldHrK0NhHAfw/UteaZuMM9vygjJrF2zKrc1l hGOGObkdw3HJCzVzzzasNaKY0lqzIolyi0lKhvKGf+DrbJ3UyOX51vPi6ff8Ps+v5xH9FvmEtEc+LhEL W7LkT2WPGOYLIXNK3oiRwplczuRVY+qCRW+0GdRoxnsuJ5YI5d9TvKDgKgNauG6H0RQ1wRLSwL5n+R+i 86i4mqAeK49usFc2WCI6aIMyVG8WgN23geIy3mVcZpZwPD06j4IrWsxBf5SGOz6G0TgDa6wUxi0VWvfK @@ -396,7 +396,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGiSURBVDhPlZFZSwJhFIb9S15FGphMk1JQkcikmQZtaJlF + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGiSURBVDhPlZFZSwJhFIb9S15FGphMk1JQkcikmQZtaJlF NZkt2qrUmEkXhdmCUWqJaBS0QISYFBEFbbQQQWQF3eQfeBtrvAjKmgfOzXfO+xwOn+AndGsyaKMyVEXk UIcKQQUIKBal4Np/o43KsfUWwurLPFaTc3AcdPIUsJtDr/NwPwzBdWODLd7CT6AJy9jtc3De2zB6aUFf rJmfoJK9Oy0YvevFyDmNnr0mfgLVCskKZmG/7sLAaSssuwZ+AipAYuXZi8HLdvQdG2He0fMTKJcKEEzO @@ -409,7 +409,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALuSURBVDhPZZLpU1JRGMbpQ39MfW3RtjEzN3AdDRATBUFR + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAALuSURBVDhPZZLpU1JRGMbpQ39MfW3RtjEzN3AdDRATBUFR ARVNyGUUUBTFEHFfxnHLsXHXcspcWh2zPqdWOjkTuSYgF7empyPcTMbfzP3wvu953vPcZw7jNHNyqWpW nlpAlx6AwTj3UhhjmhCw+XTLk7l0mWK5sQbL9dV4l5akpNsnTAhjaj5XqPFC4HMwxo9i020383J55vcG M5xDXa5vuaYSryTCB/SYMSHimRf0RaA6GrBZb8BgePjeaCwr2jX8kCHLXiE3U8Pd2G8uw16DDlRvK76Y @@ -428,7 +428,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIWSURBVDhPY8AGJObesxefd3+m6OxHKlAhEsCq/8zC025d + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIWSURBVDhPY8AGJObesxefd3+m6OxHKlAhEsCq/8zC025d Eq6/8kd45t0KqCgYKG78LC6//z4HlIsd8E66nsAz8fouvgnXt/BNunYYKgzWrLLl/TeVLVf+4Dak/gob S+eFhxxdlyzZ2y9kctRf/MPVdUUCJKW48YW40sa335Q24jGAqf5kEXP9qSdM9afSmOtPdjGVHP7PVHcy EyQHMkB+zctv8muABszHZkD5bn6G0v1vgfgqQ+mBM2Cctf8nkN4CkhZb9kKcb/aTb1LAsMFqAGPCinam @@ -443,7 +443,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFQSURBVDhPnZHLSsNAGEaz8g18DF9CEFy79xEEUzOBbAz1 + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFQSURBVDhPnZHLSsNAGEaz8g18DF9CEFy79xEEUzOBbAz1 UoRCN0JBwaUlCHVTJAXroggV6qaNqa2NlW66SANWgoIi5TMzzkiSXqIe+BeB/5wZJtImIfmUqmLKnAez IiVxmM9jPB7D6XZx32rB8zz23bQsEE2DrCirfHU6NEDl62oVN7UaLkoluK7LIpZtJ0dooNlo4LZeh+/7 uKpU8Og4LPCrCA14wyE7uWyaODMMjEYjZIsOUsd3eHn9mB8RbzAYDNDv9/EcyPW2C63Qxr7Zg3yUENnJ @@ -458,57 +458,57 @@ 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 - /APhi6F+q53E2wAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAJ8SURBVDhPfZLNTxNRFMVZqvG/ceMOQyh+JSSAFDfGRBMX + xpgQi6HxoyiNkBg1WGWjJm5lY6JstCgB+gFtKS2gpLQ8SYfSzhRoZx4tdqad431DYVPwJCdvMff95t7z + blObMzjW7Y5Ee4YizD48lxTuGZpLtg+GYuf6/Xebr0+eaPqfrrhDMcMwkjI3mELOaQaT8jqTNJ0NeRXW + 5V54f+bWl1P18kbZn4VX83TRn9r3dKrCxpc44xWD+dI68/zIs/OPZgbq5Y3qGJxLFgkQSZMlAdHZRIKz + lMxZnuuM/zXYjbfzqXp5owRAJcAiXY6TBchHXXyYUTA6uYnX3g3Ldz7GSzffxcrX3oRXW5y+x2d7P508 + BGgEWKbLwgISoi5Gf2ZgApB5DQo5p1UhFXRkNR3DXgXd7ujX5ttjpw9HOAAIi1E89Nftkgk/qyK4boCy + wfhSCbxigrKBZ2oLFx5Mew5HSMgGSyr7p4CItotlE/PpKualKmb/6JhI7GFNLoGyAWWDLtcL0wKIVzgK + oO6ZWMxUEd+ogrKBb60C70oZn+McGzTOVdcrArgiTFLzDYARAmh7wK+saTmeqSG0rsPHKlYnWa2GHgFo + fxhcEh3kVFqeos5klRaKlmnkO41gAYDf2RqWN2uIUSdhSeShI8dN2AXgkjPw7bJzNmpzBNZa7wWWD9zp + DtEIQEIGksr+uUKwxQwQTsP61u16aVpPeZQ6ByPGTsk4FlAoGwSgDo5T19MFZNXCsYCcVoD9SRT18kZd + 7A9ub/EqKBtkizooG1A2lvPknd0amgcmK/XyRrX0zky19AU2bX3PTZsjyG2OWbI4g7ytz7/b6pjOddwP + qf8A0HWhcK17tb4AAAAASUVORK5CYII= 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 @@ -524,7 +524,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAI6SURBVDhPvZFvT1JhHIbZ+hy0ytLpdC4rkZmYMWUaYWaE + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAI6SURBVDhPvZFvT1JhHIbZ+hy0ytLpdC4rkZmYMWUaYWaE wQhiahhpx3+AgGLiyURNEURRRP5YlnPrVDMkMYfL2oxBqNV7X/Id2t0hz3JN2vJN17t7z6779zzPj/Vf kS1e14sXxceYeHQkPuF2reeKm4mHaYoo2Zp3CkL9Vh5soKRJFSXB7aUbkC3UQBIQofVNEx68bITQwR9j lAM0qyquOqSgyE0jnLER+Ham8PSrG/5dF+a2JzH7xQFX3AZHdAR3nyvAHyzuZ1R68oqSnZLHo4/x4rsX diff --git a/Utils/NodesGeneratorNew/NodesGenerator.v12.suo b/Utils/NodesGeneratorNew/NodesGenerator.v12.suo index 7980b77f5..805a62f5f 100644 Binary files a/Utils/NodesGeneratorNew/NodesGenerator.v12.suo and b/Utils/NodesGeneratorNew/NodesGenerator.v12.suo differ diff --git a/Utils/NodesGeneratorNew/NodesGenerator_old/bin/Debug/NodesGenerator.exe b/Utils/NodesGeneratorNew/NodesGenerator_old/bin/Debug/NodesGenerator.exe index b5a8d0cdb..6613568ef 100644 Binary files a/Utils/NodesGeneratorNew/NodesGenerator_old/bin/Debug/NodesGenerator.exe and b/Utils/NodesGeneratorNew/NodesGenerator_old/bin/Debug/NodesGenerator.exe differ diff --git a/Utils/NodesGeneratorNew/NodesGenerator_old/bin/Debug/NodesGenerator.pdb b/Utils/NodesGeneratorNew/NodesGenerator_old/bin/Debug/NodesGenerator.pdb index 32dc49211..d9391b669 100644 Binary files a/Utils/NodesGeneratorNew/NodesGenerator_old/bin/Debug/NodesGenerator.pdb and b/Utils/NodesGeneratorNew/NodesGenerator_old/bin/Debug/NodesGenerator.pdb differ diff --git a/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator.exe b/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator.exe index b5a8d0cdb..6613568ef 100644 Binary files a/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator.exe and b/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator.exe differ diff --git a/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator.pdb b/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator.pdb index 32dc49211..d9391b669 100644 Binary files a/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator.pdb and b/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator.pdb differ diff --git a/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator_old.csproj.FileListAbsolute.txt b/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator_old.csproj.FileListAbsolute.txt index f652d951d..d7f01e3ee 100644 --- a/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator_old.csproj.FileListAbsolute.txt +++ b/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator_old.csproj.FileListAbsolute.txt @@ -24,3 +24,16 @@ D:\PABC_SVN\PascalABC.NET\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\N D:\PABC_SVN\PascalABC.NET\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator_old.csproj.GenerateResource.Cache D:\PABC_SVN\PascalABC.NET\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator.exe D:\PABC_SVN\PascalABC.NET\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator.pdb +D:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\bin\Debug\NodesGenerator.exe.config +D:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\bin\Debug\NodesGenerator.exe +D:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\bin\Debug\NodesGenerator.pdb +D:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator_old.csprojResolveAssemblyReference.cache +D:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator.Form1.resources +D:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator.method_editor.resources +D:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator.node_def.resources +D:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator.simple_node_editor.resources +D:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator.subnode_editor.resources +D:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator.template_form.resources +D:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator_old.csproj.GenerateResource.Cache +D:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator.exe +D:\PascalABC.NET\!PABC_Git\Utils\NodesGeneratorNew\NodesGenerator_old\obj\Debug\NodesGenerator.pdb diff --git a/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator_old.csproj.GenerateResource.Cache b/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator_old.csproj.GenerateResource.Cache index ebe268aa0..21b560fe3 100644 Binary files a/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator_old.csproj.GenerateResource.Cache and b/Utils/NodesGeneratorNew/NodesGenerator_old/obj/Debug/NodesGenerator_old.csproj.GenerateResource.Cache differ diff --git a/bin/Lib/PABCRtl.dll b/bin/Lib/PABCRtl.dll index 7924fd2eb..797d7527b 100644 Binary files a/bin/Lib/PABCRtl.dll and b/bin/Lib/PABCRtl.dll differ