diff --git a/README.ES.md b/README.ES.md index b334437..73a26b4 100644 --- a/README.ES.md +++ b/README.ES.md @@ -81,8 +81,8 @@ Paso 2：Disfruta de las conversiones #### Conseguir ```CS -/* GetValue(string Key1 = "DataStorage", string Key2 = "Bit", string Key3 = "Byte", string Error = ErrorMessage) */ -GetValue("Time", "Minute", "Second", "¡Error!"); +/* GetValue(MethodType Method = MethodType.DataStorage, string Key2 = "Bit", string Key3 = "Byte", string Error = ErrorMessage) */ +GetValue(MethodType.Time, "Minute", "Second", "¡Error!"); ``` ```XML @@ -92,8 +92,8 @@ GetValue("Time", "Minute", "Second", "¡Error!"); ``` ```CS -/* GetValue(string Key1 = "DataStorage", string Key2 = "Bit", string Key3 = "Byte", string Error = ErrorMessage) */ -GetValue("Speed", "MPH", "KPH", "¡Error!"); +/* GetValue(MethodType Method = MethodType.DataStorage, string Key2 = "Bit", string Key3 = "Byte", string Error = ErrorMessage) */ +GetValue(MethodType.Speed, "MPH", "KPH", "¡Error!"); ``` ```XML @@ -105,8 +105,8 @@ GetValue("Speed", "MPH", "KPH", "¡Error!"); #### Conjunto ```CS -/* SetValue(string Key1 = "DataStorage", string Key2 = "Bit", string Key3 = "Byte", string Value = "8", string Error = ErrorMessage) */ -SetValue("Time", "Minute", "Second", "30", "¡Error!"); +/* SetValue(MethodType Method = MethodType.DataStorage, string Key2 = "Bit", string Key3 = "Byte", string Value = "8", string Error = ErrorMessage) */ +SetValue(MethodType.Time, "Minute", "Second", "30", "¡Error!"); ``` ```XML @@ -116,8 +116,8 @@ SetValue("Time", "Minute", "Second", "30", "¡Error!"); ``` ```CS -/* SetValue(string Key1 = "DataStorage", string Key2 = "Bit", string Key3 = "Byte", string Value = "8", string Error = ErrorMessage) */ -SetValue("Speed", "MPH", "KPH", "2", "¡Error!"); +/* SetValue(MethodType Method = MethodType.DataStorage, string Key2 = "Bit", string Key3 = "Byte", string Value = "8", string Error = ErrorMessage) */ +SetValue(MethodType.Speed, "MPH", "KPH", "2", "¡Error!"); ``` ```XML @@ -146,7 +146,7 @@ ListValueJson("¡Error!"); ```XML System.String - (JS-Serialize)... + (Json)... ``` @@ -196,8 +196,8 @@ GetAudio(true); #### HEX -> RGB ```CS -/* HEXtoRGB(string Hex, ColorType Type = ColorType.RGB1, string Error = ErrorMessage) */ -HEXtoRGB("FFFFFF", ColorType.RGB1, "¡Error!"); +/* RGB(string Hex, ColorType Type = ColorType.RGB1, string Error = ErrorMessage) */ +RGB("FFFFFF", ColorType.RGB1, "¡Error!"); ``` ```XML @@ -207,8 +207,8 @@ HEXtoRGB("FFFFFF", ColorType.RGB1, "¡Error!"); ``` ```CS -/* HEXtoRGB(string Hex, ColorType Type = ColorType.RGB1, string Error = ErrorMessage) */ -HEXtoRGB("#000000", ColorType.RRGGBB1, "¡Error!"); +/* RGB(string Hex, ColorType Type = ColorType.RGB1, string Error = ErrorMessage) */ +RGB("#000000", ColorType.RRGGBB1, "¡Error!"); ``` ```XML diff --git a/README.TR.md b/README.TR.md index fb35999..493b150 100644 --- a/README.TR.md +++ b/README.TR.md @@ -81,8 +81,8 @@ Adım 2：Dönüşümlerin tadını çıkarın #### Alma ```CS -/* GetValue(string Key1 = "DataStorage", string Key2 = "Bit", string Key3 = "Byte", string Error = ErrorMessage) */ -GetValue("Time", "Minute", "Second", "Hata!"); +/* GetValue(MethodType Method = MethodType.DataStorage, string Key2 = "Bit", string Key3 = "Byte", string Error = ErrorMessage) */ +GetValue(MethodType.Time, "Minute", "Second", "Hata!"); ``` ```XML @@ -92,8 +92,8 @@ GetValue("Time", "Minute", "Second", "Hata!"); ``` ```CS -/* GetValue(string Key1 = "DataStorage", string Key2 = "Bit", string Key3 = "Byte", string Error = ErrorMessage) */ -GetValue("Speed", "MPH", "KPH", "Hata!"); +/* GetValue(MethodType Method = MethodType.DataStorage, string Key2 = "Bit", string Key3 = "Byte", string Error = ErrorMessage) */ +GetValue(MethodType.Speed, "MPH", "KPH", "Hata!"); ``` ```XML @@ -105,8 +105,8 @@ GetValue("Speed", "MPH", "KPH", "Hata!"); #### Ayarlama ```CS -/* SetValue(string Key1 = "DataStorage", string Key2 = "Bit", string Key3 = "Byte", string Value = "8", string Error = ErrorMessage) */ -SetValue("Time", "Minute", "Second", "30", "Hata!"); +/* SetValue(MethodType Method = MethodType.DataStorage, string Key2 = "Bit", string Key3 = "Byte", string Value = "8", string Error = ErrorMessage) */ +SetValue(MethodType.Time, "Minute", "Second", "30", "Hata!"); ``` ```XML @@ -116,8 +116,8 @@ SetValue("Time", "Minute", "Second", "30", "Hata!"); ``` ```CS -/* SetValue(string Key1 = "DataStorage", string Key2 = "Bit", string Key3 = "Byte", string Value = "8", string Error = ErrorMessage) */ -SetValue("Speed", "MPH", "KPH", "2", "Hata!"); +/* SetValue(MethodType Method = MethodType.DataStorage, string Key2 = "Bit", string Key3 = "Byte", string Value = "8", string Error = ErrorMessage) */ +SetValue(MethodType.Speed, "MPH", "KPH", "2", "Hata!"); ``` ```XML @@ -146,7 +146,7 @@ ListValueJson("Hata!"); ```XML System.String - (JS-Serialize)... + (Json)... ``` @@ -196,8 +196,8 @@ GetAudio(true); #### HEX -> RGB ```CS -/* HEXtoRGB(string Hex, ColorType Type = ColorType.RGB1, string Error = ErrorMessage) */ -HEXtoRGB("FFFFFF", ColorType.RGB1, "Hata!"); +/* RGB(string Hex, ColorType Type = ColorType.RGB1, string Error = ErrorMessage) */ +RGB("FFFFFF", ColorType.RGB1, "Hata!"); ``` ```XML @@ -207,8 +207,8 @@ HEXtoRGB("FFFFFF", ColorType.RGB1, "Hata!"); ``` ```CS -/* HEXtoRGB(string Hex, ColorType Type = ColorType.RGB1, string Error = ErrorMessage) */ -HEXtoRGB("#000000", ColorType.RRGGBB1, "Hata!"); +/* RGB(string Hex, ColorType Type = ColorType.RGB1, string Error = ErrorMessage) */ +RGB("#000000", ColorType.RRGGBB1, "Hata!"); ``` ```XML diff --git a/README.md b/README.md index c6a1811..097bc1b 100644 --- a/README.md +++ b/README.md @@ -81,8 +81,8 @@ Step 2：Enjoy conversions #### Get ```CS -/* GetValue(string Key1 = "DataStorage", string Key2 = "Bit", string Key3 = "Byte", string Error = ErrorMessage) */ -GetValue("Time", "Minute", "Second", "Error!"); +/* GetValue(MethodType Method = MethodType.DataStorage, string Key2 = "Bit", string Key3 = "Byte", string Error = ErrorMessage) */ +GetValue(MethodType.Time, "Minute", "Second", "Error!"); ``` ```XML @@ -92,8 +92,8 @@ GetValue("Time", "Minute", "Second", "Error!"); ``` ```CS -/* GetValue(string Key1 = "DataStorage", string Key2 = "Bit", string Key3 = "Byte", string Error = ErrorMessage) */ -GetValue("Speed", "MPH", "KPH", "Error!"); +/* GetValue(MethodType Method = MethodType.DataStorage, string Key2 = "Bit", string Key3 = "Byte", string Error = ErrorMessage) */ +GetValue(MethodType.Speed, "MPH", "KPH", "Error!"); ``` ```XML @@ -105,8 +105,8 @@ GetValue("Speed", "MPH", "KPH", "Error!"); #### Set ```CS -/* SetValue(string Key1 = "DataStorage", string Key2 = "Bit", string Key3 = "Byte", string Value = "8", string Error = ErrorMessage) */ -SetValue("Time", "Minute", "Second", "30", "Error!"); +/* SetValue(MethodType Method = MethodType.DataStorage, string Key2 = "Bit", string Key3 = "Byte", string Value = "8", string Error = ErrorMessage) */ +SetValue(MethodType.Time, "Minute", "Second", "30", "Error!"); ``` ```XML @@ -116,8 +116,8 @@ SetValue("Time", "Minute", "Second", "30", "Error!"); ``` ```CS -/* SetValue(string Key1 = "DataStorage", string Key2 = "Bit", string Key3 = "Byte", string Value = "8", string Error = ErrorMessage) */ -SetValue("Speed", "MPH", "KPH", "2", "Error!"); +/* SetValue(MethodType Method = MethodType.DataStorage, string Key2 = "Bit", string Key3 = "Byte", string Value = "8", string Error = ErrorMessage) */ +SetValue(MethodType.Speed, "MPH", "KPH", "2", "Error!"); ``` ```XML @@ -146,7 +146,7 @@ ListValueJson("Error!"); ```XML System.String - (JS-Serialize)... + (Json)... ``` @@ -196,8 +196,8 @@ GetAudio(true); #### HEX -> RGB ```CS -/* HEXtoRGB(string Hex, ColorType Type = ColorType.RGB1, string Error = ErrorMessage) */ -HEXtoRGB("FFFFFF", ColorType.RGB1, "Error!"); +/* RGB(string Hex, ColorType Type = ColorType.RGB1, string Error = ErrorMessage) */ +RGB("FFFFFF", ColorType.RGB1, "Error!"); ``` ```XML @@ -207,8 +207,8 @@ HEXtoRGB("FFFFFF", ColorType.RGB1, "Error!"); ``` ```CS -/* HEXtoRGB(string Hex, ColorType Type = ColorType.RGB1, string Error = ErrorMessage) */ -HEXtoRGB("#000000", ColorType.RRGGBB1, "Error!"); +/* RGB(string Hex, ColorType Type = ColorType.RGB1, string Error = ErrorMessage) */ +RGB("#000000", ColorType.RRGGBB1, "Error!"); ``` ```XML diff --git a/demo/Conforyon.UI/Conforyon.UI/Conforyon.UI.csproj b/demo/Conforyon.UI/Conforyon.UI/Conforyon.UI.csproj index f294c4e..8b3d891 100644 --- a/demo/Conforyon.UI/Conforyon.UI/Conforyon.UI.csproj +++ b/demo/Conforyon.UI/Conforyon.UI/Conforyon.UI.csproj @@ -1,12 +1,12 @@  - net452;net46;net461;net462;net47;net471;net472;net48;netcoreapp3.1-windows;net5.0-windows;net6.0-windows + net48;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows WinExe false true preview preview - en + en-GB Resources\ICO.ico @@ -15,6 +15,6 @@ Conforyon.UI.Program - + \ No newline at end of file diff --git a/demo/Conforyon.UI/Conforyon.UI/Main.cs b/demo/Conforyon.UI/Conforyon.UI/Main.cs index 04f887e..878a1c0 100644 --- a/demo/Conforyon.UI/Conforyon.UI/Main.cs +++ b/demo/Conforyon.UI/Conforyon.UI/Main.cs @@ -573,7 +573,7 @@ private void Button4_Click(object sender, EventArgs e) if (button4.Cursor == Cursors.Hand) { button4.Cursor = Cursors.No; - ClipBoard.CopyText(textBox4.Text, false); + Board.Text.Copy(textBox4.Text); } } catch (Exception Ex) @@ -594,11 +594,11 @@ private void Button5_Click(object sender, EventArgs e) if (Selection6 == "C=>F") { - textBox2.Text = Temperatures.CtoF(textBox1.Text, Selection9, Selection8, Convert.ToInt32(textBox5.Text), Selection7, "Error!"); + textBox2.Text = Celsius.Fahrenheit(textBox1.Text, Selection9, Selection8, Convert.ToInt32(textBox5.Text), Selection7, "Error!"); } else { - textBox2.Text = Temperatures.FtoC(textBox1.Text, Selection9, Selection8, Convert.ToInt32(textBox5.Text), Selection7, "Error!"); + textBox2.Text = Fahrenheit.Celsius(textBox1.Text, Selection9, Selection8, Convert.ToInt32(textBox5.Text), Selection7, "Error!"); } button6.Cursor = Cursors.Hand; @@ -616,7 +616,7 @@ private void Button6_Click(object sender, EventArgs e) if (button6.Cursor == Cursors.Hand) { button6.Cursor = Cursors.No; - ClipBoard.CopyText(textBox2.Text, false); + Board.Text.Copy(textBox2.Text); } } catch (Exception Ex) @@ -670,7 +670,7 @@ private void Button9_Click(object sender, EventArgs e) if (button9.Cursor == Cursors.Hand) { button9.Cursor = Cursors.No; - ClipBoard.CopyText(textBox8.Text, false); + Board.Text.Copy(textBox8.Text); } } catch (Exception Ex) @@ -729,11 +729,11 @@ private void Button30_Click(object sender, EventArgs e) if (Selection26 == "MPH => KPH") { - textBox25.Text = Speeding.MPHtoKPH(textBox26.Text, Selection23, Selection24, Convert.ToInt32(textBox24.Text), Selection25, "Error!"); + textBox25.Text = MPH.KPH(textBox26.Text, Selection23, Selection24, Convert.ToInt32(textBox24.Text), Selection25, "Error!"); } else { - textBox25.Text = Speeding.KPHtoMPH(textBox26.Text, Selection23, Selection24, Convert.ToInt32(textBox24.Text), Selection25, "Error!"); + textBox25.Text = KPH.MPH(textBox26.Text, Selection23, Selection24, Convert.ToInt32(textBox24.Text), Selection25, "Error!"); } button29.Cursor = Cursors.Hand; @@ -751,7 +751,7 @@ private void Button23_Click(object sender, EventArgs e) if (button23.Cursor == Cursors.Hand) { button23.Cursor = Cursors.No; - ClipBoard.CopyText(textBox19.Text, false); + Board.Text.Copy(textBox19.Text); } } catch (Exception Ex) @@ -801,7 +801,7 @@ private void Button24_Click(object sender, EventArgs e) if (button24.Cursor == Cursors.Hand) { button24.Cursor = Cursors.No; - ClipBoard.CopyText(textBox22.Text, false); + Board.Text.Copy(textBox22.Text); } } catch (Exception Ex) @@ -817,23 +817,23 @@ private void Button22_Click(object sender, EventArgs e) ComboBox(); if (Selection17 == "FILE=>MD5") { - textBox19.Text = Hashing.FILEtoMD5(textBox20.Text, false, "Error!"); + textBox19.Text = FILE.MD5(textBox20.Text, false, "Error!"); } else if (Selection17 == "FILE=>SHA1") { - textBox19.Text = Hashing.FILEtoSHA1(textBox20.Text, false, "Error!"); + textBox19.Text = FILE.SHA1(textBox20.Text, false, "Error!"); } else if (Selection17 == "FILE=>SHA256") { - textBox19.Text = Hashing.FILEtoSHA256(textBox20.Text, false, "Error!"); + textBox19.Text = FILE.SHA256(textBox20.Text, false, "Error!"); } else if (Selection17 == "FILE=>SHA384") { - textBox19.Text = Hashing.FILEtoSHA384(textBox20.Text, false, "Error!"); + textBox19.Text = FILE.SHA384(textBox20.Text, false, "Error!"); } else if (Selection17 == "FILE=>SHA512") { - textBox19.Text = Hashing.FILEtoSHA512(textBox20.Text, false, "Error!"); + textBox19.Text = FILE.SHA512(textBox20.Text, false, "Error!"); } button23.Cursor = Cursors.Hand; @@ -851,7 +851,7 @@ private void Button10_Click(object sender, EventArgs e) if (button10.Cursor == Cursors.Hand) { button10.Cursor = Cursors.No; - ClipBoard.CopyText(textBox6.Text + ", " + textBox9.Text + ", " + textBox10.Text, false); + Board.Text.Copy(textBox6.Text + ", " + textBox9.Text + ", " + textBox10.Text); } } catch (Exception Ex) @@ -866,13 +866,13 @@ private void Button11_Click(object sender, EventArgs e) ComboBox(); if (Selection10) { - textBox8.Text = Colorful.RGBtoHEX(Convert.ToInt32(textBox6.Text), Convert.ToInt32(textBox9.Text), Convert.ToInt32(textBox10.Text), false, "Error!"); + textBox8.Text = RGB.HEX(textBox6.Text, textBox9.Text, textBox10.Text, false, "Error!"); } else { - textBox6.Text = Colorful.HEXtoRGB(textBox8.Text, Enums.ColorType.OnlyR, "Error!"); - textBox9.Text = Colorful.HEXtoRGB(textBox8.Text, Enums.ColorType.OnlyG, "Error!"); - textBox10.Text = Colorful.HEXtoRGB(textBox8.Text, Enums.ColorType.OnlyB, "Error!"); + textBox6.Text = HEX.RGB(textBox8.Text, Enums.ColorType.OnlyR, "Error!"); + textBox9.Text = HEX.RGB(textBox8.Text, Enums.ColorType.OnlyG, "Error!"); + textBox10.Text = HEX.RGB(textBox8.Text, Enums.ColorType.OnlyB, "Error!"); } button9.Cursor = Cursors.Hand; @@ -903,7 +903,7 @@ private void Button13_Click(object sender, EventArgs e) if (button13.Cursor == Cursors.Hand) { button13.Cursor = Cursors.No; - ClipBoard.CopyText(textBox11.Text, false); + Board.Text.Copy(textBox11.Text); } } catch (Exception Ex) @@ -919,7 +919,7 @@ private void Button14_Click(object sender, EventArgs e) if (button14.Cursor == Cursors.Hand) { button14.Cursor = Cursors.No; - ClipBoard.CopyText(textBox12.Text, false); + Board.Text.Copy(textBox12.Text); } } catch (Exception Ex) @@ -935,11 +935,11 @@ private void Button15_Click(object sender, EventArgs e) ComboBox(); if (Selection11) { - textBox12.Text = Unicodes.CHARtoASCII(textBox11.Text, textBox18.Text.ToCharArray()[0], "Error!"); + textBox12.Text = CHAR.ASCII(textBox11.Text, textBox18.Text.ToCharArray()[0], "Error!"); } else { - textBox11.Text = Unicodes.ASCIItoCHAR(textBox12.Text, textBox18.Text.ToCharArray()[0], "Error!"); + textBox11.Text = ASCII.CHAR(textBox12.Text, textBox18.Text.ToCharArray()[0], "Error!"); } button13.Cursor = Cursors.Hand; @@ -958,31 +958,31 @@ private void Button16_Click(object sender, EventArgs e) ComboBox(); if (Selection12 == "Text=>Base64") { - textBox13.Text = Cryptography.TEXTtoBASE64(textBox14.Text, "Error!"); + textBox13.Text = TEXT.BASE(textBox14.Text, "Error!"); } else if (Selection12 == "Text=>MD5") { - textBox13.Text = Cryptography.TEXTtoMD5(textBox14.Text, false, "Error!"); + textBox13.Text = TEXT.MD5(textBox14.Text, false, "Error!"); } else if (Selection12 == "Text=>SHA1") { - textBox13.Text = Cryptography.TEXTtoSHA1(textBox14.Text, false, "Error!"); + textBox13.Text = TEXT.SHA1(textBox14.Text, false, "Error!"); } else if (Selection12 == "Text=>SHA256") { - textBox13.Text = Cryptography.TEXTtoSHA256(textBox14.Text, false, "Error!"); + textBox13.Text = TEXT.SHA256(textBox14.Text, false, "Error!"); } else if (Selection12 == "Text=>SHA384") { - textBox13.Text = Cryptography.TEXTtoSHA384(textBox14.Text, false, "Error!"); + textBox13.Text = TEXT.SHA384(textBox14.Text, false, "Error!"); } else if (Selection12 == "Text=>SHA512") { - textBox13.Text = Cryptography.TEXTtoSHA512(textBox14.Text, false, "Error!"); + textBox13.Text = TEXT.SHA512(textBox14.Text, false, "Error!"); } else if (Selection12 == "Base64=>Text") { - textBox13.Text = Cryptography.BASE64toTEXT(textBox14.Text, "Error!"); + textBox13.Text = BASE.TEXT(textBox14.Text, "Error!"); } button17.Cursor = Cursors.Hand; @@ -998,7 +998,7 @@ private void Button17_Click(object sender, EventArgs e) if (button17.Cursor == Cursors.Hand) { button17.Cursor = Cursors.No; - ClipBoard.CopyText(textBox13.Text, false); + Board.Text.Copy(textBox13.Text); } } @@ -1007,7 +1007,7 @@ private void Button18_Click(object sender, EventArgs e) if (button18.Cursor == Cursors.Hand) { button18.Cursor = Cursors.No; - ClipBoard.CopyText(textBox16.Text, false); + Board.Text.Copy(textBox16.Text); } } @@ -1052,11 +1052,11 @@ private void Button21_Click(object sender, EventArgs e) { if (Selection14 == "CM") { - textBox16.Text = Typography.INCHtoCM(textBox17.Text, Selection15, Selection16, Convert.ToInt32(textBox15.Text), "Error!"); + textBox16.Text = INCH.CM(textBox17.Text, Selection15, Selection16, Convert.ToInt32(textBox15.Text), "Error!"); } else if (Selection14 == "PX") { - textBox16.Text = Typography.INCHtoPX(textBox17.Text, Selection15, Selection16, Convert.ToInt32(textBox15.Text), "Error!"); + textBox16.Text = INCH.PX(textBox17.Text, Selection15, Selection16, Convert.ToInt32(textBox15.Text), "Error!"); } else { @@ -1067,11 +1067,11 @@ private void Button21_Click(object sender, EventArgs e) { if (Selection14 == "INCH") { - textBox16.Text = Typography.CMtoINCH(textBox17.Text, Selection15, Selection16, Convert.ToInt32(textBox15.Text), "Error!"); + textBox16.Text = CM.INCH(textBox17.Text, Selection15, Selection16, Convert.ToInt32(textBox15.Text), "Error!"); } else if (Selection14 == "PX") { - textBox16.Text = Typography.CMtoPX(textBox17.Text, Selection15, Selection16, Convert.ToInt32(textBox15.Text), "Error!"); + textBox16.Text = CM.PX(textBox17.Text, Selection15, Selection16, Convert.ToInt32(textBox15.Text), "Error!"); } else { @@ -1082,11 +1082,11 @@ private void Button21_Click(object sender, EventArgs e) { if (Selection14 == "INCH") { - textBox16.Text = Typography.PXtoINCH(textBox17.Text, Selection15, Selection16, Convert.ToInt32(textBox15.Text), "Error!"); + textBox16.Text = PX.INCH(textBox17.Text, Selection15, Selection16, Convert.ToInt32(textBox15.Text), "Error!"); } else if (Selection14 == "CM") { - textBox16.Text = Typography.PXtoCM(textBox17.Text, Selection15, Selection16, Convert.ToInt32(textBox15.Text), "Error!"); + textBox16.Text = PX.CM(textBox17.Text, Selection15, Selection16, Convert.ToInt32(textBox15.Text), "Error!"); } else { diff --git a/demo/Conforyon.UI/Conforyon.UI/Main.resx b/demo/Conforyon.UI/Conforyon.UI/Main.resx index af97580..225d094 100644 --- a/demo/Conforyon.UI/Conforyon.UI/Main.resx +++ b/demo/Conforyon.UI/Conforyon.UI/Main.resx @@ -187,7 +187,7 @@ 4 - 1.024 + 1,024 Center @@ -789,7 +789,7 @@ 22 - 33,8 F + 33.8 F Center @@ -2950,7 +2950,7 @@ 59 - 2,54 + 2.54 Center @@ -3798,7 +3798,7 @@ 79 - 86.400 + 86,400 Center diff --git a/demo/Conforyon.UI/Conforyon.UI/Program.cs b/demo/Conforyon.UI/Conforyon.UI/Program.cs index 0af1a65..6c2cb72 100644 --- a/demo/Conforyon.UI/Conforyon.UI/Program.cs +++ b/demo/Conforyon.UI/Conforyon.UI/Program.cs @@ -14,7 +14,7 @@ private static void Main() { Cultures.SetAllCulture(); Application.EnableVisualStyles(); -#if NETCOREAPP3_1 || NET5_0 || NET6_0 +#if NETCOREAPP3_1 || NET5_0 || NET6_0 || NET7_0 Application.SetHighDpiMode(HighDpiMode.SystemAware); #endif Application.SetCompatibleTextRenderingDefault(false); diff --git a/demo/Conforyon.UI/Conforyon.UI/Properties/AssemblyInfo.cs b/demo/Conforyon.UI/Conforyon.UI/Properties/AssemblyInfo.cs index dc58f88..489649d 100644 --- a/demo/Conforyon.UI/Conforyon.UI/Properties/AssemblyInfo.cs +++ b/demo/Conforyon.UI/Conforyon.UI/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ // denetlenir. Bütünleştirilmiş kod ile ilişkili bilgileri değiştirmek için // bu öznitelik değerlerini değiştirin. [assembly: AssemblyTitle("Conforyon UI")] -[assembly: AssemblyDescription("Conforyon UI v1.3.7.9")] +[assembly: AssemblyDescription("Conforyon UI v2.0.0.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Taiizor")] [assembly: AssemblyProduct("Conforyon UI")] -[assembly: AssemblyCopyright("Copyright © 2021 Taiizor")] +[assembly: AssemblyCopyright("Copyright © 2022 Taiizor")] [assembly: AssemblyTrademark("Conforyon")] [assembly: AssemblyCulture("")] @@ -31,5 +31,5 @@ // Tüm değerleri belirtebilir veya varsayılan Derleme ve Düzeltme Numaralarını kullanmak için // aşağıda gösterildiği gibi '*' kullanabilirsiniz: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.3.7.9")] -[assembly: AssemblyFileVersion("1.3.7.9")] \ No newline at end of file +[assembly: AssemblyVersion("2.0.0.1")] +[assembly: AssemblyFileVersion("2.0.0.9")] \ No newline at end of file diff --git a/demo/Conforyon.UX/Conforyon.UX/Conforyon.UX.csproj b/demo/Conforyon.UX/Conforyon.UX/Conforyon.UX.csproj index 37e9baf..5937b1a 100644 --- a/demo/Conforyon.UX/Conforyon.UX/Conforyon.UX.csproj +++ b/demo/Conforyon.UX/Conforyon.UX/Conforyon.UX.csproj @@ -1,12 +1,12 @@  - net452;net46;net461;net462;net47;net471;net472;net48;netcoreapp3.1;net5.0-windows;net6.0-windows + net48;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows WinExe false true preview preview - en + en-GB Conforyon.UX.Program @@ -15,8 +15,8 @@ Resources\ICO.ico - + diff --git a/demo/Conforyon.UX/Conforyon.UX/Program.cs b/demo/Conforyon.UX/Conforyon.UX/Program.cs index a48d039..6beb142 100644 --- a/demo/Conforyon.UX/Conforyon.UX/Program.cs +++ b/demo/Conforyon.UX/Conforyon.UX/Program.cs @@ -15,7 +15,7 @@ private static void Main() { Cultures.SetAllCulture(); Application.EnableVisualStyles(); -#if NETCOREAPP3_1 || NET5_0 || NET6_0 +#if NETCOREAPP3_1 || NET5_0 || NET6_0 || NET7_0 Application.SetHighDpiMode(HighDpiMode.SystemAware); #endif Application.SetCompatibleTextRenderingDefault(false); diff --git a/demo/Conforyon.UX/Conforyon.UX/Properties/AssemblyInfo.cs b/demo/Conforyon.UX/Conforyon.UX/Properties/AssemblyInfo.cs index e62be76..ad6df2f 100644 --- a/demo/Conforyon.UX/Conforyon.UX/Properties/AssemblyInfo.cs +++ b/demo/Conforyon.UX/Conforyon.UX/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ // denetlenir. Bütünleştirilmiş kod ile ilişkili bilgileri değiştirmek için // bu öznitelik değerlerini değiştirin. [assembly: AssemblyTitle("Conforyon UX")] -[assembly: AssemblyDescription("Conforyon UX v1.2.9.1")] +[assembly: AssemblyDescription("Conforyon UX v2.0.0.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Taiizor")] [assembly: AssemblyProduct("Conforyon UX")] -[assembly: AssemblyCopyright("Copyright © 2021 Taiizor")] +[assembly: AssemblyCopyright("Copyright © 2022 Taiizor")] [assembly: AssemblyTrademark("Conforyon")] [assembly: AssemblyCulture("")] @@ -31,5 +31,5 @@ // Tüm değerleri belirtebilir veya varsayılan Derleme ve Düzeltme Numaralarını kullanmak için // aşağıda gösterildiği gibi '*' kullanabilirsiniz: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.9.1")] -[assembly: AssemblyFileVersion("1.2.9.1")] \ No newline at end of file +[assembly: AssemblyVersion("2.0.0.1")] +[assembly: AssemblyFileVersion("2.0.0.1")] \ No newline at end of file diff --git a/demo/Conforyon.UX/Conforyon.UX/UC/CLIPBOARD.cs b/demo/Conforyon.UX/Conforyon.UX/UC/CLIPBOARD.cs index bd21b09..36283a8 100644 --- a/demo/Conforyon.UX/Conforyon.UX/UC/CLIPBOARD.cs +++ b/demo/Conforyon.UX/Conforyon.UX/UC/CLIPBOARD.cs @@ -23,9 +23,9 @@ private void CYB_Click(object sender, EventArgs e) { try { - if (ClipBoard.GetText() != CVTB.Text) + if (Board.Text.Paste() != CVTB.Text) { - ClipBoard.CopyText(CVTB.Text); + Board.Text.Copy(CVTB.Text); CVTB.Focus(); } } @@ -39,9 +39,9 @@ private void PEB_Click(object sender, EventArgs e) { try { - if (ClipBoard.GetText() != CRTB.Text) + if (Board.Text.Paste() != CRTB.Text) { - CRTB.Text = ClipBoard.GetText(); + CRTB.Text = Board.Text.Paste(); CRTB.Focus(); } } diff --git a/demo/Conforyon.UX/Conforyon.UX/UC/COLOR.cs b/demo/Conforyon.UX/Conforyon.UX/UC/COLOR.cs index d664140..c7d5aab 100644 --- a/demo/Conforyon.UX/Conforyon.UX/UC/COLOR.cs +++ b/demo/Conforyon.UX/Conforyon.UX/UC/COLOR.cs @@ -48,13 +48,13 @@ private void CTB_Click(object sender, EventArgs e) { if (TACB.SelectedItem.ToString() == "RGB") { - CHTB.Text = Colorful.RGBtoHEX(Convert.ToInt32(CRTB.Text), Convert.ToInt32(CGTB.Text), Convert.ToInt32(CBTB.Text)); + CHTB.Text = RGB.HEX(CRTB.Text, CGTB.Text, CBTB.Text); } else { - CRTB.Text = Colorful.HEXtoRGB(CHTB.Text, Enums.ColorType.OnlyR); - CGTB.Text = Colorful.HEXtoRGB(CHTB.Text, Enums.ColorType.OnlyG); - CBTB.Text = Colorful.HEXtoRGB(CHTB.Text, Enums.ColorType.OnlyB); + CRTB.Text = HEX.RGB(CHTB.Text, Enums.ColorType.OnlyR); + CGTB.Text = HEX.RGB(CHTB.Text, Enums.ColorType.OnlyG); + CBTB.Text = HEX.RGB(CHTB.Text, Enums.ColorType.OnlyB); } } catch @@ -69,17 +69,17 @@ private void CYB_Click(object sender, EventArgs e) { if (TACB.SelectedItem.ToString() == "RGB") { - if (ClipBoard.GetText() != CHTB.Text) + if (Board.Text.Paste() != CHTB.Text) { - ClipBoard.CopyText(CHTB.Text); + Board.Text.Copy(CHTB.Text); CHTB.Focus(); } } else { - if (ClipBoard.GetText() != CRTB.Text + ", " + CGTB.Text + ", " + CBTB.Text) + if (Board.Text.Paste() != CRTB.Text + ", " + CGTB.Text + ", " + CBTB.Text) { - ClipBoard.CopyText(CRTB.Text + ", " + CGTB.Text + ", " + CBTB.Text); + Board.Text.Copy(CRTB.Text + ", " + CGTB.Text + ", " + CBTB.Text); CGTB.Focus(); } } diff --git a/demo/Conforyon.UX/Conforyon.UX/UC/CRYPTO.Designer.cs b/demo/Conforyon.UX/Conforyon.UX/UC/CRYPTO.Designer.cs index 754bdcc..35d39f4 100644 --- a/demo/Conforyon.UX/Conforyon.UX/UC/CRYPTO.Designer.cs +++ b/demo/Conforyon.UX/Conforyon.UX/UC/CRYPTO.Designer.cs @@ -277,6 +277,7 @@ private void InitializeComponent() this.CRCB.Cursor = System.Windows.Forms.Cursors.Hand; this.CRCB.Depth = 0; this.CRCB.DrawShadows = false; + this.CRCB.Enabled = false; this.CRCB.HighEmphasis = true; this.CRCB.Icon = global::Conforyon.UX.Properties.Resources.Lowercase; this.CRCB.Location = new System.Drawing.Point(259, 108); diff --git a/demo/Conforyon.UX/Conforyon.UX/UC/CRYPTO.cs b/demo/Conforyon.UX/Conforyon.UX/UC/CRYPTO.cs index 3fad8c2..ce39163 100644 --- a/demo/Conforyon.UX/Conforyon.UX/UC/CRYPTO.cs +++ b/demo/Conforyon.UX/Conforyon.UX/UC/CRYPTO.cs @@ -57,33 +57,33 @@ private void CTB_Click(object sender, EventArgs e) if (TA == "BASE64") { - CRTB.Text = Cryptography.BASE64toTEXT(CVTB.Text); + CRTB.Text = BASE.TEXT(CVTB.Text); } else { if (TB == "BASE64") { - CRTB.Text = Cryptography.TEXTtoBASE64(CVTB.Text); + CRTB.Text = TEXT.BASE(CVTB.Text); } else if (TB == "MD5") { - CRTB.Text = Cryptography.TEXTtoMD5(CVTB.Text, CRC); + CRTB.Text = TEXT.MD5(CVTB.Text, CRC); } else if (TB == "SHA1") { - CRTB.Text = Cryptography.TEXTtoSHA1(CVTB.Text, CRC); + CRTB.Text = TEXT.SHA1(CVTB.Text, CRC); } else if (TB == "SHA256") { - CRTB.Text = Cryptography.TEXTtoSHA256(CVTB.Text, CRC); + CRTB.Text = TEXT.SHA256(CVTB.Text, CRC); } else if (TB == "SHA384") { - CRTB.Text = Cryptography.TEXTtoSHA384(CVTB.Text, CRC); + CRTB.Text = TEXT.SHA384(CVTB.Text, CRC); } else if (TB == "SHA512") { - CRTB.Text = Cryptography.TEXTtoSHA512(CVTB.Text, CRC); + CRTB.Text = TEXT.SHA512(CVTB.Text, CRC); } } } @@ -97,9 +97,9 @@ private void CYB_Click(object sender, EventArgs e) { try { - if (ClipBoard.GetText() != CRTB.Text) + if (Board.Text.Paste() != CRTB.Text) { - ClipBoard.CopyText(CRTB.Text); + Board.Text.Copy(CRTB.Text); CRTB.Focus(); } } diff --git a/demo/Conforyon.UX/Conforyon.UX/UC/HASH.cs b/demo/Conforyon.UX/Conforyon.UX/UC/HASH.cs index 055bf34..c15339e 100644 --- a/demo/Conforyon.UX/Conforyon.UX/UC/HASH.cs +++ b/demo/Conforyon.UX/Conforyon.UX/UC/HASH.cs @@ -30,23 +30,23 @@ private void CTB_Click(object sender, EventArgs e) { if (TBCB.SelectedItem.ToString() == "MD5") { - FRTB.Text = Hashing.FILEtoMD5(FLTB.Text, HRC); + FRTB.Text = FILE.MD5(FLTB.Text, HRC); } else if (TBCB.SelectedItem.ToString() == "SHA1") { - FRTB.Text = Hashing.FILEtoSHA1(FLTB.Text, HRC); + FRTB.Text = FILE.SHA1(FLTB.Text, HRC); } else if (TBCB.SelectedItem.ToString() == "SHA256") { - FRTB.Text = Hashing.FILEtoSHA256(FLTB.Text, HRC); + FRTB.Text = FILE.SHA256(FLTB.Text, HRC); } else if (TBCB.SelectedItem.ToString() == "SHA384") { - FRTB.Text = Hashing.FILEtoSHA384(FLTB.Text, HRC); + FRTB.Text = FILE.SHA384(FLTB.Text, HRC); } else if (TBCB.SelectedItem.ToString() == "SHA512") { - FRTB.Text = Hashing.FILEtoSHA512(FLTB.Text, HRC); + FRTB.Text = FILE.SHA512(FLTB.Text, HRC); } } catch @@ -103,9 +103,9 @@ private void CYB_Click(object sender, EventArgs e) { try { - if (ClipBoard.GetText() != FRTB.Text) + if (Board.Text.Paste() != FRTB.Text) { - ClipBoard.CopyText(FRTB.Text); + Board.Text.Copy(FRTB.Text); FRTB.Focus(); } } diff --git a/demo/Conforyon.UX/Conforyon.UX/UC/TYPOGRAPHY.cs b/demo/Conforyon.UX/Conforyon.UX/UC/TYPOGRAPHY.cs index da6a325..4b705e1 100644 --- a/demo/Conforyon.UX/Conforyon.UX/UC/TYPOGRAPHY.cs +++ b/demo/Conforyon.UX/Conforyon.UX/UC/TYPOGRAPHY.cs @@ -1,4 +1,5 @@ using Conforyon.Board; +using Conforyon.Enum; using Conforyon.Typology; using Conforyon.Value; using ReaLTaiizor.Controls; @@ -41,7 +42,7 @@ private void TTB_Click(object sender, EventArgs e) TBCB.SelectedItem = TA; CFTB.Hint = "Core Formula [" + TB + " - " + TA + "]"; - CFTB.Text = Values.GetValue("Typography", TB, TA); + CFTB.Text = Values.GetValue(Enums.MethodType.Typography, TB, TA); Refresh(); } @@ -64,33 +65,33 @@ private void CTB_Click(object sender, EventArgs e) { if (TB == "CM") { - TRTB.Text = Typography.INCHtoCM(TVTB.Text, DL, CA, PC); + TRTB.Text = INCH.CM(TVTB.Text, DL, CA, PC); } else if (TB == "PX") { - TRTB.Text = Typography.INCHtoPX(TVTB.Text, DL, CA, PC); + TRTB.Text = INCH.PX(TVTB.Text, DL, CA, PC); } } else if (TA == "CM") { if (TB == "INCH") { - TRTB.Text = Typography.CMtoINCH(TVTB.Text, DL, CA, PC); + TRTB.Text = CM.INCH(TVTB.Text, DL, CA, PC); } else if (TB == "PX") { - TRTB.Text = Typography.CMtoPX(TVTB.Text, DL, CA, PC); + TRTB.Text = CM.PX(TVTB.Text, DL, CA, PC); } } else if (TA == "PX") { if (TB == "INCH") { - TRTB.Text = Typography.PXtoINCH(TVTB.Text, DL, CA, PC); + TRTB.Text = PX.INCH(TVTB.Text, DL, CA, PC); } else if (TB == "CM") { - TRTB.Text = Typography.PXtoCM(TVTB.Text, DL, CA, PC); + TRTB.Text = PX.CM(TVTB.Text, DL, CA, PC); } } } @@ -104,9 +105,9 @@ private void CYB_Click(object sender, EventArgs e) { try { - if (ClipBoard.GetText() != TRTB.Text) + if (Board.Text.Paste() != TRTB.Text) { - ClipBoard.CopyText(TRTB.Text); + Board.Text.Copy(TRTB.Text); TRTB.Focus(); } } @@ -161,7 +162,7 @@ private void TCB_SelectedIndexChanged(object sender, EventArgs e) Refresh(); CFTB.Hint = "Core Formula [" + TACB.SelectedItem.ToString() + " - " + TBCB.SelectedItem.ToString() + "]"; - CFTB.Text = Values.GetValue("Typography", TACB.SelectedItem.ToString(), TBCB.SelectedItem.ToString()); + CFTB.Text = Values.GetValue(Enums.MethodType.Typography, TACB.SelectedItem.ToString(), TBCB.SelectedItem.ToString()); } catch { @@ -279,9 +280,9 @@ private void CFTB_TextChanged(object sender, EventArgs e) { try { - if (Values.GetValue("Typography", TACB.SelectedItem.ToString(), TBCB.SelectedItem.ToString()) != CFTB.Text.Replace(".", ",")) + if (Values.GetValue(Enums.MethodType.Typography, TACB.SelectedItem.ToString(), TBCB.SelectedItem.ToString()) != CFTB.Text.Replace(".", ",")) { - Values.SetValue("Typography", TACB.SelectedItem.ToString(), TBCB.SelectedItem.ToString(), CFTB.Text.Replace(".", ",")); + Values.SetValue(Enums.MethodType.Typography, TACB.SelectedItem.ToString(), TBCB.SelectedItem.ToString(), CFTB.Text.Replace(".", ",")); } } catch diff --git a/demo/Conforyon.UX/Conforyon.UX/UC/UNICODE.cs b/demo/Conforyon.UX/Conforyon.UX/UC/UNICODE.cs index 0b29e96..474b061 100644 --- a/demo/Conforyon.UX/Conforyon.UX/UC/UNICODE.cs +++ b/demo/Conforyon.UX/Conforyon.UX/UC/UNICODE.cs @@ -56,11 +56,11 @@ private void CTB_Click(object sender, EventArgs e) if (TACB.SelectedItem.ToString() == "CHAR") { - URTB.Text = Unicodes.CHARtoASCII(UVTB.Text, BT); + URTB.Text = CHAR.ASCII(UVTB.Text, BT); } else { - URTB.Text = Unicodes.ASCIItoCHAR(UVTB.Text, BT); + URTB.Text = ASCII.CHAR(UVTB.Text, BT); } } catch @@ -73,9 +73,9 @@ private void CYB_Click(object sender, EventArgs e) { try { - if (ClipBoard.GetText() != URTB.Text) + if (Board.Text.Paste() != URTB.Text) { - ClipBoard.CopyText(URTB.Text); + Board.Text.Copy(URTB.Text); URTB.Focus(); } } diff --git a/src/Conforyon/Conforyon.cs b/src/Conforyon/Conforyon.cs index 50d6ac8..7deef3f 100644 --- a/src/Conforyon/Conforyon.cs +++ b/src/Conforyon/Conforyon.cs @@ -300,91 +300,96 @@ public static string ResultFormat(string Result, bool Decimal, bool Comma, int P } else { - if (!Decimal && !Comma) + if (SearchResult(Result, CAA.SymbolsCalc, CEEST.Contains)) { - return RemoveResult(Result); + return Result; } - else if ((Decimal && !Comma) || (Decimal && Comma && PostComma <= 0)) + else { - Result = RemoveResult(Result); - - if (Result.Length > 3) + if (!Decimal && !Comma) { - return FormatResult(Result); + return RemoveResult(Result); } - else + else if ((Decimal && !Comma) || (Decimal && Comma && PostComma <= 0)) { - return Result; - } - } - else if (!Decimal && Comma && PostComma > 0) - { - string First = string.Empty; - string Second = string.Empty; + Result = RemoveResult(Result); - switch (CHD.Enum) + if (Result.Length > 3) + { + return FormatResult(Result); + } + else + { + return Result; + } + } + else if (!Decimal && Comma && PostComma > 0) { - case CEEDT.Dot or CEEDT.Comma: + string First = string.Empty; + string Second = string.Empty; + + if (Result.Contains(CHD.String)) + { First = SLE.First(Result.Split(CHD.Char)); Second = SLE.Last(Result.Split(CHD.Char)); - break; - default: + } + else + { First = Result; - break; - } + } - if (Second.Length < PostComma) - { - for (int Count = Second.Length; Count < PostComma; Count++) + if (Second.Length < PostComma) { - Second += "0"; + for (int Count = Second.Length; Count < PostComma; Count++) + { + Second += "0"; + } + } + else if (Second.Length > PostComma) + { + Second = Second.Substring(0, PostComma); } + + return $"{First}{CHD.Char}{Second}"; } - else if (Second.Length > PostComma) + else if (!Decimal && Comma && PostComma <= 0) { - Second = Second.Substring(0, PostComma); + return RemoveResult(Result); } - - return $"{First}{CHD.Char}{Second}"; - } - else if (!Decimal && Comma && PostComma <= 0) - { - return RemoveResult(Result); - } - else - { - string First = string.Empty; - string Second = string.Empty; - - switch (CHD.Enum) + else { - case CEEDT.Dot or CEEDT.Comma: + string First = string.Empty; + string Second = string.Empty; + + if (Result.Contains(CHD.String)) + { First = SLE.First(Result.Split(CHD.Char)); Second = SLE.Last(Result.Split(CHD.Char)); - break; - default: + } + else + { First = Result; - break; - } + } - if (First.Length > 3) - { - First = FormatResult(First); - } + if (First.Length > 3) + { + First = FormatResult(First); + } - if (Second.Length < PostComma) - { - for (int Count = Second.Length; Count < PostComma; Count++) + if (Second.Length < PostComma) + { + for (int Count = Second.Length; Count < PostComma; Count++) + { + Second += "0"; + } + } + else if (Second.Length > PostComma) { - Second += "0"; + Second = Second.Substring(0, PostComma); } - } - else if (Second.Length > PostComma) - { - Second = Second.Substring(0, PostComma); - } - return $"{First}{CHD.Char}{Second}"; + return $"{First}{CHD.Char}{Second}"; + } } } } diff --git a/src/Conforyon/Conforyon.csproj b/src/Conforyon/Conforyon.csproj index 0f6cfa9..704528b 100644 --- a/src/Conforyon/Conforyon.csproj +++ b/src/Conforyon/Conforyon.csproj @@ -16,8 +16,8 @@ .NET Insanely Fast Unit Converter - $(PackageId) LICENSE - false - Minor changes have been made. + False + The project has been completely revised. Changes are detailed at https://github.com/Taiizor/Conforyon/releases Conforyon Taiizor Soferity Vegalya C# CSharp VBC VB VisualBasic DotNET .NET NET Fast Convenient Unit Convert Converts Converter Converters Converting Convertion true diff --git a/src/Conforyon/Method/Speed/KPH.cs b/src/Conforyon/Method/Speed/KPH.cs index c6ae231..a35f85e 100644 --- a/src/Conforyon/Method/Speed/KPH.cs +++ b/src/Conforyon/Method/Speed/KPH.cs @@ -69,7 +69,7 @@ public static string MPH(string Kilometers, bool Decimal, bool Comma, int PostCo if (Text) { - Result = $"{Miles} MPH"; + Result = $"{Result} MPH"; } return Result; diff --git a/src/Conforyon/Method/Speed/MPH.cs b/src/Conforyon/Method/Speed/MPH.cs index c48c5fb..0321000 100644 --- a/src/Conforyon/Method/Speed/MPH.cs +++ b/src/Conforyon/Method/Speed/MPH.cs @@ -72,7 +72,7 @@ public static string KPH(string Miles, bool Decimal, bool Comma, int PostComma = if (Text) { - Result = $"{Kilometers} KPH"; + Result = $"{Result} KPH"; } return Result; diff --git a/src/Conforyon/Method/Storage/DataStorage.cs b/src/Conforyon/Method/Storage/DataStorage.cs index 8c25f1c..b5ecf2d 100644 --- a/src/Conforyon/Method/Storage/DataStorage.cs +++ b/src/Conforyon/Method/Storage/DataStorage.cs @@ -108,7 +108,7 @@ public static string AutoDataConvert(string InputVariable, CEEST InputType, bool } else { - return Result + " " + Type; + return $"{Result} {Type}"; } } else diff --git a/src/Conforyon/Method/Temperature/Celsius.cs b/src/Conforyon/Method/Temperature/Celsius.cs index dcddc7c..8dbd1f6 100644 --- a/src/Conforyon/Method/Temperature/Celsius.cs +++ b/src/Conforyon/Method/Temperature/Celsius.cs @@ -69,7 +69,7 @@ public static string Fahrenheit(string Celsius, bool Decimal, bool Comma, int Po if (Text) { - Result = $"{Fahrenheit} F"; + Result = $"{Result} F"; } return Result; diff --git a/src/Conforyon/Method/Temperature/Fahrenheit.cs b/src/Conforyon/Method/Temperature/Fahrenheit.cs index ae04463..d6e93de 100644 --- a/src/Conforyon/Method/Temperature/Fahrenheit.cs +++ b/src/Conforyon/Method/Temperature/Fahrenheit.cs @@ -69,7 +69,7 @@ public static string Celsius(string Fahrenheit, bool Decimal, bool Comma, int Po if (Text) { - Result = $"{Celsius} C"; + Result = $"{Result} C"; } return Result; diff --git a/src/Conforyon/Method/Time/Times.cs b/src/Conforyon/Method/Time/Times.cs index 236027d..dd34343 100644 --- a/src/Conforyon/Method/Time/Times.cs +++ b/src/Conforyon/Method/Time/Times.cs @@ -108,7 +108,7 @@ public static string AutoTimeConvert(string InputVariable, CEETT InputType, bool } else { - return Result + " " + Type; + return $"{Result} {Type}"; } } else @@ -118,7 +118,7 @@ public static string AutoTimeConvert(string InputVariable, CEETT InputType, bool } catch { - return Error + CCC.ErrorTitle + "TS-ATC1!)"; + return Error + CCC.ErrorTitle + "TE-ATC1!)"; } } @@ -1480,7 +1480,7 @@ public static string TimeConvert(string InputVariable, CEETT InputType, CEETT Ty } catch { - return Error + CCC.ErrorTitle + "TS-TC1!)"; + return Error + CCC.ErrorTitle + "TE-TC1!)"; } }