diff --git a/mRemoteNG/Properties/Resources.Designer.cs b/mRemoteNG/Properties/Resources.Designer.cs index eb2970f2..b2f72b4e 100644 --- a/mRemoteNG/Properties/Resources.Designer.cs +++ b/mRemoteNG/Properties/Resources.Designer.cs @@ -100,16 +100,6 @@ namespace mRemoteNG.Properties { } } - /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap application_side_tree { - get { - object obj = ResourceManager.GetObject("application_side_tree", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// @@ -133,9 +123,9 @@ namespace mRemoteNG.Properties { /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap CloseSolution_16x { + internal static System.Drawing.Bitmap Close_16x { get { - object obj = ResourceManager.GetObject("CloseSolution_16x", resourceCulture); + object obj = ResourceManager.GetObject("Close_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -143,9 +133,9 @@ namespace mRemoteNG.Properties { /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap cog_error { + internal static System.Drawing.Bitmap CloseSolution_16x { get { - object obj = ResourceManager.GetObject("cog_error", resourceCulture); + object obj = ResourceManager.GetObject("CloseSolution_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -240,16 +230,6 @@ namespace mRemoteNG.Properties { } } - /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Delete { - get { - object obj = ResourceManager.GetObject("Delete", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// @@ -280,16 +260,6 @@ namespace mRemoteNG.Properties { } } - /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Duplicate { - get { - object obj = ResourceManager.GetObject("Duplicate", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol). /// @@ -420,16 +390,6 @@ namespace mRemoteNG.Properties { } } - /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap folder_key { - get { - object obj = ResourceManager.GetObject("folder_key", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// @@ -916,6 +876,16 @@ namespace mRemoteNG.Properties { } } + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Run_16x { + get { + object obj = ResourceManager.GetObject("Run_16x", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// @@ -1069,19 +1039,9 @@ namespace mRemoteNG.Properties { /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap StatusRun_16x { + internal static System.Drawing.Bitmap Stop_16x { get { - object obj = ResourceManager.GetObject("StatusRun_16x", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap StatusStop_16x { - get { - object obj = ResourceManager.GetObject("StatusStop_16x", resourceCulture); + object obj = ResourceManager.GetObject("Stop_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } diff --git a/mRemoteNG/Properties/Resources.resx b/mRemoteNG/Properties/Resources.resx index 1aba8050..144d4f51 100644 --- a/mRemoteNG/Properties/Resources.resx +++ b/mRemoteNG/Properties/Resources.resx @@ -133,9 +133,6 @@ ..\Resources\Images\ErrorsAndInfos.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Images\Delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Images\Inheritance.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -190,21 +187,12 @@ ..\Resources\Images\News.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Images\application_side_tree.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\cog_error.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Images\monitor_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Images\monitor_go.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Images\folder_key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\ConnectedOverlay.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -310,9 +298,6 @@ ..\Icons\PowerShell.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Images\Duplicate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Images\Error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -427,12 +412,6 @@ ..\Resources\SortDescending_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\StatusRun_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\StatusStop_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Test_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -466,4 +445,13 @@ ..\Resources\Panel_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Run_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Stop_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Close_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/mRemoteNG/Resources/Close_16x.png b/mRemoteNG/Resources/Close_16x.png new file mode 100644 index 00000000..6760c5a4 Binary files /dev/null and b/mRemoteNG/Resources/Close_16x.png differ diff --git a/mRemoteNG/Resources/Images/Delete.png b/mRemoteNG/Resources/Images/Delete.png deleted file mode 100644 index 1514d51a..00000000 Binary files a/mRemoteNG/Resources/Images/Delete.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Duplicate.png b/mRemoteNG/Resources/Images/Duplicate.png deleted file mode 100644 index 36635f0b..00000000 Binary files a/mRemoteNG/Resources/Images/Duplicate.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/application_side_tree.png b/mRemoteNG/Resources/Images/application_side_tree.png deleted file mode 100644 index f04a52b3..00000000 Binary files a/mRemoteNG/Resources/Images/application_side_tree.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/cog_error.png b/mRemoteNG/Resources/Images/cog_error.png deleted file mode 100644 index 47667430..00000000 Binary files a/mRemoteNG/Resources/Images/cog_error.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/folder_key.png b/mRemoteNG/Resources/Images/folder_key.png deleted file mode 100644 index fb9b4c2b..00000000 Binary files a/mRemoteNG/Resources/Images/folder_key.png and /dev/null differ diff --git a/mRemoteNG/Resources/Run_16x.png b/mRemoteNG/Resources/Run_16x.png new file mode 100644 index 00000000..a5634bca Binary files /dev/null and b/mRemoteNG/Resources/Run_16x.png differ diff --git a/mRemoteNG/Resources/StatusRun_16x.png b/mRemoteNG/Resources/StatusRun_16x.png deleted file mode 100644 index 5e025e60..00000000 Binary files a/mRemoteNG/Resources/StatusRun_16x.png and /dev/null differ diff --git a/mRemoteNG/Resources/StatusStop_16x.png b/mRemoteNG/Resources/StatusStop_16x.png deleted file mode 100644 index ada5c44e..00000000 Binary files a/mRemoteNG/Resources/StatusStop_16x.png and /dev/null differ diff --git a/mRemoteNG/Resources/Stop_16x.png b/mRemoteNG/Resources/Stop_16x.png new file mode 100644 index 00000000..2ab785e3 Binary files /dev/null and b/mRemoteNG/Resources/Stop_16x.png differ diff --git a/mRemoteNG/Tools/ConnectionsTreeToMenuItemsConverter.cs b/mRemoteNG/Tools/ConnectionsTreeToMenuItemsConverter.cs index 7f4dbd7c..109d1995 100644 --- a/mRemoteNG/Tools/ConnectionsTreeToMenuItemsConverter.cs +++ b/mRemoteNG/Tools/ConnectionsTreeToMenuItemsConverter.cs @@ -67,7 +67,7 @@ namespace mRemoteNG.Tools } else if (node.GetTreeNodeType() == TreeNodeType.Connection) { - menuItem.Image = node.OpenConnections.Count > 0 ? Properties.Resources.StatusRun_16x : Properties.Resources.StatusStop_16x; + menuItem.Image = node.OpenConnections.Count > 0 ? Properties.Resources.Run_16x : Properties.Resources.Stop_16x; menuItem.Tag = node; } diff --git a/mRemoteNG/UI/Controls/ConnectionContextMenu.cs b/mRemoteNG/UI/Controls/ConnectionContextMenu.cs index 886d20fa..ae88f8d8 100644 --- a/mRemoteNG/UI/Controls/ConnectionContextMenu.cs +++ b/mRemoteNG/UI/Controls/ConnectionContextMenu.cs @@ -146,7 +146,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeConnect // - _cMenTreeConnect.Image = Properties.Resources.StatusRun_16x; + _cMenTreeConnect.Image = Properties.Resources.Run_16x; _cMenTreeConnect.Name = "_cMenTreeConnect"; _cMenTreeConnect.Size = new System.Drawing.Size(199, 22); _cMenTreeConnect.Text = "Connect"; @@ -222,7 +222,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeDisconnect // - _cMenTreeDisconnect.Image = Properties.Resources.StatusStop_16x; + _cMenTreeDisconnect.Image = Properties.Resources.Stop_16x; _cMenTreeDisconnect.Name = "_cMenTreeDisconnect"; _cMenTreeDisconnect.Size = new System.Drawing.Size(199, 22); _cMenTreeDisconnect.Text = "Disconnect"; @@ -271,7 +271,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeDelete // - _cMenTreeDelete.Image = Properties.Resources.Delete; + _cMenTreeDelete.Image = Properties.Resources.Close_16x; _cMenTreeDelete.Name = "_cMenTreeDelete"; _cMenTreeDelete.Size = new System.Drawing.Size(199, 22); _cMenTreeDelete.Text = "Delete"; diff --git a/mRemoteNG/UI/Controls/QuickConnectToolStrip.cs b/mRemoteNG/UI/Controls/QuickConnectToolStrip.cs index 4c0997ef..7fa5e2d0 100644 --- a/mRemoteNG/UI/Controls/QuickConnectToolStrip.cs +++ b/mRemoteNG/UI/Controls/QuickConnectToolStrip.cs @@ -106,7 +106,7 @@ namespace mRemoteNG.UI.Controls // btnQuickConnect // _btnQuickConnect.DropDown = _mnuQuickConnectProtocol; - _btnQuickConnect.Image = Properties.Resources.StatusRun_16x; + _btnQuickConnect.Image = Properties.Resources.Run_16x; _btnQuickConnect.ImageTransparentColor = Color.Magenta; _btnQuickConnect.Margin = new Padding(0, 1, 3, 2); _btnQuickConnect.Name = "btnQuickConnect"; @@ -270,7 +270,7 @@ namespace mRemoteNG.UI.Controls { Text = containerInfo.Name, Tag = containerInfo, - Image = containerInfo.OpenConnections.Count > 0 ? Properties.Resources.StatusRun_16x : Properties.Resources.StatusStop_16x + Image = containerInfo.OpenConnections.Count > 0 ? Properties.Resources.Run_16x : Properties.Resources.Stop_16x }; favoriteMenuItem.MouseUp += ConnectionsMenuItem_MouseUp; favoritesList.Add(favoriteMenuItem); diff --git a/mRemoteNG/UI/Controls/mrngSearchBox.cs b/mRemoteNG/UI/Controls/mrngSearchBox.cs index 29d5c234..eab3887d 100644 --- a/mRemoteNG/UI/Controls/mrngSearchBox.cs +++ b/mRemoteNG/UI/Controls/mrngSearchBox.cs @@ -27,7 +27,7 @@ namespace mRemoteNG.UI.Controls private void AddClearButton() { - _pbClear.Image = Properties.Resources.Delete; + _pbClear.Image = Properties.Resources.Close_16x; _pbClear.Width = 20; _pbClear.Dock = DockStyle.Right; _pbClear.Cursor = Cursors.Default; diff --git a/mRemoteNG/UI/Window/ConnectionTreeWindow.cs b/mRemoteNG/UI/Window/ConnectionTreeWindow.cs index 279e9f10..b395b2f7 100644 --- a/mRemoteNG/UI/Window/ConnectionTreeWindow.cs +++ b/mRemoteNG/UI/Window/ConnectionTreeWindow.cs @@ -221,7 +221,7 @@ namespace mRemoteNG.UI.Window { Text = containerInfo.Name, Tag = containerInfo, - Image = containerInfo.OpenConnections.Count > 0 ? Properties.Resources.StatusRun_16x : Properties.Resources.StatusStop_16x + Image = containerInfo.OpenConnections.Count > 0 ? Properties.Resources.Run_16x : Properties.Resources.Stop_16x }; favoriteMenuItem.MouseUp += FavoriteMenuItem_MouseUp; favoritesList.Add(favoriteMenuItem); diff --git a/mRemoteNG/UI/Window/ErrorAndInfoWindow.Designer.cs b/mRemoteNG/UI/Window/ErrorAndInfoWindow.Designer.cs index b4329db4..34768f8e 100644 --- a/mRemoteNG/UI/Window/ErrorAndInfoWindow.Designer.cs +++ b/mRemoteNG/UI/Window/ErrorAndInfoWindow.Designer.cs @@ -107,7 +107,7 @@ namespace mRemoteNG.UI.Window // // cMenMCDelete // - this.cMenMCDelete.Image = global::mRemoteNG.Properties.Resources.Delete; + this.cMenMCDelete.Image = global::mRemoteNG.Properties.Resources.Close_16x; this.cMenMCDelete.Name = "cMenMCDelete"; this.cMenMCDelete.ShortcutKeys = System.Windows.Forms.Keys.Delete; this.cMenMCDelete.Size = new System.Drawing.Size(140, 22); diff --git a/mRemoteNG/mRemoteNG.csproj b/mRemoteNG/mRemoteNG.csproj index d6335f60..222ca2e2 100644 --- a/mRemoteNG/mRemoteNG.csproj +++ b/mRemoteNG/mRemoteNG.csproj @@ -1141,14 +1141,11 @@ PreserveNewest - - - @@ -1194,8 +1191,6 @@ - - @@ -1208,6 +1203,9 @@ + + + Designer PreserveNewest @@ -1225,7 +1223,6 @@ - @@ -1328,7 +1325,6 @@ -