diff --git a/mRemoteNG/Properties/Resources.Designer.cs b/mRemoteNG/Properties/Resources.Designer.cs
index b2f72b4e1..269528cc7 100644
--- a/mRemoteNG/Properties/Resources.Designer.cs
+++ b/mRemoteNG/Properties/Resources.Designer.cs
@@ -70,6 +70,16 @@ namespace mRemoteNG.Properties {
}
}
+ ///
+ /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap Add_16x {
+ get {
+ object obj = ResourceManager.GetObject("Add_16x", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
///
@@ -330,26 +340,6 @@ namespace mRemoteNG.Properties {
}
}
- ///
- /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
- ///
- internal static System.Drawing.Bitmap ExtApp_Add {
- get {
- object obj = ResourceManager.GetObject("ExtApp_Add", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
- ///
- internal static System.Drawing.Bitmap ExtApp_Delete {
- get {
- object obj = ResourceManager.GetObject("ExtApp_Delete", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
///
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
///
@@ -360,16 +350,6 @@ namespace mRemoteNG.Properties {
}
}
- ///
- /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
- ///
- internal static System.Drawing.Bitmap ExtApp_Start {
- get {
- object obj = ResourceManager.GetObject("ExtApp_Start", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
///
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
///
@@ -623,29 +603,9 @@ namespace mRemoteNG.Properties {
///
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
///
- internal static System.Drawing.Bitmap Monitor {
+ internal static System.Drawing.Bitmap Monitor_16x {
get {
- object obj = ResourceManager.GetObject("Monitor", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
- ///
- internal static System.Drawing.Bitmap monitor_delete {
- get {
- object obj = ResourceManager.GetObject("monitor_delete", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
- ///
- internal static System.Drawing.Bitmap monitor_go {
- get {
- object obj = ResourceManager.GetObject("monitor_go", resourceCulture);
+ object obj = ResourceManager.GetObject("Monitor_16x", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@@ -856,6 +816,16 @@ namespace mRemoteNG.Properties {
}
}
+ ///
+ /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap Remove_16x {
+ get {
+ object obj = ResourceManager.GetObject("Remove_16x", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
///
@@ -866,6 +836,16 @@ namespace mRemoteNG.Properties {
}
}
+ ///
+ /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap Resize_16x {
+ get {
+ object obj = ResourceManager.GetObject("Resize_16x", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
///
@@ -986,16 +966,6 @@ namespace mRemoteNG.Properties {
}
}
- ///
- /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
- ///
- internal static System.Drawing.Bitmap SmartSize {
- get {
- object obj = ResourceManager.GetObject("SmartSize", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
///
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
///
diff --git a/mRemoteNG/Properties/Resources.resx b/mRemoteNG/Properties/Resources.resx
index 144d4f510..630826af1 100644
--- a/mRemoteNG/Properties/Resources.resx
+++ b/mRemoteNG/Properties/Resources.resx
@@ -148,15 +148,6 @@
..\Resources\Images\Connection_Duplicate.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\Images\ExtApp_Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\Images\ExtApp_Delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\Images\ExtApp_Start.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\Images\Page.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -169,15 +160,9 @@
..\Resources\Images\Sessions.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\Images\SmartSize.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\Images\Inheritance_Default.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\Images\Monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\Images\Bad_Symbol.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -187,12 +172,6 @@
..\Resources\Images\News.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\ConnectedOverlay.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -454,4 +433,16 @@
..\Resources\Close_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\Add_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\Monitor_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\Remove_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\Resize_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/Add_16x.png b/mRemoteNG/Resources/Add_16x.png
new file mode 100644
index 000000000..7754d65e5
Binary files /dev/null and b/mRemoteNG/Resources/Add_16x.png differ
diff --git a/mRemoteNG/Resources/Images/ExtApp_Add.png b/mRemoteNG/Resources/Images/ExtApp_Add.png
deleted file mode 100644
index 4c2875304..000000000
Binary files a/mRemoteNG/Resources/Images/ExtApp_Add.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/ExtApp_Delete.png b/mRemoteNG/Resources/Images/ExtApp_Delete.png
deleted file mode 100644
index 5f8635a6e..000000000
Binary files a/mRemoteNG/Resources/Images/ExtApp_Delete.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/ExtApp_Start.png b/mRemoteNG/Resources/Images/ExtApp_Start.png
deleted file mode 100644
index 4e9b34f67..000000000
Binary files a/mRemoteNG/Resources/Images/ExtApp_Start.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/Monitor.png b/mRemoteNG/Resources/Images/Monitor.png
deleted file mode 100644
index d040bd022..000000000
Binary files a/mRemoteNG/Resources/Images/Monitor.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/Monitor_GoTo.png b/mRemoteNG/Resources/Images/Monitor_GoTo.png
deleted file mode 100644
index 8af3eda9f..000000000
Binary files a/mRemoteNG/Resources/Images/Monitor_GoTo.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/SmartSize.png b/mRemoteNG/Resources/Images/SmartSize.png
deleted file mode 100644
index ce27fe3a0..000000000
Binary files a/mRemoteNG/Resources/Images/SmartSize.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/monitor_delete.png b/mRemoteNG/Resources/Images/monitor_delete.png
deleted file mode 100644
index 37332563f..000000000
Binary files a/mRemoteNG/Resources/Images/monitor_delete.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Images/monitor_go.png b/mRemoteNG/Resources/Images/monitor_go.png
deleted file mode 100644
index 8af3eda9f..000000000
Binary files a/mRemoteNG/Resources/Images/monitor_go.png and /dev/null differ
diff --git a/mRemoteNG/Resources/Monitor_16x.png b/mRemoteNG/Resources/Monitor_16x.png
new file mode 100644
index 000000000..98b9a820c
Binary files /dev/null and b/mRemoteNG/Resources/Monitor_16x.png differ
diff --git a/mRemoteNG/Resources/Remove_16x.png b/mRemoteNG/Resources/Remove_16x.png
new file mode 100644
index 000000000..3adee77dd
Binary files /dev/null and b/mRemoteNG/Resources/Remove_16x.png differ
diff --git a/mRemoteNG/Resources/Resize_16x.png b/mRemoteNG/Resources/Resize_16x.png
new file mode 100644
index 000000000..3ae7b38b6
Binary files /dev/null and b/mRemoteNG/Resources/Resize_16x.png differ
diff --git a/mRemoteNG/UI/Controls/ConnectionContextMenu.cs b/mRemoteNG/UI/Controls/ConnectionContextMenu.cs
index ae88f8d8f..74b839078 100644
--- a/mRemoteNG/UI/Controls/ConnectionContextMenu.cs
+++ b/mRemoteNG/UI/Controls/ConnectionContextMenu.cs
@@ -169,7 +169,6 @@ namespace mRemoteNG.UI.Controls
//
// cMenTreeConnectWithOptionsConnectToConsoleSession
//
- _cMenTreeConnectWithOptionsConnectToConsoleSession.Image = Properties.Resources.monitor_go;
_cMenTreeConnectWithOptionsConnectToConsoleSession.Name =
"_cMenTreeConnectWithOptionsConnectToConsoleSession";
_cMenTreeConnectWithOptionsConnectToConsoleSession.Size = new System.Drawing.Size(245, 22);
@@ -178,7 +177,6 @@ namespace mRemoteNG.UI.Controls
//
// cMenTreeConnectWithOptionsDontConnectToConsoleSession
//
- _cMenTreeConnectWithOptionsDontConnectToConsoleSession.Image = Properties.Resources.monitor_delete;
_cMenTreeConnectWithOptionsDontConnectToConsoleSession.Name =
"_cMenTreeConnectWithOptionsDontConnectToConsoleSession";
_cMenTreeConnectWithOptionsDontConnectToConsoleSession.Size = new System.Drawing.Size(245, 22);
diff --git a/mRemoteNG/UI/Panels/PanelAdder.cs b/mRemoteNG/UI/Panels/PanelAdder.cs
index ea442d8af..233bc2100 100644
--- a/mRemoteNG/UI/Panels/PanelAdder.cs
+++ b/mRemoteNG/UI/Panels/PanelAdder.cs
@@ -70,7 +70,7 @@ namespace mRemoteNG.UI.Panels
var cMenScreens = new ToolStripMenuItem
{
Text = Language.SendTo,
- Image = Properties.Resources.Monitor,
+ Image = Properties.Resources.Monitor_16x,
Tag = pnlcForm
};
cMenScreens.DropDownItems.Add("Dummy");
@@ -145,7 +145,7 @@ namespace mRemoteNG.UI.Panels
var cMenScreen = new ToolStripMenuItem(Language.Screen + " " + Convert.ToString(i + 1))
{
Tag = new ArrayList(),
- Image = Properties.Resources.monitor_go
+ Image = Properties.Resources.Monitor_16x
};
((ArrayList)cMenScreen.Tag).Add(Screen.AllScreens[i]);
((ArrayList)cMenScreen.Tag).Add(cMenScreens.Tag);
diff --git a/mRemoteNG/UI/Window/ConnectionWindow.Designer.cs b/mRemoteNG/UI/Window/ConnectionWindow.Designer.cs
index bcf516128..39b2f5c13 100644
--- a/mRemoteNG/UI/Window/ConnectionWindow.Designer.cs
+++ b/mRemoteNG/UI/Window/ConnectionWindow.Designer.cs
@@ -148,7 +148,7 @@ namespace mRemoteNG.UI.Window
//
// cmenTabSmartSize
//
- this.cmenTabSmartSize.Image = global::mRemoteNG.Properties.Resources.SmartSize;
+ this.cmenTabSmartSize.Image = global::mRemoteNG.Properties.Resources.Resize_16x;
this.cmenTabSmartSize.Name = "cmenTabSmartSize";
this.cmenTabSmartSize.Size = new System.Drawing.Size(230, 22);
this.cmenTabSmartSize.Text = "SmartSize (RDP/VNC)";
diff --git a/mRemoteNG/UI/Window/ExternalToolsWindow.Designer.cs b/mRemoteNG/UI/Window/ExternalToolsWindow.Designer.cs
index 559931f12..4d88aaf91 100644
--- a/mRemoteNG/UI/Window/ExternalToolsWindow.Designer.cs
+++ b/mRemoteNG/UI/Window/ExternalToolsWindow.Designer.cs
@@ -215,7 +215,7 @@ namespace mRemoteNG.UI.Window
//
// NewToolMenuItem
//
- this.NewToolMenuItem.Image = global::mRemoteNG.Properties.Resources.ExtApp_Add;
+ this.NewToolMenuItem.Image = global::mRemoteNG.Properties.Resources.Add_16x;
this.NewToolMenuItem.Name = "NewToolMenuItem";
this.NewToolMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F4)));
this.NewToolMenuItem.Size = new System.Drawing.Size(219, 22);
@@ -225,7 +225,7 @@ namespace mRemoteNG.UI.Window
// DeleteToolMenuItem
//
this.DeleteToolMenuItem.Enabled = false;
- this.DeleteToolMenuItem.Image = global::mRemoteNG.Properties.Resources.ExtApp_Delete;
+ this.DeleteToolMenuItem.Image = global::mRemoteNG.Properties.Resources.Remove_16x;
this.DeleteToolMenuItem.Name = "DeleteToolMenuItem";
this.DeleteToolMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete;
this.DeleteToolMenuItem.Size = new System.Drawing.Size(219, 22);
@@ -240,7 +240,7 @@ namespace mRemoteNG.UI.Window
// LaunchToolMenuItem
//
this.LaunchToolMenuItem.Enabled = false;
- this.LaunchToolMenuItem.Image = global::mRemoteNG.Properties.Resources.ExtApp_Start;
+ this.LaunchToolMenuItem.Image = global::mRemoteNG.Properties.Resources.Run_16x;
this.LaunchToolMenuItem.Name = "LaunchToolMenuItem";
this.LaunchToolMenuItem.Size = new System.Drawing.Size(219, 22);
this.LaunchToolMenuItem.Text = "Launch External Tool";
@@ -517,7 +517,7 @@ namespace mRemoteNG.UI.Window
//
// NewToolToolstripButton
//
- this.NewToolToolstripButton.Image = global::mRemoteNG.Properties.Resources.ExtApp_Add;
+ this.NewToolToolstripButton.Image = global::mRemoteNG.Properties.Resources.Add_16x;
this.NewToolToolstripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.NewToolToolstripButton.Name = "NewToolToolstripButton";
this.NewToolToolstripButton.Size = new System.Drawing.Size(51, 22);
@@ -527,7 +527,7 @@ namespace mRemoteNG.UI.Window
// DeleteToolToolstripButton
//
this.DeleteToolToolstripButton.Enabled = false;
- this.DeleteToolToolstripButton.Image = global::mRemoteNG.Properties.Resources.ExtApp_Delete;
+ this.DeleteToolToolstripButton.Image = global::mRemoteNG.Properties.Resources.Remove_16x;
this.DeleteToolToolstripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.DeleteToolToolstripButton.Name = "DeleteToolToolstripButton";
this.DeleteToolToolstripButton.Size = new System.Drawing.Size(60, 22);
@@ -542,7 +542,7 @@ namespace mRemoteNG.UI.Window
// LaunchToolToolstripButton
//
this.LaunchToolToolstripButton.Enabled = false;
- this.LaunchToolToolstripButton.Image = global::mRemoteNG.Properties.Resources.ExtApp_Start;
+ this.LaunchToolToolstripButton.Image = global::mRemoteNG.Properties.Resources.Run_16x;
this.LaunchToolToolstripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.LaunchToolToolstripButton.Name = "LaunchToolToolstripButton";
this.LaunchToolToolstripButton.Size = new System.Drawing.Size(66, 22);
diff --git a/mRemoteNG/mRemoteNG.csproj b/mRemoteNG/mRemoteNG.csproj
index 222ca2e22..ed5316e12 100644
--- a/mRemoteNG/mRemoteNG.csproj
+++ b/mRemoteNG/mRemoteNG.csproj
@@ -1143,19 +1143,11 @@
-
-
-
-
-
-
-
-
@@ -1206,6 +1198,10 @@
+
+
+
+
Designer
PreserveNewest