From e1d2edfe425567e1daddbacc387b1914455f2a59 Mon Sep 17 00:00:00 2001 From: Taiizor <41683699+Taiizor@users.noreply.github.com> Date: Fri, 16 Oct 2020 10:11:07 +0300 Subject: [PATCH] 53X Again 57! --- Nerator.sln | 14 +- Nerator/App.manifest | 74 ++++++ Nerator/{App.config => App.net48.config} | 4 +- Nerator/App.net5.0-windows.config | 3 + Nerator/{Resources => Assets}/ABC.png | Bin Nerator/{Resources => Assets}/ABCBrick.png | Bin .../{Resources => Assets}/ActivityHistory.png | Bin Nerator/{Resources => Assets}/Copy.png | Bin .../{Resources => Assets}/CopyClipboard.png | Bin Nerator/{Resources => Assets}/CopyLink.png | Bin Nerator/{Resources => Assets}/Delete.png | Bin Nerator/{Resources => Assets}/Encrypt.png | Bin .../{Resources => Assets}/GrandMasterKey.png | Bin Nerator/{Resources => Assets}/ICO.ico | Bin Nerator/{Resources => Assets}/KeepLocked.png | Bin Nerator/{Resources => Assets}/Keepass.png | Bin Nerator/{Resources => Assets}/Key.ico | Bin Nerator/{Resources => Assets}/Key.png | Bin Nerator/{Resources => Assets}/Lease.png | Bin Nerator/{Resources => Assets}/Lock.png | Bin .../{Resources => Assets}/OrderHistory.png | Bin Nerator/{Resources => Assets}/Password.ico | Bin Nerator/{Resources => Assets}/Password.png | Bin .../{Resources => Assets}/PasswordGreen.png | Bin .../{Resources => Assets}/PasteSpecial.png | Bin Nerator/{Resources => Assets}/QuillInk.png | Bin Nerator/{Resources => Assets}/SafeOk.png | Bin Nerator/{Resources => Assets}/Secure.png | Bin .../{Resources => Assets}/ShowPassword.png | Bin .../{Resources => Assets}/StoryTelling.png | Bin Nerator/{Resources => Assets}/Unlock.png | Bin Nerator/CS/Engine.cs | 3 + Nerator/FodyWeavers.xml | 31 +++ Nerator/FodyWeavers.xsd | 136 +++++++++++ Nerator/Nerator.cs | 5 +- Nerator/Nerator.csproj | 217 ++++++------------ Nerator/Properties/AssemblyInfo.cs | 35 --- Nerator/Properties/Resources.resx | 54 ++--- Nerator/Properties/Settings.Designer.cs | 30 --- Nerator/Properties/Settings.settings | 7 - Nerator/UC/DARK/HISTORY/PWD.Designer.cs | 173 +++++++------- Nerator/UC/DARK/HISTORY/PWD.resx | 3 - Nerator/packages.config | 6 - 43 files changed, 440 insertions(+), 355 deletions(-) create mode 100644 Nerator/App.manifest rename Nerator/{App.config => App.net48.config} (68%) create mode 100644 Nerator/App.net5.0-windows.config rename Nerator/{Resources => Assets}/ABC.png (100%) rename Nerator/{Resources => Assets}/ABCBrick.png (100%) rename Nerator/{Resources => Assets}/ActivityHistory.png (100%) rename Nerator/{Resources => Assets}/Copy.png (100%) rename Nerator/{Resources => Assets}/CopyClipboard.png (100%) rename Nerator/{Resources => Assets}/CopyLink.png (100%) rename Nerator/{Resources => Assets}/Delete.png (100%) rename Nerator/{Resources => Assets}/Encrypt.png (100%) rename Nerator/{Resources => Assets}/GrandMasterKey.png (100%) rename Nerator/{Resources => Assets}/ICO.ico (100%) rename Nerator/{Resources => Assets}/KeepLocked.png (100%) rename Nerator/{Resources => Assets}/Keepass.png (100%) rename Nerator/{Resources => Assets}/Key.ico (100%) rename Nerator/{Resources => Assets}/Key.png (100%) rename Nerator/{Resources => Assets}/Lease.png (100%) rename Nerator/{Resources => Assets}/Lock.png (100%) rename Nerator/{Resources => Assets}/OrderHistory.png (100%) rename Nerator/{Resources => Assets}/Password.ico (100%) rename Nerator/{Resources => Assets}/Password.png (100%) rename Nerator/{Resources => Assets}/PasswordGreen.png (100%) rename Nerator/{Resources => Assets}/PasteSpecial.png (100%) rename Nerator/{Resources => Assets}/QuillInk.png (100%) rename Nerator/{Resources => Assets}/SafeOk.png (100%) rename Nerator/{Resources => Assets}/Secure.png (100%) rename Nerator/{Resources => Assets}/ShowPassword.png (100%) rename Nerator/{Resources => Assets}/StoryTelling.png (100%) rename Nerator/{Resources => Assets}/Unlock.png (100%) create mode 100644 Nerator/FodyWeavers.xml create mode 100644 Nerator/FodyWeavers.xsd delete mode 100644 Nerator/Properties/AssemblyInfo.cs delete mode 100644 Nerator/Properties/Settings.Designer.cs delete mode 100644 Nerator/Properties/Settings.settings delete mode 100644 Nerator/packages.config diff --git a/Nerator.sln b/Nerator.sln index af848db..8698f4c 100644 --- a/Nerator.sln +++ b/Nerator.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 -VisualStudioVersion = 16.0.30011.22 +VisualStudioVersion = 16.0.30608.117 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nerator", "Nerator\Nerator.csproj", "{4BB2AA8F-07E0-412C-B27B-6E031C4683B8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nerator", "Nerator\Nerator.csproj", "{FDA93B21-0154-4E04-87FC-DB09CEC2CC59}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,15 +11,15 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4BB2AA8F-07E0-412C-B27B-6E031C4683B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4BB2AA8F-07E0-412C-B27B-6E031C4683B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4BB2AA8F-07E0-412C-B27B-6E031C4683B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4BB2AA8F-07E0-412C-B27B-6E031C4683B8}.Release|Any CPU.Build.0 = Release|Any CPU + {FDA93B21-0154-4E04-87FC-DB09CEC2CC59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FDA93B21-0154-4E04-87FC-DB09CEC2CC59}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FDA93B21-0154-4E04-87FC-DB09CEC2CC59}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FDA93B21-0154-4E04-87FC-DB09CEC2CC59}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {4E468D4D-2EA9-4451-B616-A3B513755B04} + SolutionGuid = {7FEE299A-A950-4CE9-9CD2-63BF1CB97F72} EndGlobalSection EndGlobal diff --git a/Nerator/App.manifest b/Nerator/App.manifest new file mode 100644 index 0000000..a4555e5 --- /dev/null +++ b/Nerator/App.manifest @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Nerator/App.config b/Nerator/App.net48.config similarity index 68% rename from Nerator/App.config rename to Nerator/App.net48.config index 193aecc..49a0021 100644 --- a/Nerator/App.config +++ b/Nerator/App.net48.config @@ -1,6 +1,6 @@ - + - + \ No newline at end of file diff --git a/Nerator/App.net5.0-windows.config b/Nerator/App.net5.0-windows.config new file mode 100644 index 0000000..99ddf3e --- /dev/null +++ b/Nerator/App.net5.0-windows.config @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/Nerator/Resources/ABC.png b/Nerator/Assets/ABC.png similarity index 100% rename from Nerator/Resources/ABC.png rename to Nerator/Assets/ABC.png diff --git a/Nerator/Resources/ABCBrick.png b/Nerator/Assets/ABCBrick.png similarity index 100% rename from Nerator/Resources/ABCBrick.png rename to Nerator/Assets/ABCBrick.png diff --git a/Nerator/Resources/ActivityHistory.png b/Nerator/Assets/ActivityHistory.png similarity index 100% rename from Nerator/Resources/ActivityHistory.png rename to Nerator/Assets/ActivityHistory.png diff --git a/Nerator/Resources/Copy.png b/Nerator/Assets/Copy.png similarity index 100% rename from Nerator/Resources/Copy.png rename to Nerator/Assets/Copy.png diff --git a/Nerator/Resources/CopyClipboard.png b/Nerator/Assets/CopyClipboard.png similarity index 100% rename from Nerator/Resources/CopyClipboard.png rename to Nerator/Assets/CopyClipboard.png diff --git a/Nerator/Resources/CopyLink.png b/Nerator/Assets/CopyLink.png similarity index 100% rename from Nerator/Resources/CopyLink.png rename to Nerator/Assets/CopyLink.png diff --git a/Nerator/Resources/Delete.png b/Nerator/Assets/Delete.png similarity index 100% rename from Nerator/Resources/Delete.png rename to Nerator/Assets/Delete.png diff --git a/Nerator/Resources/Encrypt.png b/Nerator/Assets/Encrypt.png similarity index 100% rename from Nerator/Resources/Encrypt.png rename to Nerator/Assets/Encrypt.png diff --git a/Nerator/Resources/GrandMasterKey.png b/Nerator/Assets/GrandMasterKey.png similarity index 100% rename from Nerator/Resources/GrandMasterKey.png rename to Nerator/Assets/GrandMasterKey.png diff --git a/Nerator/Resources/ICO.ico b/Nerator/Assets/ICO.ico similarity index 100% rename from Nerator/Resources/ICO.ico rename to Nerator/Assets/ICO.ico diff --git a/Nerator/Resources/KeepLocked.png b/Nerator/Assets/KeepLocked.png similarity index 100% rename from Nerator/Resources/KeepLocked.png rename to Nerator/Assets/KeepLocked.png diff --git a/Nerator/Resources/Keepass.png b/Nerator/Assets/Keepass.png similarity index 100% rename from Nerator/Resources/Keepass.png rename to Nerator/Assets/Keepass.png diff --git a/Nerator/Resources/Key.ico b/Nerator/Assets/Key.ico similarity index 100% rename from Nerator/Resources/Key.ico rename to Nerator/Assets/Key.ico diff --git a/Nerator/Resources/Key.png b/Nerator/Assets/Key.png similarity index 100% rename from Nerator/Resources/Key.png rename to Nerator/Assets/Key.png diff --git a/Nerator/Resources/Lease.png b/Nerator/Assets/Lease.png similarity index 100% rename from Nerator/Resources/Lease.png rename to Nerator/Assets/Lease.png diff --git a/Nerator/Resources/Lock.png b/Nerator/Assets/Lock.png similarity index 100% rename from Nerator/Resources/Lock.png rename to Nerator/Assets/Lock.png diff --git a/Nerator/Resources/OrderHistory.png b/Nerator/Assets/OrderHistory.png similarity index 100% rename from Nerator/Resources/OrderHistory.png rename to Nerator/Assets/OrderHistory.png diff --git a/Nerator/Resources/Password.ico b/Nerator/Assets/Password.ico similarity index 100% rename from Nerator/Resources/Password.ico rename to Nerator/Assets/Password.ico diff --git a/Nerator/Resources/Password.png b/Nerator/Assets/Password.png similarity index 100% rename from Nerator/Resources/Password.png rename to Nerator/Assets/Password.png diff --git a/Nerator/Resources/PasswordGreen.png b/Nerator/Assets/PasswordGreen.png similarity index 100% rename from Nerator/Resources/PasswordGreen.png rename to Nerator/Assets/PasswordGreen.png diff --git a/Nerator/Resources/PasteSpecial.png b/Nerator/Assets/PasteSpecial.png similarity index 100% rename from Nerator/Resources/PasteSpecial.png rename to Nerator/Assets/PasteSpecial.png diff --git a/Nerator/Resources/QuillInk.png b/Nerator/Assets/QuillInk.png similarity index 100% rename from Nerator/Resources/QuillInk.png rename to Nerator/Assets/QuillInk.png diff --git a/Nerator/Resources/SafeOk.png b/Nerator/Assets/SafeOk.png similarity index 100% rename from Nerator/Resources/SafeOk.png rename to Nerator/Assets/SafeOk.png diff --git a/Nerator/Resources/Secure.png b/Nerator/Assets/Secure.png similarity index 100% rename from Nerator/Resources/Secure.png rename to Nerator/Assets/Secure.png diff --git a/Nerator/Resources/ShowPassword.png b/Nerator/Assets/ShowPassword.png similarity index 100% rename from Nerator/Resources/ShowPassword.png rename to Nerator/Assets/ShowPassword.png diff --git a/Nerator/Resources/StoryTelling.png b/Nerator/Assets/StoryTelling.png similarity index 100% rename from Nerator/Resources/StoryTelling.png rename to Nerator/Assets/StoryTelling.png diff --git a/Nerator/Resources/Unlock.png b/Nerator/Assets/Unlock.png similarity index 100% rename from Nerator/Resources/Unlock.png rename to Nerator/Assets/Unlock.png diff --git a/Nerator/CS/Engine.cs b/Nerator/CS/Engine.cs index c1b1534..434c6ae 100644 --- a/Nerator/CS/Engine.cs +++ b/Nerator/CS/Engine.cs @@ -15,6 +15,9 @@ public Engine() try { Application.EnableVisualStyles(); + #if NET5_0 + Application.SetHighDpiMode(HighDpiMode.SystemAware); + #endif Application.SetCompatibleTextRenderingDefault(false); if (MTX.WaitOne(TimeSpan.Zero, true)) { diff --git a/Nerator/FodyWeavers.xml b/Nerator/FodyWeavers.xml new file mode 100644 index 0000000..17ba277 --- /dev/null +++ b/Nerator/FodyWeavers.xml @@ -0,0 +1,31 @@ + + + + + + + + + Conforyon + ReaLTaiizor + Newtonsoft.Json + System.Diagnostics.DiagnosticSource + + + \ No newline at end of file diff --git a/Nerator/FodyWeavers.xsd b/Nerator/FodyWeavers.xsd new file mode 100644 index 0000000..e82ada3 --- /dev/null +++ b/Nerator/FodyWeavers.xsd @@ -0,0 +1,136 @@ + + + + + + + + + + + + A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks + + + + + A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. + + + + + A list of (.NET Core) runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks + + + + + A list of (.NET Core) runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. + + + + + A list of unmanaged 32 bit assembly names to include, delimited with line breaks. + + + + + A list of unmanaged 64 bit assembly names to include, delimited with line breaks. + + + + + The order of preloaded assemblies, delimited with line breaks. + + + + + + This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file. + + + + + Controls if .pdbs for reference assemblies are also embedded. + + + + + Controls if (.NET Core) runtime assemblies are also embedded. + + + + + Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option. + + + + + As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off. + + + + + Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code. + + + + + Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior. + + + + + A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with | + + + + + A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |. + + + + + A list of (.NET Core) runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with | + + + + + A list of (.NET Core) runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |. + + + + + A list of unmanaged 32 bit assembly names to include, delimited with |. + + + + + A list of unmanaged 64 bit assembly names to include, delimited with |. + + + + + The order of preloaded assemblies, delimited with |. + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/Nerator/Nerator.cs b/Nerator/Nerator.cs index 35a87e2..73affec 100644 --- a/Nerator/Nerator.cs +++ b/Nerator/Nerator.cs @@ -6,6 +6,9 @@ internal static class Nerator /// Uygulamanın ana girdi noktası. /// [System.STAThread] - private static void Main() => new CS.Engine(); + private static void Main() + { + _ = new CS.Engine(); + } } } \ No newline at end of file diff --git a/Nerator/Nerator.csproj b/Nerator/Nerator.csproj index d7cf02b..917e590 100644 --- a/Nerator/Nerator.csproj +++ b/Nerator/Nerator.csproj @@ -1,170 +1,87 @@ - - - + + - Debug - AnyCPU - {4BB2AA8F-07E0-412C-B27B-6E031C4683B8} WinExe - Nerator + + net48;net5.0-windows + Assets\ICO.ico + Nerator.Nerator + App.manifest + Soferity LLC + $(AssemblyName) - New Generation Password Generator + $(Title) + $(Title) + $(Title) + $(Version) + $(Version) + $(Version) + $([System.DateTime]::Today.ToString(yy)).$([System.DateTime]::Today.ToString(MM)).$([System.DateTime]::Today.ToString(dd)).$([System.DateTime]::Now.ToString(HH))$([System.DateTime]::Now.ToString(mm)) Nerator - v4.8 - 512 - true - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + $(AssemblyName) + latest + latest + Copyright © $([System.DateTime]::Today.ToString(yyyy)) $(Company) + Debug;Release + false + false + true + false + App.manifest + - Nerator.Nerator + true + true + true + 1 + 100 + + true + false - - Resources\ICO.ico + + + true - - - ..\packages\Conforyon.1.4.7.4\lib\net48\Conforyon.dll - - - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - - ..\packages\ReaLTaiizor.3.7.8.1\lib\net48\ReaLTaiizor.dll - - - - - + + + + - - - - - - - - - - UserControl - - - PWD.cs - - - Form - - - EX.cs - - - - - Form - - - LIGHT.cs - - - Form - - - DARK.cs - - - PWD.cs - - - EX.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - LIGHT.cs - - - DARK.cs - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - - - - + + $(AssemblyName).exe.config + + - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive; compile + + - + + True + True + Resources.resx + + - - - - - - - - - - - - - - - - - - - - - - - + + ResXFileCodeGenerator + Resources.Designer.cs + + - + - + \ No newline at end of file diff --git a/Nerator/Properties/AssemblyInfo.cs b/Nerator/Properties/AssemblyInfo.cs deleted file mode 100644 index e54ca3a..0000000 --- a/Nerator/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// Bir bütünleştirilmiş koda ilişkin Genel Bilgiler aşağıdaki öznitelikler kümesiyle -// denetlenir. Bütünleştirilmiş kod ile ilişkili bilgileri değiştirmek için -// bu öznitelik değerlerini değiştirin. -[assembly: AssemblyTitle("Soferity - Nerator v2.5.3.7")] -[assembly: AssemblyDescription("Soferity - Nerator v2.5.3.7")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Soferity LLC")] -[assembly: AssemblyProduct("Soferity - Nerator")] -[assembly: AssemblyCopyright("Copyright © 2020 Soferity LLC")] -[assembly: AssemblyTrademark("Soferity LLC")] -[assembly: AssemblyCulture("")] - -// ComVisible özniteliğinin false olarak ayarlanması bu bütünleştirilmiş koddaki türleri -// COM bileşenleri için görünmez yapar. Bu bütünleştirilmiş koddaki bir türe -// erişmeniz gerekirse ComVisible özniteliğini o türde true olarak ayarlayın. -[assembly: ComVisible(false)] - -// Bu proje COM'un kullanımına sunulursa, aşağıdaki GUID tür kitaplığının kimliği içindir -[assembly: Guid("4bb2aa8f-07e0-412c-b27b-6e031c4683b8")] - -// Bir derlemenin sürüm bilgileri aşağıdaki dört değerden oluşur: -// -// Ana Sürüm -// İkincil Sürüm -// Yapı Numarası -// Düzeltme -// -// 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("2.5.3.7")] -[assembly: AssemblyFileVersion("2.5.3.7")] \ No newline at end of file diff --git a/Nerator/Properties/Resources.resx b/Nerator/Properties/Resources.resx index 1d14223..2ea0531 100644 --- a/Nerator/Properties/Resources.resx +++ b/Nerator/Properties/Resources.resx @@ -119,84 +119,84 @@ - ..\Resources\ABC.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\ABC.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\ABCBrick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\ABCBrick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\ActivityHistory.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\ActivityHistory.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\Copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\CopyClipboard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\CopyClipboard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\CopyLink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\CopyLink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\Delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Encrypt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\Encrypt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\GrandMasterKey.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\GrandMasterKey.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\ICO.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\ICO.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Keepass.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\Keepass.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\KeepLocked.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\KeepLocked.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Key.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\Key.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\Key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Lease.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\Lease.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Lock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\Lock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\OrderHistory.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\OrderHistory.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Password.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\Password.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Password.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\Password.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\PasswordGreen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\PasswordGreen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\PasteSpecial.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\PasteSpecial.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\QuillInk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\QuillInk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\SafeOk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\SafeOk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Secure.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\Secure.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\ShowPassword.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\ShowPassword.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\StoryTelling.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\StoryTelling.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Unlock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Assets\Unlock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Nerator/Properties/Settings.Designer.cs b/Nerator/Properties/Settings.Designer.cs deleted file mode 100644 index a27f6f9..0000000 --- a/Nerator/Properties/Settings.Designer.cs +++ /dev/null @@ -1,30 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Nerator.Properties -{ - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { - return defaultInstance; - } - } - } -} \ No newline at end of file diff --git a/Nerator/Properties/Settings.settings b/Nerator/Properties/Settings.settings deleted file mode 100644 index 3964565..0000000 --- a/Nerator/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Nerator/UC/DARK/HISTORY/PWD.Designer.cs b/Nerator/UC/DARK/HISTORY/PWD.Designer.cs index 89cddbc..1c43c04 100644 --- a/Nerator/UC/DARK/HISTORY/PWD.Designer.cs +++ b/Nerator/UC/DARK/HISTORY/PWD.Designer.cs @@ -29,109 +29,108 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - PASSWORD = new ReaLTaiizor.Controls.MetroLabel(); - COPY = new ReaLTaiizor.Controls.MaterialButton(); - REMOVE = new ReaLTaiizor.Controls.MaterialButton(); - TIMEDATE = new ReaLTaiizor.Controls.MetroLabel(); - SuspendLayout(); + this.PASSWORD = new ReaLTaiizor.Controls.MetroLabel(); + this.COPY = new ReaLTaiizor.Controls.MaterialButton(); + this.REMOVE = new ReaLTaiizor.Controls.MaterialButton(); + this.TIMEDATE = new ReaLTaiizor.Controls.MetroLabel(); + this.SuspendLayout(); // // PASSWORD // - PASSWORD.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.PASSWORD.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - PASSWORD.AutoEllipsis = true; - PASSWORD.Cursor = System.Windows.Forms.Cursors.Default; - PASSWORD.Font = new System.Drawing.Font("Segoe UI", 11F); - PASSWORD.IsDerivedStyle = true; - PASSWORD.Location = new System.Drawing.Point(80, 0); - PASSWORD.Margin = new System.Windows.Forms.Padding(1, 0, 1, 0); - PASSWORD.Name = "PASSWORD"; - PASSWORD.Size = new System.Drawing.Size(142, 36); - PASSWORD.Style = ReaLTaiizor.Enum.Metro.Style.Light; - PASSWORD.StyleManager = null; - PASSWORD.TabIndex = 0; - PASSWORD.Text = "PASSWORD PASSWORD PASSWORD PASSWORD"; - PASSWORD.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - PASSWORD.ThemeAuthor = "Taiizor"; - PASSWORD.ThemeName = "MetroLight"; - PASSWORD.UseCompatibleTextRendering = true; + this.PASSWORD.AutoEllipsis = true; + this.PASSWORD.Cursor = System.Windows.Forms.Cursors.Default; + this.PASSWORD.Font = new System.Drawing.Font("Segoe UI", 11F); + this.PASSWORD.IsDerivedStyle = true; + this.PASSWORD.Location = new System.Drawing.Point(80, -1); + this.PASSWORD.Margin = new System.Windows.Forms.Padding(1, 0, 1, 0); + this.PASSWORD.Name = "PASSWORD"; + this.PASSWORD.Size = new System.Drawing.Size(142, 36); + this.PASSWORD.Style = ReaLTaiizor.Enum.Metro.Style.Light; + this.PASSWORD.StyleManager = null; + this.PASSWORD.TabIndex = 0; + this.PASSWORD.Text = "PASSWORD PASSWORD PASSWORD PASSWORD"; + this.PASSWORD.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.PASSWORD.ThemeAuthor = "Taiizor"; + this.PASSWORD.ThemeName = "MetroLight"; + this.PASSWORD.UseCompatibleTextRendering = true; // // COPY // - COPY.AutoSize = false; - COPY.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - COPY.Cursor = System.Windows.Forms.Cursors.Hand; - COPY.Depth = 0; - COPY.Dock = System.Windows.Forms.DockStyle.Right; - COPY.DrawShadows = false; - COPY.HighEmphasis = true; - COPY.Icon = global::Nerator.Properties.Resources.Copy; - COPY.Location = new System.Drawing.Point(224, 1); - COPY.Margin = new System.Windows.Forms.Padding(1, 0, 1, 0); - COPY.MouseState = ReaLTaiizor.Helper.MaterialDrawHelper.MaterialMouseState.HOVER; - COPY.Name = "COPY"; - COPY.Size = new System.Drawing.Size(44, 34); - COPY.TabIndex = 2; - COPY.Type = ReaLTaiizor.Controls.MaterialButton.MaterialButtonType.Text; - COPY.UseAccentColor = false; - COPY.UseVisualStyleBackColor = true; - COPY.Click += new System.EventHandler(COPY_Click); + this.COPY.AutoSize = false; + this.COPY.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.COPY.Cursor = System.Windows.Forms.Cursors.Hand; + this.COPY.Depth = 0; + this.COPY.Dock = System.Windows.Forms.DockStyle.Right; + this.COPY.DrawShadows = false; + this.COPY.HighEmphasis = true; + this.COPY.Icon = global::Nerator.Properties.Resources.Copy; + this.COPY.Location = new System.Drawing.Point(224, 0); + this.COPY.Margin = new System.Windows.Forms.Padding(1, 0, 1, 0); + this.COPY.MouseState = ReaLTaiizor.Helper.MaterialDrawHelper.MaterialMouseState.HOVER; + this.COPY.Name = "COPY"; + this.COPY.Size = new System.Drawing.Size(44, 36); + this.COPY.TabIndex = 2; + this.COPY.Type = ReaLTaiizor.Controls.MaterialButton.MaterialButtonType.Text; + this.COPY.UseAccentColor = false; + this.COPY.UseVisualStyleBackColor = true; + this.COPY.Click += new System.EventHandler(this.COPY_Click); // // REMOVE // - REMOVE.AutoSize = false; - REMOVE.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - REMOVE.Cursor = System.Windows.Forms.Cursors.Hand; - REMOVE.Depth = 0; - REMOVE.Dock = System.Windows.Forms.DockStyle.Right; - REMOVE.DrawShadows = false; - REMOVE.HighEmphasis = true; - REMOVE.Icon = global::Nerator.Properties.Resources.Delete; - REMOVE.Location = new System.Drawing.Point(268, 1); - REMOVE.Margin = new System.Windows.Forms.Padding(1, 0, 0, 0); - REMOVE.MouseState = ReaLTaiizor.Helper.MaterialDrawHelper.MaterialMouseState.HOVER; - REMOVE.Name = "REMOVE"; - REMOVE.Size = new System.Drawing.Size(44, 34); - REMOVE.TabIndex = 3; - REMOVE.Type = ReaLTaiizor.Controls.MaterialButton.MaterialButtonType.Text; - REMOVE.UseAccentColor = true; - REMOVE.UseVisualStyleBackColor = true; - REMOVE.Click += new System.EventHandler(REMOVE_Click); + this.REMOVE.AutoSize = false; + this.REMOVE.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.REMOVE.Cursor = System.Windows.Forms.Cursors.Hand; + this.REMOVE.Depth = 0; + this.REMOVE.Dock = System.Windows.Forms.DockStyle.Right; + this.REMOVE.DrawShadows = false; + this.REMOVE.HighEmphasis = true; + this.REMOVE.Icon = global::Nerator.Properties.Resources.Delete; + this.REMOVE.Location = new System.Drawing.Point(268, 0); + this.REMOVE.Margin = new System.Windows.Forms.Padding(1, 0, 0, 0); + this.REMOVE.MouseState = ReaLTaiizor.Helper.MaterialDrawHelper.MaterialMouseState.HOVER; + this.REMOVE.Name = "REMOVE"; + this.REMOVE.Size = new System.Drawing.Size(44, 36); + this.REMOVE.TabIndex = 3; + this.REMOVE.Type = ReaLTaiizor.Controls.MaterialButton.MaterialButtonType.Text; + this.REMOVE.UseAccentColor = true; + this.REMOVE.UseVisualStyleBackColor = true; + this.REMOVE.Click += new System.EventHandler(this.REMOVE_Click); // // TIMEDATE // - TIMEDATE.Cursor = System.Windows.Forms.Cursors.Default; - TIMEDATE.Dock = System.Windows.Forms.DockStyle.Left; - TIMEDATE.Font = new System.Drawing.Font("Segoe UI", 9.5F); - TIMEDATE.IsDerivedStyle = true; - TIMEDATE.Location = new System.Drawing.Point(0, 1); - TIMEDATE.Margin = new System.Windows.Forms.Padding(0, 0, 1, 0); - TIMEDATE.Name = "TIMEDATE"; - TIMEDATE.Size = new System.Drawing.Size(78, 34); - TIMEDATE.Style = ReaLTaiizor.Enum.Metro.Style.Light; - TIMEDATE.StyleManager = null; - TIMEDATE.TabIndex = 4; - TIMEDATE.Text = "00:00:00\r\n00.00.0000"; - TIMEDATE.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - TIMEDATE.ThemeAuthor = "Taiizor"; - TIMEDATE.ThemeName = "MetroLight"; + this.TIMEDATE.Cursor = System.Windows.Forms.Cursors.Default; + this.TIMEDATE.Dock = System.Windows.Forms.DockStyle.Left; + this.TIMEDATE.Font = new System.Drawing.Font("Segoe UI", 9.5F); + this.TIMEDATE.IsDerivedStyle = true; + this.TIMEDATE.Location = new System.Drawing.Point(0, 0); + this.TIMEDATE.Margin = new System.Windows.Forms.Padding(0, 0, 1, 0); + this.TIMEDATE.Name = "TIMEDATE"; + this.TIMEDATE.Size = new System.Drawing.Size(78, 36); + this.TIMEDATE.Style = ReaLTaiizor.Enum.Metro.Style.Light; + this.TIMEDATE.StyleManager = null; + this.TIMEDATE.TabIndex = 4; + this.TIMEDATE.Text = "00:00:00\r\n00.00.0000"; + this.TIMEDATE.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.TIMEDATE.ThemeAuthor = "Taiizor"; + this.TIMEDATE.ThemeName = "MetroLight"; // // PWD // - AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); - AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(222)))), ((int)(((byte)(222))))); - Controls.Add(TIMEDATE); - Controls.Add(COPY); - Controls.Add(PASSWORD); - Controls.Add(REMOVE); - Margin = new System.Windows.Forms.Padding(0); - MaximumSize = new System.Drawing.Size(329, 36); - MinimumSize = new System.Drawing.Size(312, 36); - Name = "PWD"; - Padding = new System.Windows.Forms.Padding(0, 1, 0, 1); - Size = new System.Drawing.Size(312, 36); - ResumeLayout(false); + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(222)))), ((int)(((byte)(222))))); + this.Controls.Add(this.TIMEDATE); + this.Controls.Add(this.COPY); + this.Controls.Add(this.PASSWORD); + this.Controls.Add(this.REMOVE); + this.Margin = new System.Windows.Forms.Padding(0); + this.MaximumSize = new System.Drawing.Size(329, 36); + this.MinimumSize = new System.Drawing.Size(312, 36); + this.Name = "PWD"; + this.Size = new System.Drawing.Size(312, 36); + this.ResumeLayout(false); } diff --git a/Nerator/UC/DARK/HISTORY/PWD.resx b/Nerator/UC/DARK/HISTORY/PWD.resx index 7a65d0f..e0dcb42 100644 --- a/Nerator/UC/DARK/HISTORY/PWD.resx +++ b/Nerator/UC/DARK/HISTORY/PWD.resx @@ -129,7 +129,4 @@ True - - True - \ No newline at end of file diff --git a/Nerator/packages.config b/Nerator/packages.config deleted file mode 100644 index 886a628..0000000 --- a/Nerator/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file