From ab7ff145d6b290c7292bf2da285cc491ca595cb4 Mon Sep 17 00:00:00 2001 From: marcnoon Date: Sun, 5 Mar 2023 14:46:53 -0800 Subject: [PATCH 1/4] updates --- pWord4/pWordLib/dat/behavior/Dirty.cs | 2 -- pWord4/pword/pWord.resx | 4 ++-- pword4/pword/pWord.cs | 16 ++++++++-------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/pWord4/pWordLib/dat/behavior/Dirty.cs b/pWord4/pWordLib/dat/behavior/Dirty.cs index 8de76cf..99959fc 100644 --- a/pWord4/pWordLib/dat/behavior/Dirty.cs +++ b/pWord4/pWordLib/dat/behavior/Dirty.cs @@ -43,8 +43,6 @@ public override pNode Operate(pNode _pNode) return _pNode; // not yet implemented } - - #endregion diff --git a/pWord4/pword/pWord.resx b/pWord4/pword/pWord.resx index 17d17c2..54a1ee9 100644 --- a/pWord4/pword/pWord.resx +++ b/pWord4/pword/pWord.resx @@ -128,7 +128,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA0 - QQAAAk1TRnQBSQFMAgEBCgEAAWQBHwFkAR8BJwEAASQBAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAGc + QQAAAk1TRnQBSQFMAgEBCgEAAWwBHwFsAR8BJwEAASQBAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAGc AwABbAMAAQEBAAEYBQABcAHFbwAD/gPoA2sGCwNoA+UD/gP/A/UB5wLmA/ld/wP8AecC5gLwAe8D/v8A RQAD/gPUAyoDKANpA2sDKgMoA+AD+AGdAZoBmQFPAUkBSAGNAYkBiAH2AvVX/wP4AaEBngGdAU4BSAFH AX8BewF6A+v/AEIAA/4DygMiAywDyAb4A8QDJQNQAfgC9wGLAYcBhQErASQBIgEuAScBJQFvAWoBaAH0 @@ -420,7 +420,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADA - CAAAAk1TRnQBSQFMAgEBAwEAAWQBHwFkAR8BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAwEAAWwBHwFsAR8BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/pword4/pword/pWord.cs b/pword4/pword/pWord.cs index bb4d0ea..de470ed 100644 --- a/pword4/pword/pWord.cs +++ b/pword4/pword/pWord.cs @@ -565,7 +565,7 @@ private void InitializeComponent() // // statusBar1 // - this.statusBar1.Location = new System.Drawing.Point(0, 335); + this.statusBar1.Location = new System.Drawing.Point(0, 315); this.statusBar1.Name = "statusBar1"; this.statusBar1.Size = new System.Drawing.Size(299, 20); this.statusBar1.TabIndex = 0; @@ -1369,7 +1369,7 @@ private void InitializeComponent() // splitter1 // this.splitter1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.splitter1.Location = new System.Drawing.Point(0, 43); + this.splitter1.Location = new System.Drawing.Point(0, 23); this.splitter1.Name = "splitter1"; this.splitter1.Size = new System.Drawing.Size(299, 7); this.splitter1.TabIndex = 5; @@ -1382,7 +1382,7 @@ private void InitializeComponent() this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 70); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(299, 265); + this.panel1.Size = new System.Drawing.Size(299, 245); this.panel1.TabIndex = 6; this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); // @@ -1503,7 +1503,7 @@ private void InitializeComponent() this.panel6.Controls.Add(this.btnCancel); this.panel6.Location = new System.Drawing.Point(0, 95); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(299, 210); + this.panel6.Size = new System.Drawing.Size(299, 190); this.panel6.TabIndex = 5; // // treeView1 @@ -1523,7 +1523,7 @@ private void InitializeComponent() this.treeView1.Name = "treeView1"; this.treeView1.Scrollable = ((bool)(configurationAppSettings.GetValue("treeView1.Scrollable", typeof(bool)))); this.treeView1.SelectedImageIndex = 0; - this.treeView1.Size = new System.Drawing.Size(299, 43); + this.treeView1.Size = new System.Drawing.Size(299, 23); this.treeView1.TabIndex = 3; this.treeView1.AfterCollapse += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterCollapse_1); this.treeView1.AfterExpand += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterExpand_1); @@ -1543,7 +1543,7 @@ private void InitializeComponent() this.tabs.Controls.Add(this.tabAttributes); this.tabs.Controls.Add(this.tabCMD); this.tabs.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tabs.Location = new System.Drawing.Point(0, 50); + this.tabs.Location = new System.Drawing.Point(0, 30); this.tabs.Name = "tabs"; this.tabs.SelectedIndex = 0; this.tabs.Size = new System.Drawing.Size(299, 160); @@ -1719,7 +1719,7 @@ private void InitializeComponent() // this.AccessibleDescription = "Enabled to view file after xml or html export."; this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); - this.ClientSize = new System.Drawing.Size(299, 355); + this.ClientSize = new System.Drawing.Size(299, 335); this.Controls.Add(this.panel1); this.Controls.Add(this.userControl11); this.Controls.Add(this.toolBar1); @@ -4818,7 +4818,7 @@ private void ProcessCommandText(string txt) Debugger.Log(1, "success", "testing"); // regex match text a-Z only - var stringMatches = Regex.Matches(_cmd, @"[a-zA-Z_]+"); + var stringMatches = Regex.Matches(_cmd, @"[^a-zA-Z0-9_]+"); var stringMatchResult = ""; foreach (Match stringMatch in stringMatches) { From 03d396e9406f1db3ba0aed8d2847bfbdad7f9b5e Mon Sep 17 00:00:00 2001 From: marcnoon Date: Sun, 5 Mar 2023 14:46:59 -0800 Subject: [PATCH 2/4] updates --- pWord4/pword/pWord.cs | 16 ++++++++-------- pWord4/pword/pWord.resx | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pWord4/pword/pWord.cs b/pWord4/pword/pWord.cs index e56ed99..74edc34 100644 --- a/pWord4/pword/pWord.cs +++ b/pWord4/pword/pWord.cs @@ -565,7 +565,7 @@ private void InitializeComponent() // // statusBar1 // - this.statusBar1.Location = new System.Drawing.Point(0, 335); + this.statusBar1.Location = new System.Drawing.Point(0, 315); this.statusBar1.Name = "statusBar1"; this.statusBar1.Size = new System.Drawing.Size(299, 20); this.statusBar1.TabIndex = 0; @@ -1369,7 +1369,7 @@ private void InitializeComponent() // splitter1 // this.splitter1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.splitter1.Location = new System.Drawing.Point(0, 43); + this.splitter1.Location = new System.Drawing.Point(0, 23); this.splitter1.Name = "splitter1"; this.splitter1.Size = new System.Drawing.Size(299, 7); this.splitter1.TabIndex = 5; @@ -1382,7 +1382,7 @@ private void InitializeComponent() this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 70); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(299, 265); + this.panel1.Size = new System.Drawing.Size(299, 245); this.panel1.TabIndex = 6; this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); // @@ -1503,7 +1503,7 @@ private void InitializeComponent() this.panel6.Controls.Add(this.btnCancel); this.panel6.Location = new System.Drawing.Point(0, 95); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(299, 210); + this.panel6.Size = new System.Drawing.Size(299, 190); this.panel6.TabIndex = 5; // // treeView1 @@ -1523,7 +1523,7 @@ private void InitializeComponent() this.treeView1.Name = "treeView1"; this.treeView1.Scrollable = ((bool)(configurationAppSettings.GetValue("treeView1.Scrollable", typeof(bool)))); this.treeView1.SelectedImageIndex = 0; - this.treeView1.Size = new System.Drawing.Size(299, 43); + this.treeView1.Size = new System.Drawing.Size(299, 23); this.treeView1.TabIndex = 3; this.treeView1.AfterCollapse += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterCollapse_1); this.treeView1.AfterExpand += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterExpand_1); @@ -1543,7 +1543,7 @@ private void InitializeComponent() this.tabs.Controls.Add(this.tabAttributes); this.tabs.Controls.Add(this.tabCMD); this.tabs.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tabs.Location = new System.Drawing.Point(0, 50); + this.tabs.Location = new System.Drawing.Point(0, 30); this.tabs.Name = "tabs"; this.tabs.SelectedIndex = 0; this.tabs.Size = new System.Drawing.Size(299, 160); @@ -1719,7 +1719,7 @@ private void InitializeComponent() // this.AccessibleDescription = "Enabled to view file after xml or html export."; this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); - this.ClientSize = new System.Drawing.Size(299, 355); + this.ClientSize = new System.Drawing.Size(299, 335); this.Controls.Add(this.panel1); this.Controls.Add(this.userControl11); this.Controls.Add(this.toolBar1); @@ -4818,7 +4818,7 @@ private void ProcessCommandText(string txt) Debugger.Log(1, "success", "testing"); // regex match text a-Z only - var stringMatches = Regex.Matches(_cmd, @"[a-zA-Z_]+"); + var stringMatches = Regex.Matches(_cmd, @"[^a-zA-Z0-9_]+"); var stringMatchResult = ""; foreach (Match stringMatch in stringMatches) { diff --git a/pWord4/pword/pWord.resx b/pWord4/pword/pWord.resx index 54a1ee9..fd4510d 100644 --- a/pWord4/pword/pWord.resx +++ b/pWord4/pword/pWord.resx @@ -128,7 +128,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA0 - QQAAAk1TRnQBSQFMAgEBCgEAAWwBHwFsAR8BJwEAASQBAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAGc + QQAAAk1TRnQBSQFMAgEBCgEAAXQBHwF0AR8BJwEAASQBAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAGc AwABbAMAAQEBAAEYBQABcAHFbwAD/gPoA2sGCwNoA+UD/gP/A/UB5wLmA/ld/wP8AecC5gLwAe8D/v8A RQAD/gPUAyoDKANpA2sDKgMoA+AD+AGdAZoBmQFPAUkBSAGNAYkBiAH2AvVX/wP4AaEBngGdAU4BSAFH AX8BewF6A+v/AEIAA/4DygMiAywDyAb4A8QDJQNQAfgC9wGLAYcBhQErASQBIgEuAScBJQFvAWoBaAH0 @@ -420,7 +420,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADA - CAAAAk1TRnQBSQFMAgEBAwEAAWwBHwFsAR8BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAwEAAXQBHwF0AR8BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA From 39330bfe03539d1f84e97f44c02c6eb4fafafbf7 Mon Sep 17 00:00:00 2001 From: marcnoon Date: Sun, 10 Dec 2023 14:26:02 -0800 Subject: [PATCH 3/4] update --- pWord4/pword/pWord.cs | 74 ++++++++++++++++++++--------------------- pWord4/pword/pWord.resx | 4 +-- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/pWord4/pword/pWord.cs b/pWord4/pword/pWord.cs index 74edc34..e143338 100644 --- a/pWord4/pword/pWord.cs +++ b/pWord4/pword/pWord.cs @@ -505,7 +505,6 @@ private void InitializeComponent() this.chkClear = new System.Windows.Forms.CheckBox(); this.btnAdd = new System.Windows.Forms.Button(); this.panel6 = new System.Windows.Forms.Panel(); - this.treeView1 = new myPword.pView(); this.tabs = new System.Windows.Forms.TabControl(); this.tabValue = new System.Windows.Forms.TabPage(); this.tabNamespaces = new System.Windows.Forms.TabPage(); @@ -525,6 +524,7 @@ private void InitializeComponent() this.notifyIcon2 = new System.Windows.Forms.NotifyIcon(this.components); this.openFileDialog2 = new System.Windows.Forms.OpenFileDialog(); this.userControl11 = new LeftRight.LeftRight(); + this.treeView1 = new myPword.pView(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); this.panel4.SuspendLayout(); @@ -565,7 +565,7 @@ private void InitializeComponent() // // statusBar1 // - this.statusBar1.Location = new System.Drawing.Point(0, 315); + this.statusBar1.Location = new System.Drawing.Point(0, 213); this.statusBar1.Name = "statusBar1"; this.statusBar1.Size = new System.Drawing.Size(299, 20); this.statusBar1.TabIndex = 0; @@ -1369,7 +1369,7 @@ private void InitializeComponent() // splitter1 // this.splitter1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.splitter1.Location = new System.Drawing.Point(0, 23); + this.splitter1.Location = new System.Drawing.Point(0, -79); this.splitter1.Name = "splitter1"; this.splitter1.Size = new System.Drawing.Size(299, 7); this.splitter1.TabIndex = 5; @@ -1382,7 +1382,7 @@ private void InitializeComponent() this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 70); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(299, 245); + this.panel1.Size = new System.Drawing.Size(299, 143); this.panel1.TabIndex = 6; this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); // @@ -1503,39 +1503,9 @@ private void InitializeComponent() this.panel6.Controls.Add(this.btnCancel); this.panel6.Location = new System.Drawing.Point(0, 95); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(299, 190); + this.panel6.Size = new System.Drawing.Size(299, 88); this.panel6.TabIndex = 5; // - // treeView1 - // - this.treeView1.AllowDrop = true; - this.treeView1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.treeView1.ContextMenu = this.cmTree; - this.treeView1.Dock = System.Windows.Forms.DockStyle.Fill; - this.treeView1.DrawMode = System.Windows.Forms.TreeViewDrawMode.OwnerDrawAll; - this.treeView1.FullRowSelect = true; - this.treeView1.HideSelection = false; - this.treeView1.HotTracking = true; - this.treeView1.ImageIndex = 0; - this.treeView1.ImageList = this.imageTree1; - this.treeView1.ImeMode = System.Windows.Forms.ImeMode.Off; - this.treeView1.Location = new System.Drawing.Point(0, 0); - this.treeView1.Name = "treeView1"; - this.treeView1.Scrollable = ((bool)(configurationAppSettings.GetValue("treeView1.Scrollable", typeof(bool)))); - this.treeView1.SelectedImageIndex = 0; - this.treeView1.Size = new System.Drawing.Size(299, 23); - this.treeView1.TabIndex = 3; - this.treeView1.AfterCollapse += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterCollapse_1); - this.treeView1.AfterExpand += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterExpand_1); - this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterSelect_1); - this.treeView1.DragDrop += new System.Windows.Forms.DragEventHandler(this.treeView1_DragDrop_1); - this.treeView1.DragOver += new System.Windows.Forms.DragEventHandler(this.treeView1_DragOver); - this.treeView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeView1_KeyDown); - this.treeView1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.treeView1_KeyPress); - this.treeView1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.treeView1_MouseDown_1); - this.treeView1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.treeView1_MouseMove_1); - this.treeView1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.treeView1_MouseUp_1); - // // tabs // this.tabs.Controls.Add(this.tabValue); @@ -1543,7 +1513,7 @@ private void InitializeComponent() this.tabs.Controls.Add(this.tabAttributes); this.tabs.Controls.Add(this.tabCMD); this.tabs.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tabs.Location = new System.Drawing.Point(0, 30); + this.tabs.Location = new System.Drawing.Point(0, -72); this.tabs.Name = "tabs"; this.tabs.SelectedIndex = 0; this.tabs.Size = new System.Drawing.Size(299, 160); @@ -1715,11 +1685,41 @@ private void InitializeComponent() this.userControl11.RightClicked += new System.EventHandler(this.userControl11_RightClicked); this.userControl11.Load += new System.EventHandler(this.userControl11_Load); // + // treeView1 + // + this.treeView1.AllowDrop = true; + this.treeView1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.treeView1.ContextMenu = this.cmTree; + this.treeView1.Dock = System.Windows.Forms.DockStyle.Fill; + this.treeView1.DrawMode = System.Windows.Forms.TreeViewDrawMode.OwnerDrawAll; + this.treeView1.FullRowSelect = true; + this.treeView1.HideSelection = false; + this.treeView1.HotTracking = true; + this.treeView1.ImageIndex = 0; + this.treeView1.ImageList = this.imageTree1; + this.treeView1.ImeMode = System.Windows.Forms.ImeMode.Off; + this.treeView1.Location = new System.Drawing.Point(0, 0); + this.treeView1.Name = "treeView1"; + this.treeView1.Scrollable = ((bool)(configurationAppSettings.GetValue("treeView1.Scrollable", typeof(bool)))); + this.treeView1.SelectedImageIndex = 0; + this.treeView1.Size = new System.Drawing.Size(299, 0); + this.treeView1.TabIndex = 3; + this.treeView1.AfterCollapse += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterCollapse_1); + this.treeView1.AfterExpand += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterExpand_1); + this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterSelect_1); + this.treeView1.DragDrop += new System.Windows.Forms.DragEventHandler(this.treeView1_DragDrop_1); + this.treeView1.DragOver += new System.Windows.Forms.DragEventHandler(this.treeView1_DragOver); + this.treeView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeView1_KeyDown); + this.treeView1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.treeView1_KeyPress); + this.treeView1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.treeView1_MouseDown_1); + this.treeView1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.treeView1_MouseMove_1); + this.treeView1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.treeView1_MouseUp_1); + // // pWord // this.AccessibleDescription = "Enabled to view file after xml or html export."; this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); - this.ClientSize = new System.Drawing.Size(299, 335); + this.ClientSize = new System.Drawing.Size(299, 233); this.Controls.Add(this.panel1); this.Controls.Add(this.userControl11); this.Controls.Add(this.toolBar1); diff --git a/pWord4/pword/pWord.resx b/pWord4/pword/pWord.resx index fd4510d..6916b6f 100644 --- a/pWord4/pword/pWord.resx +++ b/pWord4/pword/pWord.resx @@ -128,7 +128,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA0 - QQAAAk1TRnQBSQFMAgEBCgEAAXQBHwF0AR8BJwEAASQBAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAGc + QQAAAk1TRnQBSQFMAgEBCgEAAawBHwGsAR8BJwEAASQBAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAGc AwABbAMAAQEBAAEYBQABcAHFbwAD/gPoA2sGCwNoA+UD/gP/A/UB5wLmA/ld/wP8AecC5gLwAe8D/v8A RQAD/gPUAyoDKANpA2sDKgMoA+AD+AGdAZoBmQFPAUkBSAGNAYkBiAH2AvVX/wP4AaEBngGdAU4BSAFH AX8BewF6A+v/AEIAA/4DygMiAywDyAb4A8QDJQNQAfgC9wGLAYcBhQErASQBIgEuAScBJQFvAWoBaAH0 @@ -420,7 +420,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADA - CAAAAk1TRnQBSQFMAgEBAwEAAXQBHwF0AR8BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAwEAAawBHwGsAR8BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA From b501cd3e2610f4907df7ba2a9e3fd05fbc981232 Mon Sep 17 00:00:00 2001 From: marcnoon Date: Sun, 10 Dec 2023 14:26:07 -0800 Subject: [PATCH 4/4] update --- pword4/pword/pWord.cs | 74 +++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/pword4/pword/pWord.cs b/pword4/pword/pWord.cs index de470ed..9de2a86 100644 --- a/pword4/pword/pWord.cs +++ b/pword4/pword/pWord.cs @@ -505,7 +505,6 @@ private void InitializeComponent() this.chkClear = new System.Windows.Forms.CheckBox(); this.btnAdd = new System.Windows.Forms.Button(); this.panel6 = new System.Windows.Forms.Panel(); - this.treeView1 = new myPword.pView(); this.tabs = new System.Windows.Forms.TabControl(); this.tabValue = new System.Windows.Forms.TabPage(); this.tabNamespaces = new System.Windows.Forms.TabPage(); @@ -525,6 +524,7 @@ private void InitializeComponent() this.notifyIcon2 = new System.Windows.Forms.NotifyIcon(this.components); this.openFileDialog2 = new System.Windows.Forms.OpenFileDialog(); this.userControl11 = new LeftRight.LeftRight(); + this.treeView1 = new myPword.pView(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); this.panel4.SuspendLayout(); @@ -565,7 +565,7 @@ private void InitializeComponent() // // statusBar1 // - this.statusBar1.Location = new System.Drawing.Point(0, 315); + this.statusBar1.Location = new System.Drawing.Point(0, 213); this.statusBar1.Name = "statusBar1"; this.statusBar1.Size = new System.Drawing.Size(299, 20); this.statusBar1.TabIndex = 0; @@ -1369,7 +1369,7 @@ private void InitializeComponent() // splitter1 // this.splitter1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.splitter1.Location = new System.Drawing.Point(0, 23); + this.splitter1.Location = new System.Drawing.Point(0, -79); this.splitter1.Name = "splitter1"; this.splitter1.Size = new System.Drawing.Size(299, 7); this.splitter1.TabIndex = 5; @@ -1382,7 +1382,7 @@ private void InitializeComponent() this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 70); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(299, 245); + this.panel1.Size = new System.Drawing.Size(299, 143); this.panel1.TabIndex = 6; this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); // @@ -1503,39 +1503,9 @@ private void InitializeComponent() this.panel6.Controls.Add(this.btnCancel); this.panel6.Location = new System.Drawing.Point(0, 95); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(299, 190); + this.panel6.Size = new System.Drawing.Size(299, 88); this.panel6.TabIndex = 5; // - // treeView1 - // - this.treeView1.AllowDrop = true; - this.treeView1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.treeView1.ContextMenu = this.cmTree; - this.treeView1.Dock = System.Windows.Forms.DockStyle.Fill; - this.treeView1.DrawMode = System.Windows.Forms.TreeViewDrawMode.OwnerDrawAll; - this.treeView1.FullRowSelect = true; - this.treeView1.HideSelection = false; - this.treeView1.HotTracking = true; - this.treeView1.ImageIndex = 0; - this.treeView1.ImageList = this.imageTree1; - this.treeView1.ImeMode = System.Windows.Forms.ImeMode.Off; - this.treeView1.Location = new System.Drawing.Point(0, 0); - this.treeView1.Name = "treeView1"; - this.treeView1.Scrollable = ((bool)(configurationAppSettings.GetValue("treeView1.Scrollable", typeof(bool)))); - this.treeView1.SelectedImageIndex = 0; - this.treeView1.Size = new System.Drawing.Size(299, 23); - this.treeView1.TabIndex = 3; - this.treeView1.AfterCollapse += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterCollapse_1); - this.treeView1.AfterExpand += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterExpand_1); - this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterSelect_1); - this.treeView1.DragDrop += new System.Windows.Forms.DragEventHandler(this.treeView1_DragDrop_1); - this.treeView1.DragOver += new System.Windows.Forms.DragEventHandler(this.treeView1_DragOver); - this.treeView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeView1_KeyDown); - this.treeView1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.treeView1_KeyPress); - this.treeView1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.treeView1_MouseDown_1); - this.treeView1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.treeView1_MouseMove_1); - this.treeView1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.treeView1_MouseUp_1); - // // tabs // this.tabs.Controls.Add(this.tabValue); @@ -1543,7 +1513,7 @@ private void InitializeComponent() this.tabs.Controls.Add(this.tabAttributes); this.tabs.Controls.Add(this.tabCMD); this.tabs.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tabs.Location = new System.Drawing.Point(0, 30); + this.tabs.Location = new System.Drawing.Point(0, -72); this.tabs.Name = "tabs"; this.tabs.SelectedIndex = 0; this.tabs.Size = new System.Drawing.Size(299, 160); @@ -1715,11 +1685,41 @@ private void InitializeComponent() this.userControl11.RightClicked += new System.EventHandler(this.userControl11_RightClicked); this.userControl11.Load += new System.EventHandler(this.userControl11_Load); // + // treeView1 + // + this.treeView1.AllowDrop = true; + this.treeView1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.treeView1.ContextMenu = this.cmTree; + this.treeView1.Dock = System.Windows.Forms.DockStyle.Fill; + this.treeView1.DrawMode = System.Windows.Forms.TreeViewDrawMode.OwnerDrawAll; + this.treeView1.FullRowSelect = true; + this.treeView1.HideSelection = false; + this.treeView1.HotTracking = true; + this.treeView1.ImageIndex = 0; + this.treeView1.ImageList = this.imageTree1; + this.treeView1.ImeMode = System.Windows.Forms.ImeMode.Off; + this.treeView1.Location = new System.Drawing.Point(0, 0); + this.treeView1.Name = "treeView1"; + this.treeView1.Scrollable = ((bool)(configurationAppSettings.GetValue("treeView1.Scrollable", typeof(bool)))); + this.treeView1.SelectedImageIndex = 0; + this.treeView1.Size = new System.Drawing.Size(299, 0); + this.treeView1.TabIndex = 3; + this.treeView1.AfterCollapse += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterCollapse_1); + this.treeView1.AfterExpand += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterExpand_1); + this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterSelect_1); + this.treeView1.DragDrop += new System.Windows.Forms.DragEventHandler(this.treeView1_DragDrop_1); + this.treeView1.DragOver += new System.Windows.Forms.DragEventHandler(this.treeView1_DragOver); + this.treeView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeView1_KeyDown); + this.treeView1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.treeView1_KeyPress); + this.treeView1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.treeView1_MouseDown_1); + this.treeView1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.treeView1_MouseMove_1); + this.treeView1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.treeView1_MouseUp_1); + // // pWord // this.AccessibleDescription = "Enabled to view file after xml or html export."; this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); - this.ClientSize = new System.Drawing.Size(299, 335); + this.ClientSize = new System.Drawing.Size(299, 233); this.Controls.Add(this.panel1); this.Controls.Add(this.userControl11); this.Controls.Add(this.toolBar1);