From 0195a6bab5fbab92207c4dbc4abada758e78e377 Mon Sep 17 00:00:00 2001 From: David Sparer Date: Tue, 7 Feb 2017 14:33:00 -0700 Subject: [PATCH] refactored info menu to new class --- mRemoteV1/UI/Forms/frmMain.Designer.cs | 112 ----------------- mRemoteV1/UI/Forms/frmMain.cs | 55 ++------- mRemoteV1/UI/Menu/HelpMenu.cs | 165 ++++++++++++++++++++++++- 3 files changed, 167 insertions(+), 165 deletions(-) diff --git a/mRemoteV1/UI/Forms/frmMain.Designer.cs b/mRemoteV1/UI/Forms/frmMain.Designer.cs index 5f57d27fe..476d35e32 100644 --- a/mRemoteV1/UI/Forms/frmMain.Designer.cs +++ b/mRemoteV1/UI/Forms/frmMain.Designer.cs @@ -35,16 +35,6 @@ namespace mRemoteNG.UI.Forms this.mMenView = new System.Windows.Forms.ToolStripMenuItem(); this.mMenTools = new System.Windows.Forms.ToolStripMenuItem(); this.mMenInfo = new System.Windows.Forms.ToolStripMenuItem(); - this.mMenInfoHelp = new System.Windows.Forms.ToolStripMenuItem(); - this.mMenInfoSep1 = new System.Windows.Forms.ToolStripSeparator(); - this.mMenInfoWebsite = new System.Windows.Forms.ToolStripMenuItem(); - this.mMenInfoDonate = new System.Windows.Forms.ToolStripMenuItem(); - this.mMenInfoForum = new System.Windows.Forms.ToolStripMenuItem(); - this.mMenInfoBugReport = new System.Windows.Forms.ToolStripMenuItem(); - this.ToolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.mMenInfoSep2 = new System.Windows.Forms.ToolStripSeparator(); - this.mMenToolsUpdate = new System.Windows.Forms.ToolStripMenuItem(); - this.mMenInfoAbout = new System.Windows.Forms.ToolStripMenuItem(); this.mMenSep3 = new System.Windows.Forms.ToolStripSeparator(); this.lblQuickConnect = new System.Windows.Forms.ToolStripLabel(); this.cmbQuickConnect = new mRemoteNG.UI.Controls.QuickConnectComboBox(); @@ -83,8 +73,6 @@ namespace mRemoteNG.UI.Forms // this.msMain.Dock = System.Windows.Forms.DockStyle.None; this.msMain.GripMargin = new System.Windows.Forms.Padding(0); - this.msMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mMenInfo}); this.msMain.Location = new System.Drawing.Point(3, 0); this.msMain.Name = "msMain"; this.msMain.Padding = new System.Windows.Forms.Padding(2, 2, 0, 2); @@ -102,96 +90,6 @@ namespace mRemoteNG.UI.Forms this.cMenToolbarShowText.Text = "Show Text"; this.cMenToolbarShowText.Click += new System.EventHandler(this.cMenToolbarShowText_Click); // - // mMenInfo - // - this.mMenInfo.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mMenInfoHelp, - this.mMenInfoSep1, - this.mMenInfoWebsite, - this.mMenInfoDonate, - this.mMenInfoForum, - this.mMenInfoBugReport, - this.ToolStripSeparator2, - this.mMenToolsUpdate, - this.mMenInfoSep2, - this.mMenInfoAbout}); - this.mMenInfo.Name = "mMenInfo"; - this.mMenInfo.Size = new System.Drawing.Size(44, 20); - this.mMenInfo.Text = "&Help"; - this.mMenInfo.TextDirection = System.Windows.Forms.ToolStripTextDirection.Horizontal; - // - // mMenInfoHelp - // - this.mMenInfoHelp.Image = global::mRemoteNG.Resources.Help; - this.mMenInfoHelp.Name = "mMenInfoHelp"; - this.mMenInfoHelp.ShortcutKeys = System.Windows.Forms.Keys.F1; - this.mMenInfoHelp.Size = new System.Drawing.Size(190, 22); - this.mMenInfoHelp.Text = "mRemoteNG Help"; - this.mMenInfoHelp.Click += new System.EventHandler(this.mMenInfoHelp_Click); - // - // mMenInfoSep1 - // - this.mMenInfoSep1.Name = "mMenInfoSep1"; - this.mMenInfoSep1.Size = new System.Drawing.Size(187, 6); - // - // mMenInfoWebsite - // - this.mMenInfoWebsite.Image = global::mRemoteNG.Resources.Website; - this.mMenInfoWebsite.Name = "mMenInfoWebsite"; - this.mMenInfoWebsite.Size = new System.Drawing.Size(190, 22); - this.mMenInfoWebsite.Text = "Website"; - this.mMenInfoWebsite.Click += new System.EventHandler(this.mMenInfoWebsite_Click); - // - // mMenInfoDonate - // - this.mMenInfoDonate.Image = global::mRemoteNG.Resources.Donate; - this.mMenInfoDonate.Name = "mMenInfoDonate"; - this.mMenInfoDonate.Size = new System.Drawing.Size(190, 22); - this.mMenInfoDonate.Text = "Donate"; - this.mMenInfoDonate.Click += new System.EventHandler(this.mMenInfoDonate_Click); - // - // mMenInfoForum - // - this.mMenInfoForum.Image = global::mRemoteNG.Resources.user_comment; - this.mMenInfoForum.Name = "mMenInfoForum"; - this.mMenInfoForum.Size = new System.Drawing.Size(190, 22); - this.mMenInfoForum.Text = "Support Forum"; - this.mMenInfoForum.Click += new System.EventHandler(this.mMenInfoForum_Click); - // - // mMenInfoBugReport - // - this.mMenInfoBugReport.Image = global::mRemoteNG.Resources.Bug; - this.mMenInfoBugReport.Name = "mMenInfoBugReport"; - this.mMenInfoBugReport.Size = new System.Drawing.Size(190, 22); - this.mMenInfoBugReport.Text = "Report a Bug"; - this.mMenInfoBugReport.Click += new System.EventHandler(this.mMenInfoBugReport_Click); - // - // ToolStripSeparator2 - // - this.ToolStripSeparator2.Name = "ToolStripSeparator2"; - this.ToolStripSeparator2.Size = new System.Drawing.Size(187, 6); - // - // mMenToolsUpdate - // - this.mMenToolsUpdate.Image = global::mRemoteNG.Resources.Update; - this.mMenToolsUpdate.Name = "mMenToolsUpdate"; - this.mMenToolsUpdate.Size = new System.Drawing.Size(190, 22); - this.mMenToolsUpdate.Text = "Check for Updates"; - this.mMenToolsUpdate.Click += new System.EventHandler(this.mMenToolsUpdate_Click); - // - // mMenInfoSep2 - // - this.mMenInfoSep2.Name = "mMenInfoSep2"; - this.mMenInfoSep2.Size = new System.Drawing.Size(187, 6); - // - // mMenInfoAbout - // - this.mMenInfoAbout.Image = global::mRemoteNG.Resources.mRemote; - this.mMenInfoAbout.Name = "mMenInfoAbout"; - this.mMenInfoAbout.Size = new System.Drawing.Size(190, 22); - this.mMenInfoAbout.Text = "About mRemoteNG"; - this.mMenInfoAbout.Click += new System.EventHandler(this.mMenInfoAbout_Click); - // // mMenSep3 // this.mMenSep3.Name = "mMenSep3"; @@ -345,11 +243,7 @@ namespace mRemoteNG.UI.Forms internal System.Windows.Forms.ToolStripMenuItem mMenTools; internal System.Windows.Forms.ToolStripLabel lblQuickConnect; internal System.Windows.Forms.ToolStripMenuItem mMenInfo; - internal System.Windows.Forms.ToolStripMenuItem mMenInfoHelp; internal System.Windows.Forms.ToolStripMenuItem cMenToolbarShowText; - internal System.Windows.Forms.ToolStripMenuItem mMenInfoWebsite; - internal System.Windows.Forms.ToolStripSeparator mMenInfoSep1; - internal System.Windows.Forms.ToolStripMenuItem mMenInfoAbout; internal QuickConnectComboBox cmbQuickConnect; internal System.Windows.Forms.ToolStripContainer tsContainer; internal System.Windows.Forms.Timer tmrAutoSave; @@ -357,13 +251,7 @@ namespace mRemoteNG.UI.Forms internal System.Windows.Forms.ContextMenuStrip cMenExtAppsToolbar; internal System.Windows.Forms.ToolStrip tsQuickConnect; internal System.Windows.Forms.ToolStripSeparator mMenSep3; - internal System.Windows.Forms.ToolStripMenuItem mMenInfoDonate; - internal System.Windows.Forms.ToolStripMenuItem mMenToolsUpdate; internal ToolStripSplitButton btnQuickConnect; - internal System.Windows.Forms.ToolStripSeparator mMenInfoSep2; - internal System.Windows.Forms.ToolStripMenuItem mMenInfoBugReport; - internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator2; - internal System.Windows.Forms.ToolStripMenuItem mMenInfoForum; internal System.Windows.Forms.ContextMenuStrip mnuQuickConnectProtocol; internal System.Windows.Forms.ToolStripDropDownButton btnConnections; internal System.Windows.Forms.ContextMenuStrip mnuConnections; diff --git a/mRemoteV1/UI/Forms/frmMain.cs b/mRemoteV1/UI/Forms/frmMain.cs index 110b73d5d..b6a2095f2 100644 --- a/mRemoteV1/UI/Forms/frmMain.cs +++ b/mRemoteV1/UI/Forms/frmMain.cs @@ -168,26 +168,20 @@ namespace mRemoteNG.UI.Forms ConnectionTreeWindow = Windows.TreeForm; - msMain.Items.Add(new MainFileMenu(ConnectionTreeWindow, _connectionInitiator)); - msMain.Items.Add(new ViewMenu(tsExternalTools, tsQuickConnect, _fullscreen, this)); - msMain.Items.Add(new ToolsMenu(this, _credentialManager)); + msMain.Items.AddRange(new ToolStripItem[] + { + new MainFileMenu(ConnectionTreeWindow, _connectionInitiator), + new ViewMenu(tsExternalTools, tsQuickConnect, _fullscreen, this), + new ToolsMenu(this, _credentialManager), + new HelpMenu() + }); } private void ApplyLanguage() { - mMenToolsUpdate.Text = Language.strMenuCheckForUpdates; - mMenInfo.Text = Language.strMenuHelp; - mMenInfoHelp.Text = Language.strMenuHelpContents; - mMenInfoForum.Text = Language.strMenuSupportForum; - mMenInfoBugReport.Text = Language.strMenuReportBug; - mMenInfoDonate.Text = Language.strMenuDonate; - mMenInfoWebsite.Text = Language.strMenuWebsite; - mMenInfoAbout.Text = Language.strMenuAbout; - lblQuickConnect.Text = Language.strLabelConnect; btnQuickConnect.Text = Language.strMenuConnect; btnConnections.Text = Language.strMenuConnections; - cMenToolbarShowText.Text = Language.strMenuShowText; } @@ -469,41 +463,6 @@ namespace mRemoteNG.UI.Forms } #endregion - #region Info - private void mMenToolsUpdate_Click(object sender, EventArgs e) - { - Windows.Show(WindowType.Update); - } - private void mMenInfoHelp_Click(object sender, EventArgs e) - { - Windows.Show(WindowType.Help); - } - - private void mMenInfoForum_Click(object sender, EventArgs e) - { - Runtime.GoToForum(); - } - - private void mMenInfoBugReport_Click(object sender, EventArgs e) - { - Runtime.GoToBugs(); - } - - private void mMenInfoWebsite_Click(object sender, EventArgs e) - { - Runtime.GoToWebsite(); - } - - private void mMenInfoDonate_Click(object sender, EventArgs e) - { - Runtime.GoToDonate(); - } - - private void mMenInfoAbout_Click(object sender, EventArgs e) - { - Windows.Show(WindowType.About); - } - #endregion #endregion #region Connections DropDown diff --git a/mRemoteV1/UI/Menu/HelpMenu.cs b/mRemoteV1/UI/Menu/HelpMenu.cs index 284e251d3..633b0b0ce 100644 --- a/mRemoteV1/UI/Menu/HelpMenu.cs +++ b/mRemoteV1/UI/Menu/HelpMenu.cs @@ -1,11 +1,166 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Windows.Forms; +using mRemoteNG.App; namespace mRemoteNG.UI.Menu { - class HelpMenu + public class HelpMenu : ToolStripMenuItem { + private ToolStripMenuItem _mMenInfoHelp; + private ToolStripMenuItem _mMenInfoWebsite; + private ToolStripSeparator _mMenInfoSep1; + private ToolStripMenuItem _mMenInfoAbout; + private ToolStripMenuItem _mMenInfoDonate; + private ToolStripMenuItem _mMenToolsUpdate; + private ToolStripSeparator _mMenInfoSep2; + private ToolStripMenuItem _mMenInfoBugReport; + private ToolStripSeparator _toolStripSeparator2; + private ToolStripMenuItem _mMenInfoForum; + + public HelpMenu() + { + Initialize(); + } + + private void Initialize() + { + _mMenInfoHelp = new ToolStripMenuItem(); + _mMenInfoSep1 = new ToolStripSeparator(); + _mMenInfoWebsite = new ToolStripMenuItem(); + _mMenInfoDonate = new ToolStripMenuItem(); + _mMenInfoForum = new ToolStripMenuItem(); + _mMenInfoBugReport = new ToolStripMenuItem(); + _toolStripSeparator2 = new ToolStripSeparator(); + _mMenInfoSep2 = new ToolStripSeparator(); + _mMenToolsUpdate = new ToolStripMenuItem(); + _mMenInfoAbout = new ToolStripMenuItem(); + + // + // mMenInfo + // + DropDownItems.AddRange(new ToolStripItem[] { + _mMenInfoHelp, + _mMenInfoSep1, + _mMenInfoWebsite, + _mMenInfoDonate, + _mMenInfoForum, + _mMenInfoBugReport, + _toolStripSeparator2, + _mMenToolsUpdate, + _mMenInfoSep2, + _mMenInfoAbout}); + Name = "mMenInfo"; + Size = new System.Drawing.Size(44, 20); + Text = Language.strMenuHelp; + TextDirection = ToolStripTextDirection.Horizontal; + // + // mMenInfoHelp + // + _mMenInfoHelp.Image = Resources.Help; + _mMenInfoHelp.Name = "mMenInfoHelp"; + _mMenInfoHelp.ShortcutKeys = Keys.F1; + _mMenInfoHelp.Size = new System.Drawing.Size(190, 22); + _mMenInfoHelp.Text = Language.strMenuHelpContents; + _mMenInfoHelp.Click += mMenInfoHelp_Click; + // + // mMenInfoSep1 + // + _mMenInfoSep1.Name = "mMenInfoSep1"; + _mMenInfoSep1.Size = new System.Drawing.Size(187, 6); + // + // mMenInfoWebsite + // + _mMenInfoWebsite.Image = Resources.Website; + _mMenInfoWebsite.Name = "mMenInfoWebsite"; + _mMenInfoWebsite.Size = new System.Drawing.Size(190, 22); + _mMenInfoWebsite.Text = Language.strMenuWebsite; + _mMenInfoWebsite.Click += mMenInfoWebsite_Click; + // + // mMenInfoDonate + // + _mMenInfoDonate.Image = Resources.Donate; + _mMenInfoDonate.Name = "mMenInfoDonate"; + _mMenInfoDonate.Size = new System.Drawing.Size(190, 22); + _mMenInfoDonate.Text = Language.strMenuDonate; + _mMenInfoDonate.Click += mMenInfoDonate_Click; + // + // mMenInfoForum + // + _mMenInfoForum.Image = Resources.user_comment; + _mMenInfoForum.Name = "mMenInfoForum"; + _mMenInfoForum.Size = new System.Drawing.Size(190, 22); + _mMenInfoForum.Text = Language.strMenuSupportForum; + _mMenInfoForum.Click += mMenInfoForum_Click; + // + // mMenInfoBugReport + // + _mMenInfoBugReport.Image = Resources.Bug; + _mMenInfoBugReport.Name = "mMenInfoBugReport"; + _mMenInfoBugReport.Size = new System.Drawing.Size(190, 22); + _mMenInfoBugReport.Text = Language.strMenuReportBug; + _mMenInfoBugReport.Click += mMenInfoBugReport_Click; + // + // ToolStripSeparator2 + // + _toolStripSeparator2.Name = "ToolStripSeparator2"; + _toolStripSeparator2.Size = new System.Drawing.Size(187, 6); + // + // mMenToolsUpdate + // + _mMenToolsUpdate.Image = Resources.Update; + _mMenToolsUpdate.Name = "mMenToolsUpdate"; + _mMenToolsUpdate.Size = new System.Drawing.Size(190, 22); + _mMenToolsUpdate.Text = Language.strMenuCheckForUpdates; + _mMenToolsUpdate.Click += mMenToolsUpdate_Click; + // + // mMenInfoSep2 + // + _mMenInfoSep2.Name = "mMenInfoSep2"; + _mMenInfoSep2.Size = new System.Drawing.Size(187, 6); + // + // mMenInfoAbout + // + _mMenInfoAbout.Image = Resources.mRemote; + _mMenInfoAbout.Name = "mMenInfoAbout"; + _mMenInfoAbout.Size = new System.Drawing.Size(190, 22); + _mMenInfoAbout.Text = Language.strMenuAbout; + _mMenInfoAbout.Click += mMenInfoAbout_Click; + } + + #region Info + private void mMenToolsUpdate_Click(object sender, EventArgs e) + { + Windows.Show(WindowType.Update); + } + private void mMenInfoHelp_Click(object sender, EventArgs e) + { + Windows.Show(WindowType.Help); + } + + private void mMenInfoForum_Click(object sender, EventArgs e) + { + Runtime.GoToForum(); + } + + private void mMenInfoBugReport_Click(object sender, EventArgs e) + { + Runtime.GoToBugs(); + } + + private void mMenInfoWebsite_Click(object sender, EventArgs e) + { + Runtime.GoToWebsite(); + } + + private void mMenInfoDonate_Click(object sender, EventArgs e) + { + Runtime.GoToDonate(); + } + + private void mMenInfoAbout_Click(object sender, EventArgs e) + { + Windows.Show(WindowType.About); + } + #endregion } -} +} \ No newline at end of file