diff --git a/libmsstyle/Properties/AssemblyInfo.cs b/libmsstyle/Properties/AssemblyInfo.cs index 604b3d7..f8b7736 100644 --- a/libmsstyle/Properties/AssemblyInfo.cs +++ b/libmsstyle/Properties/AssemblyInfo.cs @@ -7,7 +7,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("libmsstyle")] -[assembly: AssemblyCopyright("Copyright © Jakob K. 2015-2024")] +[assembly: AssemblyCopyright("Copyright © Jakob K. 2015-2026")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/libmsstyleTests/Properties/AssemblyInfo.cs b/libmsstyleTests/Properties/AssemblyInfo.cs index 7a57f31..4c99162 100644 --- a/libmsstyleTests/Properties/AssemblyInfo.cs +++ b/libmsstyleTests/Properties/AssemblyInfo.cs @@ -7,7 +7,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("libmsstyleTests")] -[assembly: AssemblyCopyright("Copyright © Jakob K. 2015-2024")] +[assembly: AssemblyCopyright("Copyright © Jakob K. 2015-2026")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/msstyleEditorSharp/Dialogs/AboutDialog.Designer.cs b/msstyleEditorSharp/Dialogs/AboutDialog.Designer.cs index ab68179..a5ba9a5 100644 --- a/msstyleEditorSharp/Dialogs/AboutDialog.Designer.cs +++ b/msstyleEditorSharp/Dialogs/AboutDialog.Designer.cs @@ -86,7 +86,7 @@ private void InitializeComponent() this.lbCopyright.Name = "lbCopyright"; this.lbCopyright.Size = new System.Drawing.Size(118, 13); this.lbCopyright.TabIndex = 2; - this.lbCopyright.Text = "© 2015-2024, Jakob K."; + this.lbCopyright.Text = "© 2015-2026, Jakob K."; // // lbVersion // diff --git a/msstyleEditorSharp/Dialogs/ImageView.Designer.cs b/msstyleEditorSharp/Dialogs/ImageView.Designer.cs index 113f7e7..7e13619 100644 --- a/msstyleEditorSharp/Dialogs/ImageView.Designer.cs +++ b/msstyleEditorSharp/Dialogs/ImageView.Designer.cs @@ -30,7 +30,6 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ImageView)); this.imageControl = new msstyleEditor.ImageControl(); this.imageViewContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.whiteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -46,6 +45,14 @@ private void InitializeComponent() this.tsbImage6 = new System.Windows.Forms.ToolStripButton(); this.tsbImage7 = new System.Windows.Forms.ToolStripButton(); this.tsbImage8 = new System.Windows.Forms.ToolStripButton(); + this.tsbImage9 = new System.Windows.Forms.ToolStripButton(); + this.tsbImage10 = new System.Windows.Forms.ToolStripButton(); + this.tsbImage11 = new System.Windows.Forms.ToolStripButton(); + this.tsbImage12 = new System.Windows.Forms.ToolStripButton(); + this.tsbImage13 = new System.Windows.Forms.ToolStripButton(); + this.tsbImage14 = new System.Windows.Forms.ToolStripButton(); + this.tsbImage15 = new System.Windows.Forms.ToolStripButton(); + this.tsbImage16 = new System.Windows.Forms.ToolStripButton(); this.imageViewContextMenu.SuspendLayout(); this.toolStrip.SuspendLayout(); this.SuspendLayout(); @@ -128,7 +135,15 @@ private void InitializeComponent() this.tsbImage5, this.tsbImage6, this.tsbImage7, - this.tsbImage8}); + this.tsbImage8, + this.tsbImage9, + this.tsbImage10, + this.tsbImage11, + this.tsbImage12, + this.tsbImage13, + this.tsbImage14, + this.tsbImage15, + this.tsbImage16}); this.toolStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow; this.toolStrip.Location = new System.Drawing.Point(0, 196); this.toolStrip.Name = "toolStrip"; @@ -142,7 +157,6 @@ private void InitializeComponent() this.tsbImage1.CheckOnClick = true; this.tsbImage1.CheckState = System.Windows.Forms.CheckState.Checked; this.tsbImage1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.tsbImage1.Image = ((System.Drawing.Image)(resources.GetObject("tsbImage1.Image"))); this.tsbImage1.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbImage1.Name = "tsbImage1"; this.tsbImage1.Size = new System.Drawing.Size(23, 22); @@ -154,7 +168,6 @@ private void InitializeComponent() // this.tsbImage2.CheckOnClick = true; this.tsbImage2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.tsbImage2.Image = ((System.Drawing.Image)(resources.GetObject("tsbImage2.Image"))); this.tsbImage2.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbImage2.Name = "tsbImage2"; this.tsbImage2.Size = new System.Drawing.Size(23, 22); @@ -166,7 +179,6 @@ private void InitializeComponent() // this.tsbImage3.CheckOnClick = true; this.tsbImage3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.tsbImage3.Image = ((System.Drawing.Image)(resources.GetObject("tsbImage3.Image"))); this.tsbImage3.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbImage3.Name = "tsbImage3"; this.tsbImage3.Size = new System.Drawing.Size(23, 22); @@ -178,7 +190,6 @@ private void InitializeComponent() // this.tsbImage4.CheckOnClick = true; this.tsbImage4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.tsbImage4.Image = ((System.Drawing.Image)(resources.GetObject("tsbImage4.Image"))); this.tsbImage4.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbImage4.Name = "tsbImage4"; this.tsbImage4.Size = new System.Drawing.Size(23, 22); @@ -190,7 +201,6 @@ private void InitializeComponent() // this.tsbImage5.CheckOnClick = true; this.tsbImage5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.tsbImage5.Image = ((System.Drawing.Image)(resources.GetObject("tsbImage5.Image"))); this.tsbImage5.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbImage5.Name = "tsbImage5"; this.tsbImage5.Size = new System.Drawing.Size(23, 22); @@ -202,7 +212,6 @@ private void InitializeComponent() // this.tsbImage6.CheckOnClick = true; this.tsbImage6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.tsbImage6.Image = ((System.Drawing.Image)(resources.GetObject("tsbImage6.Image"))); this.tsbImage6.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbImage6.Name = "tsbImage6"; this.tsbImage6.Size = new System.Drawing.Size(23, 22); @@ -214,7 +223,6 @@ private void InitializeComponent() // this.tsbImage7.CheckOnClick = true; this.tsbImage7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.tsbImage7.Image = ((System.Drawing.Image)(resources.GetObject("tsbImage7.Image"))); this.tsbImage7.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbImage7.Name = "tsbImage7"; this.tsbImage7.Size = new System.Drawing.Size(23, 22); @@ -226,7 +234,6 @@ private void InitializeComponent() // this.tsbImage8.CheckOnClick = true; this.tsbImage8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.tsbImage8.Image = ((System.Drawing.Image)(resources.GetObject("tsbImage8.Image"))); this.tsbImage8.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbImage8.Name = "tsbImage8"; this.tsbImage8.Size = new System.Drawing.Size(23, 22); @@ -234,6 +241,86 @@ private void InitializeComponent() this.tsbImage8.Text = "8"; this.tsbImage8.Click += new System.EventHandler(this.OnToolButtonClicked); // + // tsbImage9 + // + this.tsbImage9.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.tsbImage9.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbImage9.Name = "tsbImage9"; + this.tsbImage9.Size = new System.Drawing.Size(23, 22); + this.tsbImage9.Tag = 9; + this.tsbImage9.Text = "9"; + this.tsbImage9.Click += new System.EventHandler(this.OnToolButtonClicked); + // + // tsbImage10 + // + this.tsbImage10.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.tsbImage10.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbImage10.Name = "tsbImage10"; + this.tsbImage10.Size = new System.Drawing.Size(23, 22); + this.tsbImage10.Tag = 10; + this.tsbImage10.Text = "10"; + this.tsbImage10.Click += new System.EventHandler(this.OnToolButtonClicked); + // + // tsbImage11 + // + this.tsbImage11.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.tsbImage11.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbImage11.Name = "tsbImage11"; + this.tsbImage11.Size = new System.Drawing.Size(23, 22); + this.tsbImage11.Tag = 11; + this.tsbImage11.Text = "11"; + this.tsbImage11.Click += new System.EventHandler(this.OnToolButtonClicked); + // + // tsbImage12 + // + this.tsbImage12.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.tsbImage12.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbImage12.Name = "tsbImage12"; + this.tsbImage12.Size = new System.Drawing.Size(23, 22); + this.tsbImage12.Tag = 12; + this.tsbImage12.Text = "12"; + this.tsbImage12.Click += new System.EventHandler(this.OnToolButtonClicked); + // + // tsbImage13 + // + this.tsbImage13.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.tsbImage13.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbImage13.Name = "tsbImage13"; + this.tsbImage13.Size = new System.Drawing.Size(23, 22); + this.tsbImage13.Tag = 13; + this.tsbImage13.Text = "13"; + this.tsbImage13.Click += new System.EventHandler(this.OnToolButtonClicked); + // + // tsbImage14 + // + this.tsbImage14.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.tsbImage14.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbImage14.Name = "tsbImage14"; + this.tsbImage14.Size = new System.Drawing.Size(23, 22); + this.tsbImage14.Tag = 14; + this.tsbImage14.Text = "14"; + this.tsbImage14.Click += new System.EventHandler(this.OnToolButtonClicked); + // + // tsbImage15 + // + this.tsbImage15.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.tsbImage15.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbImage15.Name = "tsbImage15"; + this.tsbImage15.Size = new System.Drawing.Size(23, 22); + this.tsbImage15.Tag = 15; + this.tsbImage15.Text = "15"; + this.tsbImage15.Click += new System.EventHandler(this.OnToolButtonClicked); + // + // tsbImage16 + // + this.tsbImage16.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.tsbImage16.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbImage16.Name = "tsbImage16"; + this.tsbImage16.Size = new System.Drawing.Size(23, 22); + this.tsbImage16.Tag = 16; + this.tsbImage16.Text = "16"; + this.tsbImage16.Click += new System.EventHandler(this.OnToolButtonClicked); + // // ImageView // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -269,5 +356,13 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem greyToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem blackToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem checkerToolStripMenuItem; + private System.Windows.Forms.ToolStripButton tsbImage9; + private System.Windows.Forms.ToolStripButton tsbImage10; + private System.Windows.Forms.ToolStripButton tsbImage11; + private System.Windows.Forms.ToolStripButton tsbImage12; + private System.Windows.Forms.ToolStripButton tsbImage13; + private System.Windows.Forms.ToolStripButton tsbImage14; + private System.Windows.Forms.ToolStripButton tsbImage15; + private System.Windows.Forms.ToolStripButton tsbImage16; } } \ No newline at end of file diff --git a/msstyleEditorSharp/Dialogs/ImageView.resx b/msstyleEditorSharp/Dialogs/ImageView.resx index e4e287d..e8b00b5 100644 --- a/msstyleEditorSharp/Dialogs/ImageView.resx +++ b/msstyleEditorSharp/Dialogs/ImageView.resx @@ -123,125 +123,4 @@ 17, 17 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - \ No newline at end of file diff --git a/msstyleEditorSharp/Dialogs/LicenseDialog.cs b/msstyleEditorSharp/Dialogs/LicenseDialog.cs index a9c2bd3..d5406e7 100644 --- a/msstyleEditorSharp/Dialogs/LicenseDialog.cs +++ b/msstyleEditorSharp/Dialogs/LicenseDialog.cs @@ -22,7 +22,7 @@ public LicenseDialog() { @"MIT License -Copyright (c) 2024 Jakob K. +Copyright (c) 2026 Jakob K. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ""Software""), to deal diff --git a/msstyleEditorSharp/PropView/TypeConverters.cs b/msstyleEditorSharp/PropView/TypeConverters.cs index 126cdb3..a199cc0 100644 --- a/msstyleEditorSharp/PropView/TypeConverters.cs +++ b/msstyleEditorSharp/PropView/TypeConverters.cs @@ -2,8 +2,10 @@ using System; using System.Collections.Generic; using System.ComponentModel; +using System.ComponentModel.Design.Serialization; using System.Drawing; using System.Globalization; +using System.Reflection; namespace msstyleEditor.PropView @@ -89,8 +91,8 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c { if (value is string s) { - var found = -1; - Int32.TryParse(s.Substring(0, s.IndexOf(" - ")), out found); + var found = -1; + Int32.TryParse(s.Substring(0, s.IndexOf(" - ")), out found); foreach (var kvp in m_enumInfo) { if (kvp.Key == found) return kvp.Key; @@ -105,7 +107,7 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul if (value is int i) { string result; - if(m_enumInfo.TryGetValue(i, out result)) + if (m_enumInfo.TryGetValue(i, out result)) { return $"{i} - {result}"; } @@ -141,5 +143,91 @@ public override bool GetStandardValuesSupported(ITypeDescriptorContext context) { return false; } + + // Like the original, but without "known", "named" or "system" colors. + public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType) + { + if (destinationType == null) + { + throw new ArgumentNullException("destinationType"); + } + + if (value is Color) + { + if (destinationType == typeof(string)) + { + Color color = (Color)value; + if (color == Color.Empty) + { + return string.Empty; + } + + if (culture == null) + { + culture = CultureInfo.CurrentCulture; + } + + string separator = culture.TextInfo.ListSeparator + " "; + TypeConverter converter = System.ComponentModel.TypeDescriptor.GetConverter(typeof(int)); + int num = 0; + string[] array; + if (color.A < byte.MaxValue) + { + array = new string[4]; + array[num++] = converter.ConvertToString(context, culture, color.A); + } + else + { + array = new string[3]; + } + + array[num++] = converter.ConvertToString(context, culture, color.R); + array[num++] = converter.ConvertToString(context, culture, color.G); + array[num++] = converter.ConvertToString(context, culture, color.B); + return string.Join(separator, array); + } + + if (destinationType == typeof(InstanceDescriptor)) + { + MemberInfo memberInfo = null; + object[] arguments = null; + Color color = (Color)value; + if (color.IsEmpty) + { + memberInfo = typeof(Color).GetField("Empty"); + } + else if (color.A != byte.MaxValue) + { + memberInfo = typeof(Color).GetMethod("FromArgb", new Type[4] + { + typeof(int), + typeof(int), + typeof(int), + typeof(int) + }); + arguments = new object[4] { color.A, color.R, color.G, color.B }; + } + else + { + memberInfo = typeof(Color).GetMethod("FromArgb", new Type[3] + { + typeof(int), + typeof(int), + typeof(int) + }); + arguments = new object[3] { color.R, color.G, color.B }; + } + + if (memberInfo != null) + { + return new InstanceDescriptor(memberInfo, arguments); + } + + return null; + } + } + + return base.ConvertTo(context, culture, value, destinationType); + } } -} +} \ No newline at end of file diff --git a/msstyleEditorSharp/Properties/AssemblyInfo.cs b/msstyleEditorSharp/Properties/AssemblyInfo.cs index d6e6ca4..4b21584 100644 --- a/msstyleEditorSharp/Properties/AssemblyInfo.cs +++ b/msstyleEditorSharp/Properties/AssemblyInfo.cs @@ -7,12 +7,12 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("msstyleEditor")] -[assembly: AssemblyCopyright("Copyright © Jakob K. 2015-2024")] +[assembly: AssemblyCopyright("Copyright © Jakob K. 2015-2026")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] [assembly: Guid("752c3bd1-8014-4d07-a198-823d0c394736")] -[assembly: AssemblyVersion("2.1.1.0")] -[assembly: AssemblyFileVersion("2.1.1.0")] +[assembly: AssemblyVersion("2.1.2.0")] +[assembly: AssemblyFileVersion("2.1.2.0")]