diff --git a/src/MainForm.Designer.cs b/src/MainForm.Designer.cs index c41cdfb..1b50cd5 100644 --- a/src/MainForm.Designer.cs +++ b/src/MainForm.Designer.cs @@ -97,15 +97,14 @@ private void InitializeComponent() this.menuContextCut = new System.Windows.Forms.ToolStripMenuItem(); this.menuContextCopy = new System.Windows.Forms.ToolStripMenuItem(); this.menuContextPaste = new System.Windows.Forms.ToolStripMenuItem(); - this.menuContextDelete = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator32 = new System.Windows.Forms.ToolStripSeparator(); this.menuContextDuplicate = new System.Windows.Forms.ToolStripMenuItem(); + this.menuContextDelete = new System.Windows.Forms.ToolStripMenuItem(); this.menuContextMoveUp = new System.Windows.Forms.ToolStripMenuItem(); this.menuContextMoveDown = new System.Windows.Forms.ToolStripMenuItem(); this.menuContextInsertAbove = new System.Windows.Forms.ToolStripMenuItem(); this.menuContextInsertBelow = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator31 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripSeparator32 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripSeparator33 = new System.Windows.Forms.ToolStripSeparator(); this.contextMenuCheck = new System.Windows.Forms.ToolStripMenuItem(); this.contextMenuUncheck = new System.Windows.Forms.ToolStripMenuItem(); this.bindingSourceView = new System.Windows.Forms.BindingSource(this.components); @@ -132,8 +131,9 @@ private void InitializeComponent() this.menuCut = new System.Windows.Forms.ToolStripMenuItem(); this.menuCopy = new System.Windows.Forms.ToolStripMenuItem(); this.menuPaste = new System.Windows.Forms.ToolStripMenuItem(); - this.menuDelete = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator33 = new System.Windows.Forms.ToolStripSeparator(); this.menuDuplicate = new System.Windows.Forms.ToolStripMenuItem(); + this.menuDelete = new System.Windows.Forms.ToolStripMenuItem(); this.menuMoveUp = new System.Windows.Forms.ToolStripMenuItem(); this.menuMoveDown = new System.Windows.Forms.ToolStripMenuItem(); this.insertRowAboveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -150,6 +150,8 @@ private void InitializeComponent() this.menuTools = new System.Windows.Forms.ToolStripMenuItem(); this.menuPingIPs = new System.Windows.Forms.ToolStripMenuItem(); this.menuRemoveDefaultText = new System.Windows.Forms.ToolStripMenuItem(); + this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStrip = new HostsFileEditor.Controls.ToolStripEx(); this.buttonSave = new System.Windows.Forms.ToolStripButton(); this.buttonRefresh = new System.Windows.Forms.ToolStripButton(); @@ -178,8 +180,9 @@ private void InitializeComponent() this.contextMenuExit = new System.Windows.Forms.ToolStripMenuItem(); this.openFileDialog = new System.Windows.Forms.OpenFileDialog(); this.bindingSourceHostEntries = new System.Windows.Forms.BindingSource(this.components); - this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.contextMenuArchive = new System.Windows.Forms.ContextMenuStrip(this.components); + this.toolStripMenuArchiveLoad = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuArchiveDelete = new System.Windows.Forms.ToolStripMenuItem(); toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator(); toolStripSeparator23 = new System.Windows.Forms.ToolStripSeparator(); toolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator(); @@ -224,6 +227,7 @@ private void InitializeComponent() this.toolStrip.SuspendLayout(); this.contextMenuTray.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bindingSourceHostEntries)).BeginInit(); + this.contextMenuArchive.SuspendLayout(); this.SuspendLayout(); // // toolStripContainer @@ -409,6 +413,18 @@ private void InitializeComponent() resources.ApplyResources(this.menuContextPaste, "menuContextPaste"); this.menuContextPaste.Click += new System.EventHandler(this.OnPasteClick); // + // toolStripSeparator32 + // + this.toolStripSeparator32.Name = "toolStripSeparator32"; + resources.ApplyResources(this.toolStripSeparator32, "toolStripSeparator32"); + // + // menuContextDuplicate + // + this.menuContextDuplicate.Image = global::HostsFileEditor.Properties.Resources.Duplicate; + this.menuContextDuplicate.Name = "menuContextDuplicate"; + resources.ApplyResources(this.menuContextDuplicate, "menuContextDuplicate"); + this.menuContextDuplicate.Click += new System.EventHandler(this.OnDuplicateClick); + // // toolStripSeparator22 // toolStripSeparator22.Name = "toolStripSeparator22"; @@ -421,13 +437,6 @@ private void InitializeComponent() resources.ApplyResources(this.menuContextDelete, "menuContextDelete"); this.menuContextDelete.Click += new System.EventHandler(this.OnDeleteClick); // - // menuContextDuplicate - // - this.menuContextDuplicate.Image = global::HostsFileEditor.Properties.Resources.Duplicate; - this.menuContextDuplicate.Name = "menuContextDuplicate"; - resources.ApplyResources(this.menuContextDuplicate, "menuContextDuplicate"); - this.menuContextDuplicate.Click += new System.EventHandler(this.OnDuplicateClick); - // // toolStripSeparator23 // toolStripSeparator23.Name = "toolStripSeparator23"; @@ -471,11 +480,6 @@ private void InitializeComponent() this.toolStripSeparator31.Name = "toolStripSeparator31"; resources.ApplyResources(this.toolStripSeparator31, "toolStripSeparator31"); // - // toolStripSeparator32 - // - this.toolStripSeparator32.Name = "toolStripSeparator32"; - resources.ApplyResources(this.toolStripSeparator31, "toolStripSeparator32"); - // // contextMenuCheck // this.contextMenuCheck.Image = global::HostsFileEditor.Properties.Resources.Check; @@ -515,6 +519,8 @@ private void InitializeComponent() this.dataGridViewArchive.ReadOnly = true; this.dataGridViewArchive.RowHeadersVisible = false; this.dataGridViewArchive.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridViewArchive.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridViewArchive_CellMouseClick); + this.dataGridViewArchive.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridViewArchive_CellMouseDown); // // fileNameDataGridViewTextBoxColumn // @@ -682,7 +688,7 @@ private void InitializeComponent() this.menuCut, this.menuCopy, this.menuPaste, - toolStripSeparator33, + this.toolStripSeparator33, this.menuDuplicate, toolStripSeparator5, this.menuDelete, @@ -750,6 +756,18 @@ private void InitializeComponent() resources.ApplyResources(this.menuPaste, "menuPaste"); this.menuPaste.Click += new System.EventHandler(this.OnPasteClick); // + // toolStripSeparator33 + // + this.toolStripSeparator33.Name = "toolStripSeparator33"; + resources.ApplyResources(this.toolStripSeparator33, "toolStripSeparator33"); + // + // menuDuplicate + // + this.menuDuplicate.Image = global::HostsFileEditor.Properties.Resources.Duplicate; + this.menuDuplicate.Name = "menuDuplicate"; + resources.ApplyResources(this.menuDuplicate, "menuDuplicate"); + this.menuDuplicate.Click += new System.EventHandler(this.OnDuplicateClick); + // // toolStripSeparator5 // toolStripSeparator5.Name = "toolStripSeparator5"; @@ -762,13 +780,6 @@ private void InitializeComponent() resources.ApplyResources(this.menuDelete, "menuDelete"); this.menuDelete.Click += new System.EventHandler(this.OnDeleteClick); // - // menuDuplicate - // - this.menuDuplicate.Image = global::HostsFileEditor.Properties.Resources.Duplicate; - this.menuDuplicate.Name = "menuDuplicate"; - resources.ApplyResources(this.menuDuplicate, "menuDuplicate"); - this.menuDuplicate.Click += new System.EventHandler(this.OnDuplicateClick); - // // toolStripSeparator6 // toolStripSeparator6.Name = "toolStripSeparator6"; @@ -905,6 +916,19 @@ private void InitializeComponent() resources.ApplyResources(this.menuRemoveDefaultText, "menuRemoveDefaultText"); this.menuRemoveDefaultText.Click += new System.EventHandler(this.OnRemoveDefaultTextClick); // + // helpToolStripMenuItem + // + this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.aboutToolStripMenuItem}); + this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; + resources.ApplyResources(this.helpToolStripMenuItem, "helpToolStripMenuItem"); + // + // aboutToolStripMenuItem + // + this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; + resources.ApplyResources(this.aboutToolStripMenuItem, "aboutToolStripMenuItem"); + this.aboutToolStripMenuItem.Click += new System.EventHandler(this.OnAboutClick); + // // toolStrip // this.toolStrip.ClickThrough = true; @@ -1135,18 +1159,27 @@ private void InitializeComponent() // this.bindingSourceHostEntries.DataSource = typeof(HostsFileEditor.HostsEntryList); // - // helpToolStripMenuItem + // contextMenuArchive // - this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.aboutToolStripMenuItem}); - this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - resources.ApplyResources(this.helpToolStripMenuItem, "helpToolStripMenuItem"); + this.contextMenuArchive.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripMenuArchiveLoad, + this.toolStripMenuArchiveDelete}); + this.contextMenuArchive.Name = "contextMenuArchive"; + resources.ApplyResources(this.contextMenuArchive, "contextMenuArchive"); // - // aboutToolStripMenuItem + // toolStripMenuArchiveLoad // - this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - resources.ApplyResources(this.aboutToolStripMenuItem, "aboutToolStripMenuItem"); - this.aboutToolStripMenuItem.Click += new System.EventHandler(this.OnAboutClick); + this.toolStripMenuArchiveLoad.Image = global::HostsFileEditor.Properties.Resources.LoadArchive; + this.toolStripMenuArchiveLoad.Name = "toolStripMenuArchiveLoad"; + resources.ApplyResources(this.toolStripMenuArchiveLoad, "toolStripMenuArchiveLoad"); + this.toolStripMenuArchiveLoad.Click += new System.EventHandler(this.toolStripMenuArchiveLoad_Click); + // + // toolStripMenuArchiveDelete + // + this.toolStripMenuArchiveDelete.Image = global::HostsFileEditor.Properties.Resources.Delete; + this.toolStripMenuArchiveDelete.Name = "toolStripMenuArchiveDelete"; + resources.ApplyResources(this.toolStripMenuArchiveDelete, "toolStripMenuArchiveDelete"); + this.toolStripMenuArchiveDelete.Click += new System.EventHandler(this.toolStripMenuArchiveDelete_Click); // // MainForm // @@ -1189,6 +1222,7 @@ private void InitializeComponent() this.toolStrip.PerformLayout(); this.contextMenuTray.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bindingSourceHostEntries)).EndInit(); + this.contextMenuArchive.ResumeLayout(false); this.ResumeLayout(false); } @@ -1298,6 +1332,9 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem openTextEditor; + private System.Windows.Forms.ContextMenuStrip contextMenuArchive; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuArchiveLoad; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuArchiveDelete; } } diff --git a/src/MainForm.cs b/src/MainForm.cs index 94177d7..9703d06 100644 --- a/src/MainForm.cs +++ b/src/MainForm.cs @@ -17,6 +17,8 @@ // with HostsFileEditor. If not, see http://www.gnu.org/licenses/. // +using System.Drawing; + namespace HostsFileEditor { using System; @@ -878,12 +880,31 @@ private void OnRedoClick(object sender, EventArgs e) /// The instance /// containing the event data. private void OnArchiveDeleteClick(object sender, EventArgs e) + { + SelectedArchiveDelete(); + } + + /// + /// Delete the selected archive + /// + private void SelectedArchiveDelete() { HostsArchive archive = this.dataGridViewArchive.CurrentHostsArchive; if (archive != null) { - HostsArchiveList.Instance.Delete(archive); + DialogResult result = MessageBox.Show( + this, + string.Format(Resources.ArchiveDeleteQuestion, archive.FileName), + Resources.ArchiveDeleteDialogCaption, + MessageBoxButtons.YesNo, + MessageBoxIcon.Question, + MessageBoxDefaultButton.Button1); + + if (result == DialogResult.Yes) + { + HostsArchiveList.Instance.Delete(archive); + } } } @@ -894,6 +915,14 @@ private void OnArchiveDeleteClick(object sender, EventArgs e) /// The instance /// containing the event data. private void OnArchiveLoadClick(object sender, EventArgs e) + { + SelectedArchiveLoad(); + } + + /// + /// Load the selected archive + /// + private void SelectedArchiveLoad() { HostsArchive archive = this.dataGridViewArchive.CurrentHostsArchive; @@ -1085,5 +1114,35 @@ private void OnOpenTextEditorClick(object sender, EventArgs e) } #endregion + + private void dataGridViewArchive_CellMouseDown(object sender, DataGridViewCellMouseEventArgs e) + { + if (e.Button == MouseButtons.Right) + { + dataGridViewArchive.CurrentCell = dataGridViewArchive.Rows[e.RowIndex].Cells[e.ColumnIndex]; + // Can leave these here - doesn't hurt + dataGridViewArchive.Rows[e.RowIndex].Selected = true; + dataGridViewArchive.Focus(); + } + } + + private void dataGridViewArchive_CellMouseClick(object sender, DataGridViewCellMouseEventArgs e) + { + if (e.Button == MouseButtons.Right) + { + var relativeMousePosition = dataGridViewArchive.PointToClient(Cursor.Position); + contextMenuArchive.Show(dataGridViewArchive, relativeMousePosition); + } + } + + private void toolStripMenuArchiveLoad_Click(object sender, EventArgs e) + { + SelectedArchiveLoad(); + } + + private void toolStripMenuArchiveDelete_Click(object sender, EventArgs e) + { + SelectedArchiveDelete(); + } } } \ No newline at end of file diff --git a/src/MainForm.resx b/src/MainForm.resx index 5b49d60..02f01a3 100644 --- a/src/MainForm.resx +++ b/src/MainForm.resx @@ -240,17 +240,131 @@ 325, 56 + + Ctrl+X + + + 226, 22 + + + Cu&t + + + Ctrl+C + + + 226, 22 + + + &Copy + + + Ctrl+V + + + 226, 22 + + + &Paste + + + 223, 6 + + + Ctrl+D + + + 226, 22 + + + Duplicate + False + + 223, 6 + + + Del + + + 226, 22 + + + Delete + False + + 223, 6 + + + Alt+Up + + + 226, 22 + + + Move Up + + + Alt+Down + + + 226, 22 + + + Move Down + False + + 223, 6 + + + Ctrl+Alt+Up + + + 226, 22 + + + Insert Above + + + Ctrl+Alt+Down + + + 226, 22 + + + Insert Below + + + 223, 6 + + + Fuchsia + + + 226, 22 + + + Check + + + Fuchsia + + + 226, 22 + + + Uncheck + - 227, 270 + 227, 276 contextMenuGrid @@ -280,7 +394,7 @@ dataGridViewHostsEntries - HostsFileEditor.Controls.HostsEntryDataGridView, HostsFileEditor, Version=0.9.3.0, Culture=neutral, PublicKeyToken=null + HostsFileEditor.Controls.HostsEntryDataGridView, HostsFileEditor, Version=1.2.0.0, Culture=neutral, PublicKeyToken=null splitContainer.Panel1 @@ -300,6 +414,9 @@ 0 + + Name + 690, 56 @@ -319,7 +436,7 @@ dataGridViewArchive - HostsFileEditor.Controls.HostsArchiveDataGridView, HostsFileEditor, Version=0.9.3.0, Culture=neutral, PublicKeyToken=null + HostsFileEditor.Controls.HostsArchiveDataGridView, HostsFileEditor, Version=1.2.0.0, Culture=neutral, PublicKeyToken=null splitContainer.Panel2 @@ -333,9 +450,36 @@ False + + 47, 22 + + + Archive + False + + 6, 25 + + + Magenta + + + 23, 22 + + + Delete Selected Archive + + + Magenta + + + 23, 22 + + + Load Selected Archive + 0, 0 @@ -352,7 +496,7 @@ toolStripArchive - HostsFileEditor.Controls.ToolStripEx, HostsFileEditor, Version=0.9.3.0, Culture=neutral, PublicKeyToken=null + HostsFileEditor.Controls.ToolStripEx, HostsFileEditor, Version=1.2.0.0, Culture=neutral, PublicKeyToken=null splitContainer.Panel2 @@ -453,336 +597,6 @@ None - - False - - - False - - - False - - - False - - - 37, 20 - - - &File - - - False - - - False - - - False - - - False - - - False - - - 39, 20 - - - &Edit - - - False - - - False - - - 44, 20 - - - &View - - - 48, 20 - - - &Tools - - - 152, 22 - - - &About - - - 44, 20 - - - &Help - - - 0, 0 - - - 676, 24 - - - 0 - - - Menu Strip - - - menuStrip - - - HostsFileEditor.Controls.MenuStripEx, HostsFileEditor, Version=0.9.3.0, Culture=neutral, PublicKeyToken=null - - - toolStripContainer.TopToolStripPanel - - - 0 - - - 283, 17 - - - False - - - False - - - False - - - False - - - False - - - None - - - 0, 24 - - - 676, 25 - - - 1 - - - Tool Strip - - - toolStrip - - - HostsFileEditor.Controls.ToolStripEx, HostsFileEditor, Version=0.9.3.0, Culture=neutral, PublicKeyToken=null - - - toolStripContainer.TopToolStripPanel - - - 1 - - - toolStripContainer.TopToolStripPanel - - - System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - toolStripContainer - - - 3 - - - toolStripContainer - - - System.Windows.Forms.ToolStripContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - - - 17, 56 - - - Ctrl+X - - - 226, 22 - - - Cu&t - - - Ctrl+C - - - 226, 22 - - - &Copy - - - Ctrl+V - - - 226, 22 - - - &Paste - - - False - - - 223, 6 - - - Del - - - 226, 22 - - - Delete - - - Ctrl+D - - - 226, 22 - - - Duplicate - - - False - - - 223, 6 - - - Alt+Up - - - 226, 22 - - - Move Up - - - Alt+Down - - - 226, 22 - - - Move Down - - - False - - - 223, 6 - - - Ctrl+Alt+Up - - - 226, 22 - - - Insert Above - - - Ctrl+Alt+Down - - - 226, 22 - - - Insert Below - - - 223, 6 - - - 223, 6 - - - 223, 6 - - - Fuchsia - - - 226, 22 - - - Check - - - Fuchsia - - - 226, 22 - - - Uncheck - - - Name - - - 690, 56 - - - False - - - 47, 22 - - - Archive - - - False - - - 6, 25 - - - Magenta - - - 23, 22 - - - Delete Selected Archive - - - Magenta - - - 23, 22 - - - Load Selected Archive - Ctrl+S @@ -816,6 +630,12 @@ 163, 6 + + 166, 22 + + + Open &Text Editor + 166, 22 @@ -855,6 +675,12 @@ E&xit + + 37, 20 + + + &File + Magenta @@ -924,6 +750,18 @@ &Paste + + 223, 6 + + + Ctrl+D + + + 226, 22 + + + &Duplicate + False @@ -939,15 +777,6 @@ &Delete - - Ctrl+D - - - 226, 22 - - - &Duplicate - False @@ -1017,6 +846,12 @@ Uncheck + + 39, 20 + + + &Edit + 141, 22 @@ -1032,12 +867,6 @@ False - - 141, 22 - - - &Filter - 186, 22 @@ -1050,6 +879,12 @@ &Disabled + + 141, 22 + + + &Filter + 138, 6 @@ -1059,18 +894,72 @@ Remove Sort + + 44, 20 + + + &View + - 183, 22 + 182, 22 &Auto Ping IPs - 183, 22 + 182, 22 &Remove Default Text + + 47, 20 + + + &Tools + + + 107, 22 + + + &About + + + 44, 20 + + + &Help + + + 0, 0 + + + 676, 24 + + + 0 + + + Menu Strip + + + menuStrip + + + HostsFileEditor.Controls.MenuStripEx, HostsFileEditor, Version=1.2.0.0, Culture=neutral, PublicKeyToken=null + + + toolStripContainer.TopToolStripPanel + + + 0 + + + 283, 17 + + + None + Magenta @@ -1170,6 +1059,54 @@ 6, 25 + + 0, 24 + + + 676, 25 + + + 1 + + + Tool Strip + + + toolStrip + + + HostsFileEditor.Controls.ToolStripEx, HostsFileEditor, Version=1.2.0.0, Culture=neutral, PublicKeyToken=null + + + toolStripContainer.TopToolStripPanel + + + 1 + + + toolStripContainer.TopToolStripPanel + + + System.Windows.Forms.ToolStripPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + toolStripContainer + + + 3 + + + toolStripContainer + + + System.Windows.Forms.ToolStripContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + False @@ -1224,16 +1161,16 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI - ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9 - HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN - rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K - TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx - oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8 - 7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI - xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX - LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd - KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== @@ -1260,6 +1197,24 @@ 856, 17 + + 166, 22 + + + Edit... + + + 166, 22 + + + Disable Hosts File + + + 166, 22 + + + Exit + 167, 82 @@ -2719,24 +2674,6 @@ True - - 166, 22 - - - Edit... - - - 166, 22 - - - Disable Hosts File - - - 166, 22 - - - Exit - 192, 56 @@ -2749,6 +2686,30 @@ 619, 17 + + 861, 56 + + + 150, 22 + + + Load Archive + + + 150, 22 + + + Delete Archive + + + 151, 48 + + + contextMenuArchive + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + True @@ -4218,7 +4179,7 @@ labelLineCountNumber - HostsFileEditor.Controls.ToolStripBindableStatusLabel, HostsFileEditor, Version=0.9.3.0, Culture=neutral, PublicKeyToken=null + HostsFileEditor.Controls.ToolStripBindableStatusLabel, HostsFileEditor, Version=1.2.0.0, Culture=neutral, PublicKeyToken=null bindingSourceHostFile @@ -4236,7 +4197,7 @@ labelHostEntriesCount - HostsFileEditor.Controls.ToolStripBindableStatusLabel, HostsFileEditor, Version=0.9.3.0, Culture=neutral, PublicKeyToken=null + HostsFileEditor.Controls.ToolStripBindableStatusLabel, HostsFileEditor, Version=1.2.0.0, Culture=neutral, PublicKeyToken=null columnValid @@ -4298,6 +4259,18 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + toolStripSeparator32 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + menuContextDuplicate + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + toolStripSeparator22 @@ -4310,12 +4283,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - menuContextDuplicate - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - toolStripSeparator23 @@ -4358,18 +4325,6 @@ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - toolStripSeparator32 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - toolStripSeparator33 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - contextMenuCheck @@ -4460,6 +4415,12 @@ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + openTextEditor + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + menuRestoreDefaults @@ -4550,6 +4511,18 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + toolStripSeparator33 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + menuDuplicate + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + toolStripSeparator5 @@ -4562,12 +4535,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - menuDuplicate - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - toolStripSeparator6 @@ -4688,6 +4655,18 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + helpToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + aboutToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + buttonSave @@ -4764,7 +4743,7 @@ textFilter - HostsFileEditor.Controls.ToolStripSpringTextBox, HostsFileEditor, Version=0.9.3.0, Culture=neutral, PublicKeyToken=null + HostsFileEditor.Controls.ToolStripSpringTextBox, HostsFileEditor, Version=1.2.0.0, Culture=neutral, PublicKeyToken=null toolStripSeparator19 @@ -4892,16 +4871,16 @@ System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - helpToolStripMenuItem + + toolStripMenuArchiveLoad - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - aboutToolStripMenuItem + + toolStripMenuArchiveDelete - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -4910,16 +4889,4 @@ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 166, 22 - - - Open &Text Editor - - - openTextEditor - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - \ No newline at end of file diff --git a/src/Properties/Resources.Designer.cs b/src/Properties/Resources.Designer.cs index 6ad7999..ab07355 100644 --- a/src/Properties/Resources.Designer.cs +++ b/src/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace HostsFileEditor.Properties { // 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", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -70,6 +70,24 @@ internal static System.Drawing.Bitmap Archive { } } + /// + /// Looks up a localized string similar to Host File Delete Question. + /// + internal static string ArchiveDeleteDialogCaption { + get { + return ResourceManager.GetString("ArchiveDeleteDialogCaption", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Are you sure you want to delete the '{0}' archive?. + /// + internal static string ArchiveDeleteQuestion { + get { + return ResourceManager.GetString("ArchiveDeleteQuestion", resourceCulture); + } + } + /// /// Looks up a localized string similar to Archive name already exists!. /// diff --git a/src/Properties/Resources.resx b/src/Properties/Resources.resx index 960ffa9..b4f76d2 100644 --- a/src/Properties/Resources.resx +++ b/src/Properties/Resources.resx @@ -307,4 +307,10 @@ ..\Resources\edit-copy-3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Host File Delete Question + + + Are you sure you want to delete the '{0}' archive? + \ No newline at end of file