From 0ee173475eb5bf9737cbfa6886b7f673b05df76d Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Sun, 10 Mar 2019 16:31:55 +0100 Subject: [PATCH 1/4] introduced new user control --- mRemoteV1/UI/Controls/Base/NGSearchBox.cs | 25 ++++ mRemoteV1/UI/Controls/Base/NGSearchBox.resx | 123 ++++++++++++++++++ .../Window/ConnectionTreeWindow.Designer.cs | 6 +- mRemoteV1/mRemoteV1.csproj | 6 + 4 files changed, 157 insertions(+), 3 deletions(-) create mode 100644 mRemoteV1/UI/Controls/Base/NGSearchBox.cs create mode 100644 mRemoteV1/UI/Controls/Base/NGSearchBox.resx diff --git a/mRemoteV1/UI/Controls/Base/NGSearchBox.cs b/mRemoteV1/UI/Controls/Base/NGSearchBox.cs new file mode 100644 index 000000000..fa9dc4d92 --- /dev/null +++ b/mRemoteV1/UI/Controls/Base/NGSearchBox.cs @@ -0,0 +1,25 @@ +using System; +using System.Drawing; +using System.Windows.Forms; +using mRemoteNG.Themes; + +namespace mRemoteNG.UI.Controls.Base +{ + public class NGSearchBox : NGTextBox + { + public NGSearchBox() + { + InitializeComponent(); + } + + private void InitializeComponent() + { + SuspendLayout(); + // + // NGTextBox + // + Font = new Font("Segoe UI", 8.25F, FontStyle.Regular, GraphicsUnit.Point, 0); + ResumeLayout(false); + } + } +} \ No newline at end of file diff --git a/mRemoteV1/UI/Controls/Base/NGSearchBox.resx b/mRemoteV1/UI/Controls/Base/NGSearchBox.resx new file mode 100644 index 000000000..e5858cc29 --- /dev/null +++ b/mRemoteV1/UI/Controls/Base/NGSearchBox.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + False + + \ No newline at end of file diff --git a/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs b/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs index 821c74960..d25d46f53 100644 --- a/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs +++ b/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs @@ -1,4 +1,4 @@ - + using mRemoteNG.Connection; using mRemoteNG.Tree; @@ -31,7 +31,7 @@ namespace mRemoteNG.UI.Window this.mMenSortAscending = new System.Windows.Forms.ToolStripMenuItem(); this.vsToolStripExtender = new WeifenLuo.WinFormsUI.Docking.VisualStudioToolStripExtender(this.components); this.PictureBoxSearch = new mRemoteNG.UI.Controls.Base.NGPictureBox(this.components); - this.txtSearch = new mRemoteNG.UI.Controls.Base.NGTextBox(); + this.txtSearch = new mRemoteNG.UI.Controls.Base.NGSearchBox(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.mMenFavorites = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.olvConnections)).BeginInit(); @@ -222,7 +222,7 @@ namespace mRemoteNG.UI.Window private Controls.ConnectionTree olvConnections; private WeifenLuo.WinFormsUI.Docking.VisualStudioToolStripExtender vsToolStripExtender; internal Controls.Base.NGPictureBox PictureBoxSearch; - internal Controls.Base.NGTextBox txtSearch; + internal Controls.Base.NGSearchBox txtSearch; public System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; internal System.Windows.Forms.ToolStripMenuItem mMenFavorites; } diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj index d59dab423..adbbc84d5 100644 --- a/mRemoteV1/mRemoteV1.csproj +++ b/mRemoteV1/mRemoteV1.csproj @@ -395,6 +395,9 @@ Component + + Component + Component @@ -835,6 +838,9 @@ NGRadioButton.cs + + NGSearchBox.cs + NGTextBox.cs From 01f4af6876edb38632eea155af6d4214ec572937 Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Sun, 10 Mar 2019 16:51:46 +0100 Subject: [PATCH 2/4] fixed background color of picturebox --- .../Window/ConnectionTreeWindow.Designer.cs | 28 +++++++++---------- mRemoteV1/UI/Window/ConnectionTreeWindow.cs | 4 ++- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs b/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs index d25d46f53..93f38ea75 100644 --- a/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs +++ b/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs @@ -30,13 +30,13 @@ namespace mRemoteNG.UI.Window this.mMenViewCollapseAllFolders = new System.Windows.Forms.ToolStripMenuItem(); this.mMenSortAscending = new System.Windows.Forms.ToolStripMenuItem(); this.vsToolStripExtender = new WeifenLuo.WinFormsUI.Docking.VisualStudioToolStripExtender(this.components); - this.PictureBoxSearch = new mRemoteNG.UI.Controls.Base.NGPictureBox(this.components); + this.pbSearch = new mRemoteNG.UI.Controls.Base.NGPictureBox(this.components); this.txtSearch = new mRemoteNG.UI.Controls.Base.NGSearchBox(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.mMenFavorites = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.olvConnections)).BeginInit(); this.msMain.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBoxSearch)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pbSearch)).BeginInit(); this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // @@ -139,15 +139,15 @@ namespace mRemoteNG.UI.Window // // PictureBoxSearch // - this.PictureBoxSearch.Dock = System.Windows.Forms.DockStyle.Fill; - this.PictureBoxSearch.Image = global::mRemoteNG.Resources.Search; - this.PictureBoxSearch.Location = new System.Drawing.Point(0, 0); - this.PictureBoxSearch.Margin = new System.Windows.Forms.Padding(0); - this.PictureBoxSearch.Name = "PictureBoxSearch"; - this.PictureBoxSearch.Size = new System.Drawing.Size(26, 21); - this.PictureBoxSearch.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.PictureBoxSearch.TabIndex = 1; - this.PictureBoxSearch.TabStop = false; + this.pbSearch.Dock = System.Windows.Forms.DockStyle.Fill; + this.pbSearch.Image = global::mRemoteNG.Resources.Search; + this.pbSearch.Location = new System.Drawing.Point(0, 0); + this.pbSearch.Margin = new System.Windows.Forms.Padding(0); + this.pbSearch.Name = "PictureBoxSearch"; + this.pbSearch.Size = new System.Drawing.Size(26, 21); + this.pbSearch.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.pbSearch.TabIndex = 1; + this.pbSearch.TabStop = false; // // txtSearch // @@ -173,7 +173,7 @@ namespace mRemoteNG.UI.Window this.tableLayoutPanel1.ColumnCount = 2; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 26F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.PictureBoxSearch, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.pbSearch, 0, 0); this.tableLayoutPanel1.Controls.Add(this.txtSearch); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 390); @@ -209,7 +209,7 @@ namespace mRemoteNG.UI.Window ((System.ComponentModel.ISupportInitialize)(this.olvConnections)).EndInit(); this.msMain.ResumeLayout(false); this.msMain.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBoxSearch)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pbSearch)).EndInit(); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); this.ResumeLayout(false); @@ -221,7 +221,7 @@ namespace mRemoteNG.UI.Window private System.ComponentModel.IContainer components; private Controls.ConnectionTree olvConnections; private WeifenLuo.WinFormsUI.Docking.VisualStudioToolStripExtender vsToolStripExtender; - internal Controls.Base.NGPictureBox PictureBoxSearch; + internal Controls.Base.NGPictureBox pbSearch; internal Controls.Base.NGSearchBox txtSearch; public System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; internal System.Windows.Forms.ToolStripMenuItem mMenFavorites; diff --git a/mRemoteV1/UI/Window/ConnectionTreeWindow.cs b/mRemoteV1/UI/Window/ConnectionTreeWindow.cs index b3723d319..5efbe9fae 100644 --- a/mRemoteV1/UI/Window/ConnectionTreeWindow.cs +++ b/mRemoteV1/UI/Window/ConnectionTreeWindow.cs @@ -103,7 +103,7 @@ namespace mRemoteNG.UI.Window _themeManager.ActiveTheme.Theme); if (!_themeManager.ActiveAndExtended) return; - //Treelistview need to be manually themed + //Treelistview needs to be manually themed olvConnections.BackColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("TreeView_Background"); olvConnections.ForeColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("TreeView_Foreground"); olvConnections.SelectedBackColor = @@ -117,6 +117,8 @@ namespace mRemoteNG.UI.Window //There is a border around txtSearch that dont theme well txtSearch.BackColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("TextBox_Background"); txtSearch.ForeColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("TextBox_Foreground"); + //Picturebox needs to be manually themed + pbSearch.BackColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("TreeView_Background"); } #endregion From 6ba1d28f1315891fc040441122618e71030695b4 Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Sun, 10 Mar 2019 18:20:15 +0100 Subject: [PATCH 3/4] added logic for clear button --- .../Resources/Language/Language.Designer.cs | 9 +++ mRemoteV1/Resources/Language/Language.de.resx | 3 + mRemoteV1/Resources/Language/Language.resx | 3 + mRemoteV1/UI/Controls/Base/NGSearchBox.cs | 55 +++++++++++++++++-- .../Window/ConnectionTreeWindow.Designer.cs | 2 - mRemoteV1/UI/Window/ConnectionTreeWindow.cs | 24 +------- 6 files changed, 67 insertions(+), 29 deletions(-) diff --git a/mRemoteV1/Resources/Language/Language.Designer.cs b/mRemoteV1/Resources/Language/Language.Designer.cs index d0431b915..7bc5a91ff 100644 --- a/mRemoteV1/Resources/Language/Language.Designer.cs +++ b/mRemoteV1/Resources/Language/Language.Designer.cs @@ -78,6 +78,15 @@ namespace mRemoteNG { } } + /// + /// Looks up a localized string similar to Clear search string. + /// + internal static string ClearSearchString { + get { + return ResourceManager.GetString("ClearSearchString", resourceCulture); + } + } + /// /// Looks up a localized string similar to Create a New Connection File. /// diff --git a/mRemoteV1/Resources/Language/Language.de.resx b/mRemoteV1/Resources/Language/Language.de.resx index ca3d30256..6c3375403 100644 --- a/mRemoteV1/Resources/Language/Language.de.resx +++ b/mRemoteV1/Resources/Language/Language.de.resx @@ -2660,4 +2660,7 @@ Development umfasst Alphas, Betas und Release Candidates. Favoriten + + Suchbegriff löschen + \ No newline at end of file diff --git a/mRemoteV1/Resources/Language/Language.resx b/mRemoteV1/Resources/Language/Language.resx index 6cf2ec228..4a69435a5 100644 --- a/mRemoteV1/Resources/Language/Language.resx +++ b/mRemoteV1/Resources/Language/Language.resx @@ -2775,4 +2775,7 @@ Development Channel includes Alphas, Betas & Release Candidates. Favorites + + Clear search string + \ No newline at end of file diff --git a/mRemoteV1/UI/Controls/Base/NGSearchBox.cs b/mRemoteV1/UI/Controls/Base/NGSearchBox.cs index fa9dc4d92..7cf4f8e8b 100644 --- a/mRemoteV1/UI/Controls/Base/NGSearchBox.cs +++ b/mRemoteV1/UI/Controls/Base/NGSearchBox.cs @@ -1,25 +1,68 @@ using System; -using System.Drawing; using System.Windows.Forms; -using mRemoteNG.Themes; namespace mRemoteNG.UI.Controls.Base { public class NGSearchBox : NGTextBox { + private Button btClear = new Button(); + private ToolTip btClearToolTip = new ToolTip(); + public NGSearchBox() { InitializeComponent(); + LostFocus += FocusLost; + GotFocus += FocusGot; + AddClearButton(); + ApplyLanguage(); } + private void ApplyLanguage() + { + btClearToolTip.SetToolTip(btClear, Language.ClearSearchString); + } + + private void AddClearButton() + { + btClear.BackgroundImage = Resources.Delete; + btClear.BackgroundImageLayout = ImageLayout.Stretch; + btClear.Width = 16; + btClear.Dock = DockStyle.Right; + btClear.Click += BtClear_Click; + btClear.LostFocus += FocusLost; + Controls.Add(btClear); + } + + private void FocusLost(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(Text)) + { + Text = Language.strSearchPrompt; + btClear.Visible = false; + } + } + + private void FocusGot(object sender, EventArgs e) => Text = ""; + private void InitializeComponent() { - SuspendLayout(); + this.SuspendLayout(); // - // NGTextBox + // NGSearchBox // - Font = new Font("Segoe UI", 8.25F, FontStyle.Regular, GraphicsUnit.Point, 0); - ResumeLayout(false); + this.TextChanged += new System.EventHandler(this.NGSearchBox_TextChanged); + this.ResumeLayout(false); + + } + + private void BtClear_Click(object sender, EventArgs e) => Text = string.Empty; + + private void NGSearchBox_TextChanged(object sender, EventArgs e) + { + if (Text == Language.strSearchPrompt) + btClear.Visible = false; + else + btClear.Visible = TextLength > 0; } } } \ No newline at end of file diff --git a/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs b/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs index 93f38ea75..0bf9da74a 100644 --- a/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs +++ b/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs @@ -163,9 +163,7 @@ namespace mRemoteNG.UI.Window this.txtSearch.TabStop = false; this.txtSearch.Text = "Search"; this.txtSearch.TextChanged += new System.EventHandler(this.txtSearch_TextChanged); - this.txtSearch.GotFocus += new System.EventHandler(this.txtSearch_GotFocus); this.txtSearch.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtSearch_KeyDown); - this.txtSearch.LostFocus += new System.EventHandler(this.txtSearch_LostFocus); // // tableLayoutPanel1 // diff --git a/mRemoteV1/UI/Window/ConnectionTreeWindow.cs b/mRemoteV1/UI/Window/ConnectionTreeWindow.cs index 5efbe9fae..3f2cd103b 100644 --- a/mRemoteV1/UI/Window/ConnectionTreeWindow.cs +++ b/mRemoteV1/UI/Window/ConnectionTreeWindow.cs @@ -254,18 +254,6 @@ namespace mRemoteNG.UI.Window #region Search - private void txtSearch_GotFocus(object sender, EventArgs e) - { - if (txtSearch.Text == Language.strSearchPrompt) - txtSearch.Text = ""; - } - - private void txtSearch_LostFocus(object sender, EventArgs e) - { - if (txtSearch.Text != "") return; - txtSearch.Text = Language.strSearchPrompt; - } - private void txtSearch_KeyDown(object sender, KeyEventArgs e) { try @@ -297,9 +285,7 @@ namespace mRemoteNG.UI.Window } catch (Exception ex) { - Runtime.MessageCollector.AddExceptionStackTrace( - "txtSearch_KeyDown (UI.Window.ConnectionTreeWindow) failed", - ex); + Runtime.MessageCollector.AddExceptionStackTrace("txtSearch_KeyDown (UI.Window.ConnectionTreeWindow) failed", ex); } } @@ -362,9 +348,7 @@ namespace mRemoteNG.UI.Window } catch (Exception ex) { - Runtime.MessageCollector.AddExceptionStackTrace( - "tvConnections_KeyPress (UI.Window.ConnectionTreeWindow) failed", - ex); + Runtime.MessageCollector.AddExceptionStackTrace("tvConnections_KeyPress (UI.Window.ConnectionTreeWindow) failed", ex); } } @@ -386,9 +370,7 @@ namespace mRemoteNG.UI.Window } catch (Exception ex) { - Runtime.MessageCollector.AddExceptionStackTrace( - "tvConnections_KeyDown (UI.Window.ConnectionTreeWindow) failed", - ex); + Runtime.MessageCollector.AddExceptionStackTrace("tvConnections_KeyDown (UI.Window.ConnectionTreeWindow) failed", ex); } } From 446b40d8a6727697b1ca0e17ba4c608fc726bc8c Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Sun, 10 Mar 2019 20:16:02 +0100 Subject: [PATCH 4/4] some design improvements --- mRemoteV1/UI/Controls/Base/NGSearchBox.cs | 29 +++++++++---------- .../Window/ConnectionTreeWindow.Designer.cs | 22 +++++++------- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/mRemoteV1/UI/Controls/Base/NGSearchBox.cs b/mRemoteV1/UI/Controls/Base/NGSearchBox.cs index 7cf4f8e8b..2f891023e 100644 --- a/mRemoteV1/UI/Controls/Base/NGSearchBox.cs +++ b/mRemoteV1/UI/Controls/Base/NGSearchBox.cs @@ -1,11 +1,12 @@ using System; +using System.Drawing; using System.Windows.Forms; namespace mRemoteNG.UI.Controls.Base { public class NGSearchBox : NGTextBox { - private Button btClear = new Button(); + private PictureBox pbClear = new PictureBox(); private ToolTip btClearToolTip = new ToolTip(); public NGSearchBox() @@ -19,18 +20,18 @@ namespace mRemoteNG.UI.Controls.Base private void ApplyLanguage() { - btClearToolTip.SetToolTip(btClear, Language.ClearSearchString); + btClearToolTip.SetToolTip(pbClear, Language.ClearSearchString); } private void AddClearButton() { - btClear.BackgroundImage = Resources.Delete; - btClear.BackgroundImageLayout = ImageLayout.Stretch; - btClear.Width = 16; - btClear.Dock = DockStyle.Right; - btClear.Click += BtClear_Click; - btClear.LostFocus += FocusLost; - Controls.Add(btClear); + pbClear.Image = Resources.Delete; + pbClear.Width = 20; + pbClear.Dock = DockStyle.Right; + pbClear.Cursor = Cursors.Default; + pbClear.Click += PbClear_Click; + pbClear.LostFocus += FocusLost; + Controls.Add(pbClear); } private void FocusLost(object sender, EventArgs e) @@ -38,7 +39,7 @@ namespace mRemoteNG.UI.Controls.Base if (string.IsNullOrEmpty(Text)) { Text = Language.strSearchPrompt; - btClear.Visible = false; + pbClear.Visible = false; } } @@ -52,17 +53,13 @@ namespace mRemoteNG.UI.Controls.Base // this.TextChanged += new System.EventHandler(this.NGSearchBox_TextChanged); this.ResumeLayout(false); - } - private void BtClear_Click(object sender, EventArgs e) => Text = string.Empty; + private void PbClear_Click(object sender, EventArgs e) => Text = string.Empty; private void NGSearchBox_TextChanged(object sender, EventArgs e) { - if (Text == Language.strSearchPrompt) - btClear.Visible = false; - else - btClear.Visible = TextLength > 0; + pbClear.Visible = Text == Language.strSearchPrompt ? false : TextLength > 0; } } } \ No newline at end of file diff --git a/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs b/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs index 0bf9da74a..b1f182998 100644 --- a/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs +++ b/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs @@ -29,11 +29,11 @@ namespace mRemoteNG.UI.Window this.mMenViewExpandAllFolders = new System.Windows.Forms.ToolStripMenuItem(); this.mMenViewCollapseAllFolders = new System.Windows.Forms.ToolStripMenuItem(); this.mMenSortAscending = new System.Windows.Forms.ToolStripMenuItem(); + this.mMenFavorites = new System.Windows.Forms.ToolStripMenuItem(); this.vsToolStripExtender = new WeifenLuo.WinFormsUI.Docking.VisualStudioToolStripExtender(this.components); this.pbSearch = new mRemoteNG.UI.Controls.Base.NGPictureBox(this.components); this.txtSearch = new mRemoteNG.UI.Controls.Base.NGSearchBox(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.mMenFavorites = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.olvConnections)).BeginInit(); this.msMain.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbSearch)).BeginInit(); @@ -133,17 +133,25 @@ namespace mRemoteNG.UI.Window this.mMenSortAscending.Name = "mMenSortAscending"; this.mMenSortAscending.Size = new System.Drawing.Size(28, 20); // + // mMenFavorites + // + this.mMenFavorites.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.mMenFavorites.Image = global::mRemoteNG.Resources.star; + this.mMenFavorites.Name = "mMenFavorites"; + this.mMenFavorites.Size = new System.Drawing.Size(28, 20); + this.mMenFavorites.Text = "Favorites"; + // // vsToolStripExtender // this.vsToolStripExtender.DefaultRenderer = null; // - // PictureBoxSearch + // pbSearch // this.pbSearch.Dock = System.Windows.Forms.DockStyle.Fill; this.pbSearch.Image = global::mRemoteNG.Resources.Search; this.pbSearch.Location = new System.Drawing.Point(0, 0); this.pbSearch.Margin = new System.Windows.Forms.Padding(0); - this.pbSearch.Name = "PictureBoxSearch"; + this.pbSearch.Name = "pbSearch"; this.pbSearch.Size = new System.Drawing.Size(26, 21); this.pbSearch.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.pbSearch.TabIndex = 1; @@ -181,14 +189,6 @@ namespace mRemoteNG.UI.Window this.tableLayoutPanel1.Size = new System.Drawing.Size(204, 21); this.tableLayoutPanel1.TabIndex = 32; // - // mMenFavorites - // - this.mMenFavorites.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mMenFavorites.Image = global::mRemoteNG.Resources.star; - this.mMenFavorites.Name = "mMenFavorites"; - this.mMenFavorites.Size = new System.Drawing.Size(28, 20); - this.mMenFavorites.Text = "Favorites"; - // // ConnectionTreeWindow // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);