diff --git a/RCM/MainForm.Designer.cs b/RCM/MainForm.Designer.cs index 3df8b5a..7b8c987 100644 --- a/RCM/MainForm.Designer.cs +++ b/RCM/MainForm.Designer.cs @@ -107,6 +107,7 @@ // // buttonConfig // + this.buttonConfig.ContextMenuStrip = this.contextMenuNotifyIcon; this.buttonConfig.Image = global::RCM.Properties.Resources.ConfigIcon; this.buttonConfig.Location = new System.Drawing.Point(3, 1); this.buttonConfig.Name = "buttonConfig"; diff --git a/RCM/MainForm.resx b/RCM/MainForm.resx index 5ffbb11..d580beb 100644 --- a/RCM/MainForm.resx +++ b/RCM/MainForm.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 416, 17 + 17, 17 @@ -126,9 +129,6 @@ 310, 17 - - 416, 17 - diff --git a/RCM/Properties/Resources.Designer.cs b/RCM/Properties/Resources.Designer.cs index 5f103f9..438a225 100644 --- a/RCM/Properties/Resources.Designer.cs +++ b/RCM/Properties/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Tento kód byl generován nástrojem. +// Verze modulu runtime:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Změny tohoto souboru mohou způsobit nesprávné chování a budou ztraceny, +// dojde-li k novému generování kódu. // //------------------------------------------------------------------------------ @@ -13,13 +13,13 @@ namespace RCM.Properties { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// Třída prostředků se silnými typy pro vyhledávání lokalizovaných řetězců atp. /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + // Tato třída byla automaticky generována třídou StronglyTypedResourceBuilder + // pomocí nástroje podobného aplikaci ResGen nebo Visual Studio. + // Chcete-li přidat nebo odebrat člena, upravte souboru .ResX a pak znovu spusťte aplikaci ResGen + // s parametrem /str nebo znovu sestavte projekt aplikace Visual Studio. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -33,7 +33,7 @@ namespace RCM.Properties { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Vrací instanci ResourceManager uloženou v mezipaměti použitou touto třídou. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ namespace RCM.Properties { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Potlačí vlastnost CurrentUICulture aktuálního vlákna pro všechna + /// vyhledání prostředků pomocí třídy prostředků se silnými typy. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,7 @@ namespace RCM.Properties { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Vyhledává lokalizovaný prostředek typu System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ConfigIcon { get { diff --git a/RCM/RCM.csproj b/RCM/RCM.csproj index 63f00db..0dfaf77 100644 --- a/RCM/RCM.csproj +++ b/RCM/RCM.csproj @@ -8,12 +8,13 @@ WinExe RCM RCM - v4.6.1 + v4.8 512 true true + AnyCPU @@ -58,26 +59,49 @@ Program.ico - - ..\packages\Google.Protobuf.3.10.1\lib\net45\Google.Protobuf.dll + + ..\packages\Google.Protobuf.3.28.3\lib\net45\Google.Protobuf.dll ..\packages\MySql.Data.8.0.15\lib\net452\MySql.Data.dll - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll + + ..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + + + + - - ..\packages\System.Data.SQLite.Core.1.0.110.0\lib\net46\System.Data.SQLite.dll + + ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\lib\net46\System.Data.SQLite.dll + + + ..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + + + ..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + + @@ -224,6 +248,9 @@ WebSite.cs Designer + + WebSiteControl.cs + WinBox.cs Designer @@ -247,11 +274,11 @@ - + - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + Tenhle projekt odkazuje na balíčky NuGet, které nejsou v tomhle počítači k dispozici. Když je chcete stáhnout, použijte funkci obnovení balíčků NuGet. Další informace najdete na adrese http://go.microsoft.com/fwlink/?LinkID=322105. Chybějícím souborem je soubor {0}. - + \ No newline at end of file diff --git a/RCM/Record/RDP/RDP.cs b/RCM/Record/RDP/RDP.cs index a913cc8..07fe8c3 100644 --- a/RCM/Record/RDP/RDP.cs +++ b/RCM/Record/RDP/RDP.cs @@ -12,6 +12,7 @@ namespace RCM { public string Host { get; set; } public string Username { get; set; } public string Password { get; set; } + public string Notes { get; set; } [NonSerialized] private SimpleHostControl _control; [NonSerialized] @@ -26,7 +27,7 @@ namespace RCM { public UserControl GetControl() { if (_control == null || _control.IsDisposed) { - _control = new SimpleHostControl(Host, Username, Password); + _control = new SimpleHostControl(Host, Username, Password, Notes); } return _control; } @@ -35,10 +36,7 @@ namespace RCM { Host = _control.textBoxHostAddress.Text; Username = _control.textBoxUsername.Text; Password = _control.textBoxPassword.Text; - } - - public static void Init() { - + Notes = _control.textBoxNotes.Text; } } } diff --git a/RCM/Record/SSH/SSH.cs b/RCM/Record/SSH/SSH.cs index 61f8eee..ce036cb 100644 --- a/RCM/Record/SSH/SSH.cs +++ b/RCM/Record/SSH/SSH.cs @@ -11,6 +11,7 @@ namespace RCM { public string Host { get; set; } public string Username { get; set; } public string Password { get; set; } + public string Notes { get; set; } [NonSerialized] private SimpleHostControl _control; [NonSerialized] @@ -25,7 +26,7 @@ namespace RCM { public UserControl GetControl() { if (_control == null || _control.IsDisposed) { - _control = new SimpleHostControl(Host, Username, Password); + _control = new SimpleHostControl(Host, Username, Password, Notes); } return _control; } @@ -34,6 +35,7 @@ namespace RCM { Host = _control.textBoxHostAddress.Text; Username = _control.textBoxUsername.Text; Password = _control.textBoxPassword.Text; + Notes = _control.textBoxNotes.Text; } } } diff --git a/RCM/Record/WebSite/WebSite.cs b/RCM/Record/WebSite/WebSite.cs index 28b7a32..b1178d7 100644 --- a/RCM/Record/WebSite/WebSite.cs +++ b/RCM/Record/WebSite/WebSite.cs @@ -11,6 +11,7 @@ namespace RCM { public string URL { get; set; } public string Username { get; set; } public string Password { get; set; } + public string Notes { get; set; } [NonSerialized] private WebSiteControl _control; [NonSerialized] @@ -34,6 +35,7 @@ namespace RCM { URL = _control.textBoxURL.Text; Username = _control.textBoxUsername.Text; Password = _control.textBoxPassword.Text; + Notes = _control.textBoxNotes.Text; } } } diff --git a/RCM/Record/WebSite/WebsiteControl.Designer.cs b/RCM/Record/WebSite/WebsiteControl.Designer.cs index b8ab580..6d90d5b 100644 --- a/RCM/Record/WebSite/WebsiteControl.Designer.cs +++ b/RCM/Record/WebSite/WebsiteControl.Designer.cs @@ -30,6 +30,8 @@ this.labelPassword = new System.Windows.Forms.Label(); this.labelUsername = new System.Windows.Forms.Label(); this.labelURL = new System.Windows.Forms.Label(); + this.textBoxNotes = new System.Windows.Forms.TextBox(); + this.labelNotes = new System.Windows.Forms.Label(); this.SuspendLayout(); // // buttonUnmaskPassword @@ -91,10 +93,30 @@ this.labelURL.TabIndex = 12; this.labelURL.Text = "URL:"; // - // WebsiteControl + // textBoxNotes + // + this.textBoxNotes.Location = new System.Drawing.Point(120, 79); + this.textBoxNotes.Multiline = true; + this.textBoxNotes.Name = "textBoxNotes"; + this.textBoxNotes.ScrollBars = System.Windows.Forms.ScrollBars.Both; + this.textBoxNotes.Size = new System.Drawing.Size(175, 64); + this.textBoxNotes.TabIndex = 5; + // + // labelNotes + // + this.labelNotes.AutoSize = true; + this.labelNotes.Location = new System.Drawing.Point(0, 82); + this.labelNotes.Name = "labelNotes"; + this.labelNotes.Size = new System.Drawing.Size(38, 13); + this.labelNotes.TabIndex = 17; + this.labelNotes.Text = "Notes:"; + // + // WebSiteControl // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.textBoxNotes); + this.Controls.Add(this.labelNotes); this.Controls.Add(this.buttonUnmaskPassword); this.Controls.Add(this.textBoxPassword); this.Controls.Add(this.textBoxUsername); @@ -102,8 +124,8 @@ this.Controls.Add(this.labelPassword); this.Controls.Add(this.labelUsername); this.Controls.Add(this.labelURL); - this.Name = "WebsiteControl"; - this.Size = new System.Drawing.Size(300, 77); + this.Name = "WebSiteControl"; + this.Size = new System.Drawing.Size(300, 150); this.ResumeLayout(false); this.PerformLayout(); @@ -118,5 +140,7 @@ public System.Windows.Forms.TextBox textBoxURL; public System.Windows.Forms.TextBox textBoxUsername; public System.Windows.Forms.TextBox textBoxPassword; + public System.Windows.Forms.TextBox textBoxNotes; + private System.Windows.Forms.Label labelNotes; } } diff --git a/RCM/Record/WebSite/WebsiteControl.cs b/RCM/Record/WebSite/WebsiteControl.cs index 15bd0c8..fc9ac3b 100644 --- a/RCM/Record/WebSite/WebsiteControl.cs +++ b/RCM/Record/WebSite/WebsiteControl.cs @@ -8,6 +8,7 @@ namespace RCM { textBoxURL.Text = website.URL; textBoxUsername.Text = website.Username; textBoxPassword.Text = website.Password; + textBoxNotes.Text = website.Notes; } private void ButtonUnmaskPassword_Click(object sender, EventArgs e) { diff --git a/RCM/Record/WebSite/WebsiteControl.resx b/RCM/Record/WebSite/WebsiteControl.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RCM/Record/WebSite/WebsiteControl.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RCM/Record/WinBox/WinBox.cs b/RCM/Record/WinBox/WinBox.cs index 675124c..9b78d93 100644 --- a/RCM/Record/WinBox/WinBox.cs +++ b/RCM/Record/WinBox/WinBox.cs @@ -14,6 +14,7 @@ namespace RCM { public string Host { get; set; } public string Username { get; set; } public string Password { get; set; } + public string Notes { get; set; } [NonSerialized] private SimpleHostControl _control; [NonSerialized] @@ -28,7 +29,7 @@ namespace RCM { public UserControl GetControl() { if (_control == null || _control.IsDisposed) { - _control = new SimpleHostControl(Host, Username, Password); + _control = new SimpleHostControl(Host, Username, Password, Notes); } return _control; } @@ -37,6 +38,7 @@ namespace RCM { Host = _control.textBoxHostAddress.Text; Username = _control.textBoxUsername.Text; Password = _control.textBoxPassword.Text; + Notes = _control.textBoxNotes.Text; } } } diff --git a/RCM/SimpleHostControl.Designer.cs b/RCM/SimpleHostControl.Designer.cs index 2689fef..d5c3e10 100644 --- a/RCM/SimpleHostControl.Designer.cs +++ b/RCM/SimpleHostControl.Designer.cs @@ -30,6 +30,8 @@ this.labelPassword = new System.Windows.Forms.Label(); this.labelUsername = new System.Windows.Forms.Label(); this.labelHostAddress = new System.Windows.Forms.Label(); + this.labelNotes = new System.Windows.Forms.Label(); + this.textBoxNotes = new System.Windows.Forms.TextBox(); this.SuspendLayout(); // // buttonUnmaskPassword @@ -91,10 +93,30 @@ this.labelHostAddress.TabIndex = 12; this.labelHostAddress.Text = "Host address:"; // + // labelNotes + // + this.labelNotes.AutoSize = true; + this.labelNotes.Location = new System.Drawing.Point(0, 82); + this.labelNotes.Name = "labelNotes"; + this.labelNotes.Size = new System.Drawing.Size(38, 13); + this.labelNotes.TabIndex = 15; + this.labelNotes.Text = "Notes:"; + // + // textBoxNotes + // + this.textBoxNotes.Location = new System.Drawing.Point(120, 79); + this.textBoxNotes.Multiline = true; + this.textBoxNotes.Name = "textBoxNotes"; + this.textBoxNotes.ScrollBars = System.Windows.Forms.ScrollBars.Both; + this.textBoxNotes.Size = new System.Drawing.Size(175, 64); + this.textBoxNotes.TabIndex = 5; + // // SimpleHostControl // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.textBoxNotes); + this.Controls.Add(this.labelNotes); this.Controls.Add(this.buttonUnmaskPassword); this.Controls.Add(this.textBoxPassword); this.Controls.Add(this.textBoxUsername); @@ -103,7 +125,7 @@ this.Controls.Add(this.labelUsername); this.Controls.Add(this.labelHostAddress); this.Name = "SimpleHostControl"; - this.Size = new System.Drawing.Size(300, 75); + this.Size = new System.Drawing.Size(300, 150); this.ResumeLayout(false); this.PerformLayout(); @@ -118,5 +140,7 @@ public System.Windows.Forms.TextBox textBoxHostAddress; public System.Windows.Forms.TextBox textBoxUsername; public System.Windows.Forms.TextBox textBoxPassword; + private System.Windows.Forms.Label labelNotes; + public System.Windows.Forms.TextBox textBoxNotes; } } diff --git a/RCM/SimpleHostControl.cs b/RCM/SimpleHostControl.cs index ad30da6..9439091 100644 --- a/RCM/SimpleHostControl.cs +++ b/RCM/SimpleHostControl.cs @@ -3,11 +3,12 @@ using System.Windows.Forms; namespace RCM { public partial class SimpleHostControl : UserControl { - public SimpleHostControl(string host, string username, string password) { + public SimpleHostControl(string host, string username, string password, string notes) { InitializeComponent(); textBoxHostAddress.Text = host; textBoxUsername.Text = username; textBoxPassword.Text = password; + textBoxNotes.Text = notes; } private void ButtonUnmaskPassword_Click(object sender, EventArgs e) { diff --git a/RCM/app.config b/RCM/app.config index 68b2176..10035e5 100644 --- a/RCM/app.config +++ b/RCM/app.config @@ -4,8 +4,36 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/RCM/packages.config b/RCM/packages.config index 9d73f3e..5a28118 100644 --- a/RCM/packages.config +++ b/RCM/packages.config @@ -1,7 +1,13 @@  - - - - + + + + + + + + + + \ No newline at end of file