From caeed1518596100ee528082f99186d9b06b2b958 Mon Sep 17 00:00:00 2001 From: Ben Olden-Cooligan Date: Tue, 4 Aug 2015 03:11:44 -0400 Subject: [PATCH] Refactor icon locations back to what they were in order to fix localization. --- .../{WinForms => }/ILProfileIcons.Designer.cs | 0 NAPS2.Core/{WinForms => }/ILProfileIcons.cs | 0 NAPS2.Core/{WinForms => }/ILProfileIcons.resx | 0 NAPS2.Core/{WinForms => }/Icons.Designer.cs | 4 +- NAPS2.Core/{WinForms => }/Icons.resx | 116 +++++++++--------- NAPS2.Core/NAPS2.Core.csproj | 18 +-- NAPS2.Core/WinForms/FDesktop.Designer.cs | 48 ++++---- NAPS2.Core/WinForms/FProfiles.Designer.cs | 16 +-- 8 files changed, 101 insertions(+), 101 deletions(-) rename NAPS2.Core/{WinForms => }/ILProfileIcons.Designer.cs (100%) rename NAPS2.Core/{WinForms => }/ILProfileIcons.cs (100%) rename NAPS2.Core/{WinForms => }/ILProfileIcons.resx (100%) rename NAPS2.Core/{WinForms => }/Icons.Designer.cs (99%) rename NAPS2.Core/{WinForms => }/Icons.resx (68%) diff --git a/NAPS2.Core/WinForms/ILProfileIcons.Designer.cs b/NAPS2.Core/ILProfileIcons.Designer.cs similarity index 100% rename from NAPS2.Core/WinForms/ILProfileIcons.Designer.cs rename to NAPS2.Core/ILProfileIcons.Designer.cs diff --git a/NAPS2.Core/WinForms/ILProfileIcons.cs b/NAPS2.Core/ILProfileIcons.cs similarity index 100% rename from NAPS2.Core/WinForms/ILProfileIcons.cs rename to NAPS2.Core/ILProfileIcons.cs diff --git a/NAPS2.Core/WinForms/ILProfileIcons.resx b/NAPS2.Core/ILProfileIcons.resx similarity index 100% rename from NAPS2.Core/WinForms/ILProfileIcons.resx rename to NAPS2.Core/ILProfileIcons.resx diff --git a/NAPS2.Core/WinForms/Icons.Designer.cs b/NAPS2.Core/Icons.Designer.cs similarity index 99% rename from NAPS2.Core/WinForms/Icons.Designer.cs rename to NAPS2.Core/Icons.Designer.cs index a8f4fbbe7..f068abf1e 100644 --- a/NAPS2.Core/WinForms/Icons.Designer.cs +++ b/NAPS2.Core/Icons.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace NAPS2.WinForms { +namespace NAPS2 { using System; @@ -39,7 +39,7 @@ namespace NAPS2.WinForms { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("NAPS2.WinForms.Icons", typeof(Icons).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("NAPS2.Icons", typeof(Icons).Assembly); resourceMan = temp; } return resourceMan; diff --git a/NAPS2.Core/WinForms/Icons.resx b/NAPS2.Core/Icons.resx similarity index 68% rename from NAPS2.Core/WinForms/Icons.resx rename to NAPS2.Core/Icons.resx index 03db73fd6..4faa49242 100644 --- a/NAPS2.Core/WinForms/Icons.resx +++ b/NAPS2.Core/Icons.resx @@ -119,177 +119,177 @@ - ..\Resources\arrow_down.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\arrow_down.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\arrow_out.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\arrow_out.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\arrow_rotate_anticlockwise.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\arrow_rotate_anticlockwise.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\arrow_rotate_clockwise.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\arrow_rotate_clockwise.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\arrow_switch.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\arrow_switch.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\arrow_up.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\arrow_up.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\blueprints.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\blueprints.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\cross.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\cross.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\email_attach.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\email_attach.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\file_extension_pdf.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\file_extension_pdf.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\information.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\information.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\info_rhombus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\info_rhombus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\pdf_email.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\pdf_email.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\picture.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\picture.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\scanner.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\scanner.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\scanner.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\scanner.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\scanner-large.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\scanner-large.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\transform_flip.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\transform_flip.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\zoom_actual.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\zoom_actual.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\zoom_in.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\zoom_in.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\accept.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\accept.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\accept-small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\accept-small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\add-small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\add-small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\cancel-small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\cancel-small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\cross-small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\cross-small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\pencil-small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\pencil-small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\tick.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\tick.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\tick-small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\tick-small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\blueprints-small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\blueprints-small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\scanner-48.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\scanner-48.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\scanner-64.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\scanner-64.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\scanner-72.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\scanner-72.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\world.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\world.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\folder_picture.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\folder_picture.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\arrow_rotate_anticlockwise-small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\arrow_rotate_anticlockwise-small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\arrow_rotate_clockwise-small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\arrow_rotate_clockwise-small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\arrow_switch-small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\arrow_switch-small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\text.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\text.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\control_play_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\control_play_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\control_play_blue-small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\control_play_blue-small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\color_wheel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\color_wheel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\contrast.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\contrast.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\image_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\image_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\transform_crop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\transform_crop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\weather_sun.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\weather_sun.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\arrow_down-small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\arrow_down-small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\arrow_up-small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\arrow_up-small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\pictures.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\pictures.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\picture_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\picture_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\picture_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\picture_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\arrow_left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\arrow_left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\arrow_right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\arrow_right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\printer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\printer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/NAPS2.Core/NAPS2.Core.csproj b/NAPS2.Core/NAPS2.Core.csproj index 432ba4c23..b8ac75767 100644 --- a/NAPS2.Core/NAPS2.Core.csproj +++ b/NAPS2.Core/NAPS2.Core.csproj @@ -76,6 +76,11 @@ + + True + True + Icons.resx + @@ -130,17 +135,12 @@ - - True - True - Icons.resx - - + Component - + ILProfileIcons.cs @@ -392,12 +392,12 @@ - + ResXFileCodeGenerator Designer Icons.Designer.cs - + ILProfileIcons.cs Designer diff --git a/NAPS2.Core/WinForms/FDesktop.Designer.cs b/NAPS2.Core/WinForms/FDesktop.Designer.cs index a710ba4b0..c0f8faaaa 100644 --- a/NAPS2.Core/WinForms/FDesktop.Designer.cs +++ b/NAPS2.Core/WinForms/FDesktop.Designer.cs @@ -122,7 +122,7 @@ namespace NAPS2.WinForms // this.btnZoomIn.BackColor = System.Drawing.Color.White; resources.ApplyResources(this.btnZoomIn, "btnZoomIn"); - this.btnZoomIn.Image = global::NAPS2.WinForms.Icons.zoom_in; + this.btnZoomIn.Image = global::NAPS2.Icons.zoom_in; this.btnZoomIn.Name = "btnZoomIn"; this.btnZoomIn.UseVisualStyleBackColor = false; this.btnZoomIn.Click += new System.EventHandler(this.btnZoomIn_Click); @@ -131,7 +131,7 @@ namespace NAPS2.WinForms // this.btnZoomOut.BackColor = System.Drawing.Color.White; resources.ApplyResources(this.btnZoomOut, "btnZoomOut"); - this.btnZoomOut.Image = global::NAPS2.WinForms.Icons.zoom_out; + this.btnZoomOut.Image = global::NAPS2.Icons.zoom_out; this.btnZoomOut.Name = "btnZoomOut"; this.btnZoomOut.UseVisualStyleBackColor = false; this.btnZoomOut.Click += new System.EventHandler(this.btnZoomOut_Click); @@ -217,7 +217,7 @@ namespace NAPS2.WinForms // this.tsScan.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.tsNewProfile}); - this.tsScan.Image = global::NAPS2.WinForms.Icons.control_play_blue; + this.tsScan.Image = global::NAPS2.Icons.control_play_blue; resources.ApplyResources(this.tsScan, "tsScan"); this.tsScan.Margin = new System.Windows.Forms.Padding(5, 1, 5, 2); this.tsScan.Name = "tsScan"; @@ -226,7 +226,7 @@ namespace NAPS2.WinForms // // tsNewProfile // - this.tsNewProfile.Image = global::NAPS2.WinForms.Icons.add_small; + this.tsNewProfile.Image = global::NAPS2.Icons.add_small; resources.ApplyResources(this.tsNewProfile, "tsNewProfile"); this.tsNewProfile.Name = "tsNewProfile"; this.tsNewProfile.Click += new System.EventHandler(this.tsNewProfile_Click); @@ -240,7 +240,7 @@ namespace NAPS2.WinForms // // tsOcr // - this.tsOcr.Image = global::NAPS2.WinForms.Icons.text; + this.tsOcr.Image = global::NAPS2.Icons.text; resources.ApplyResources(this.tsOcr, "tsOcr"); this.tsOcr.Name = "tsOcr"; this.tsOcr.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0); @@ -248,7 +248,7 @@ namespace NAPS2.WinForms // // tsImport // - this.tsImport.Image = global::NAPS2.WinForms.Icons.folder_picture; + this.tsImport.Image = global::NAPS2.Icons.folder_picture; resources.ApplyResources(this.tsImport, "tsImport"); this.tsImport.Name = "tsImport"; this.tsImport.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0); @@ -266,7 +266,7 @@ namespace NAPS2.WinForms this.tsSavePDFSelected, this.toolStripSeparator10, this.tsPDFSettings}); - this.tsdSavePDF.Image = global::NAPS2.WinForms.Icons.file_extension_pdf; + this.tsdSavePDF.Image = global::NAPS2.Icons.file_extension_pdf; resources.ApplyResources(this.tsdSavePDF, "tsdSavePDF"); this.tsdSavePDF.Margin = new System.Windows.Forms.Padding(5, 1, 5, 2); this.tsdSavePDF.Name = "tsdSavePDF"; @@ -302,7 +302,7 @@ namespace NAPS2.WinForms this.tsSaveImagesSelected, this.toolStripSeparator11, this.tsImageSettings}); - this.tsdSaveImages.Image = global::NAPS2.WinForms.Icons.pictures; + this.tsdSaveImages.Image = global::NAPS2.Icons.pictures; resources.ApplyResources(this.tsdSaveImages, "tsdSaveImages"); this.tsdSaveImages.Margin = new System.Windows.Forms.Padding(5, 1, 5, 2); this.tsdSaveImages.Name = "tsdSaveImages"; @@ -328,7 +328,7 @@ namespace NAPS2.WinForms this.toolStripSeparator9, this.tsEmailSettings, this.tsPdfSettings2}); - this.tsdEmailPDF.Image = global::NAPS2.WinForms.Icons.email_attach; + this.tsdEmailPDF.Image = global::NAPS2.Icons.email_attach; resources.ApplyResources(this.tsdEmailPDF, "tsdEmailPDF"); this.tsdEmailPDF.Margin = new System.Windows.Forms.Padding(5, 1, 5, 2); this.tsdEmailPDF.Name = "tsdEmailPDF"; @@ -365,7 +365,7 @@ namespace NAPS2.WinForms // // tsdPrint // - this.tsdPrint.Image = global::NAPS2.WinForms.Icons.printer; + this.tsdPrint.Image = global::NAPS2.Icons.printer; resources.ApplyResources(this.tsdPrint, "tsdPrint"); this.tsdPrint.Name = "tsdPrint"; this.tsdPrint.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0); @@ -387,7 +387,7 @@ namespace NAPS2.WinForms this.tsContrast, this.toolStripSeparator7, this.tsReset}); - this.tsdImage.Image = global::NAPS2.WinForms.Icons.picture_edit; + this.tsdImage.Image = global::NAPS2.Icons.picture_edit; resources.ApplyResources(this.tsdImage, "tsdImage"); this.tsdImage.Name = "tsdImage"; this.tsdImage.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0); @@ -406,21 +406,21 @@ namespace NAPS2.WinForms // // tsCrop // - this.tsCrop.Image = global::NAPS2.WinForms.Icons.transform_crop; + this.tsCrop.Image = global::NAPS2.Icons.transform_crop; resources.ApplyResources(this.tsCrop, "tsCrop"); this.tsCrop.Name = "tsCrop"; this.tsCrop.Click += new System.EventHandler(this.tsCrop_Click); // // tsBrightness // - this.tsBrightness.Image = global::NAPS2.WinForms.Icons.weather_sun; + this.tsBrightness.Image = global::NAPS2.Icons.weather_sun; resources.ApplyResources(this.tsBrightness, "tsBrightness"); this.tsBrightness.Name = "tsBrightness"; this.tsBrightness.Click += new System.EventHandler(this.tsBrightness_Click); // // tsContrast // - this.tsContrast.Image = global::NAPS2.WinForms.Icons.contrast; + this.tsContrast.Image = global::NAPS2.Icons.contrast; resources.ApplyResources(this.tsContrast, "tsContrast"); this.tsContrast.Name = "tsContrast"; this.tsContrast.Click += new System.EventHandler(this.tsContrast_Click); @@ -443,7 +443,7 @@ namespace NAPS2.WinForms this.tsRotateRight, this.tsFlip, this.customRotationToolStripMenuItem}); - this.tsdRotate.Image = global::NAPS2.WinForms.Icons.arrow_rotate_anticlockwise; + this.tsdRotate.Image = global::NAPS2.Icons.arrow_rotate_anticlockwise; resources.ApplyResources(this.tsdRotate, "tsdRotate"); this.tsdRotate.Name = "tsdRotate"; this.tsdRotate.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0); @@ -451,21 +451,21 @@ namespace NAPS2.WinForms // // tsRotateLeft // - this.tsRotateLeft.Image = global::NAPS2.WinForms.Icons.arrow_rotate_anticlockwise_small; + this.tsRotateLeft.Image = global::NAPS2.Icons.arrow_rotate_anticlockwise_small; resources.ApplyResources(this.tsRotateLeft, "tsRotateLeft"); this.tsRotateLeft.Name = "tsRotateLeft"; this.tsRotateLeft.Click += new System.EventHandler(this.tsRotateLeft_Click); // // tsRotateRight // - this.tsRotateRight.Image = global::NAPS2.WinForms.Icons.arrow_rotate_clockwise_small; + this.tsRotateRight.Image = global::NAPS2.Icons.arrow_rotate_clockwise_small; resources.ApplyResources(this.tsRotateRight, "tsRotateRight"); this.tsRotateRight.Name = "tsRotateRight"; this.tsRotateRight.Click += new System.EventHandler(this.tsRotateRight_Click); // // tsFlip // - this.tsFlip.Image = global::NAPS2.WinForms.Icons.arrow_switch_small; + this.tsFlip.Image = global::NAPS2.Icons.arrow_switch_small; resources.ApplyResources(this.tsFlip, "tsFlip"); this.tsFlip.Name = "tsFlip"; this.tsFlip.Click += new System.EventHandler(this.tsFlip_Click); @@ -478,8 +478,8 @@ namespace NAPS2.WinForms // // tsMove // - this.tsMove.ImageFirst = global::NAPS2.WinForms.Icons.arrow_up_small; - this.tsMove.ImageSecond = global::NAPS2.WinForms.Icons.arrow_down_small; + this.tsMove.ImageFirst = global::NAPS2.Icons.arrow_up_small; + this.tsMove.ImageSecond = global::NAPS2.Icons.arrow_down_small; this.tsMove.Name = "tsMove"; this.tsMove.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0); resources.ApplyResources(this.tsMove, "tsMove"); @@ -496,7 +496,7 @@ namespace NAPS2.WinForms this.tsDeinterleave, this.toolStripSeparator1, this.tsReverse}); - this.tsdReorder.Image = global::NAPS2.WinForms.Icons.arrow_refresh; + this.tsdReorder.Image = global::NAPS2.Icons.arrow_refresh; resources.ApplyResources(this.tsdReorder, "tsdReorder"); this.tsdReorder.Name = "tsdReorder"; this.tsdReorder.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0); @@ -546,7 +546,7 @@ namespace NAPS2.WinForms // // tsDelete // - this.tsDelete.Image = global::NAPS2.WinForms.Icons.cross; + this.tsDelete.Image = global::NAPS2.Icons.cross; resources.ApplyResources(this.tsDelete, "tsDelete"); this.tsDelete.Name = "tsDelete"; this.tsDelete.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0); @@ -554,7 +554,7 @@ namespace NAPS2.WinForms // // tsClear // - this.tsClear.Image = global::NAPS2.WinForms.Icons.cancel; + this.tsClear.Image = global::NAPS2.Icons.cancel; resources.ApplyResources(this.tsClear, "tsClear"); this.tsClear.Name = "tsClear"; this.tsClear.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0); @@ -567,7 +567,7 @@ namespace NAPS2.WinForms // // toolStripDropDownButton1 // - this.toolStripDropDownButton1.Image = global::NAPS2.WinForms.Icons.world; + this.toolStripDropDownButton1.Image = global::NAPS2.Icons.world; resources.ApplyResources(this.toolStripDropDownButton1, "toolStripDropDownButton1"); this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; this.toolStripDropDownButton1.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0); diff --git a/NAPS2.Core/WinForms/FProfiles.Designer.cs b/NAPS2.Core/WinForms/FProfiles.Designer.cs index 79f9e0b0b..56f4cfded 100644 --- a/NAPS2.Core/WinForms/FProfiles.Designer.cs +++ b/NAPS2.Core/WinForms/FProfiles.Designer.cs @@ -77,7 +77,7 @@ namespace NAPS2.WinForms // ctxScan // resources.ApplyResources(this.ctxScan, "ctxScan"); - this.ctxScan.Image = global::NAPS2.WinForms.Icons.control_play_blue_small; + this.ctxScan.Image = global::NAPS2.Icons.control_play_blue_small; this.ctxScan.Name = "ctxScan"; this.ctxScan.Click += new System.EventHandler(this.ctxScan_Click); // @@ -88,21 +88,21 @@ namespace NAPS2.WinForms // // ctxEdit // - this.ctxEdit.Image = global::NAPS2.WinForms.Icons.pencil_small; + this.ctxEdit.Image = global::NAPS2.Icons.pencil_small; this.ctxEdit.Name = "ctxEdit"; resources.ApplyResources(this.ctxEdit, "ctxEdit"); this.ctxEdit.Click += new System.EventHandler(this.ctxEdit_Click); // // ctxSetDefault // - this.ctxSetDefault.Image = global::NAPS2.WinForms.Icons.accept_small; + this.ctxSetDefault.Image = global::NAPS2.Icons.accept_small; this.ctxSetDefault.Name = "ctxSetDefault"; resources.ApplyResources(this.ctxSetDefault, "ctxSetDefault"); this.ctxSetDefault.Click += new System.EventHandler(this.ctxSetDefault_Click); // // ctxDelete // - this.ctxDelete.Image = global::NAPS2.WinForms.Icons.cross_small; + this.ctxDelete.Image = global::NAPS2.Icons.cross_small; this.ctxDelete.Name = "ctxDelete"; resources.ApplyResources(this.ctxDelete, "ctxDelete"); this.ctxDelete.Click += new System.EventHandler(this.ctxDelete_Click); @@ -110,14 +110,14 @@ namespace NAPS2.WinForms // btnAdd // resources.ApplyResources(this.btnAdd, "btnAdd"); - this.btnAdd.Image = global::NAPS2.WinForms.Icons.add_small; + this.btnAdd.Image = global::NAPS2.Icons.add_small; this.btnAdd.Name = "btnAdd"; this.btnAdd.UseVisualStyleBackColor = true; this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); // // btnEdit // - this.btnEdit.Image = global::NAPS2.WinForms.Icons.pencil_small; + this.btnEdit.Image = global::NAPS2.Icons.pencil_small; resources.ApplyResources(this.btnEdit, "btnEdit"); this.btnEdit.Name = "btnEdit"; this.btnEdit.UseVisualStyleBackColor = true; @@ -125,7 +125,7 @@ namespace NAPS2.WinForms // // btnDelete // - this.btnDelete.Image = global::NAPS2.WinForms.Icons.cross_small; + this.btnDelete.Image = global::NAPS2.Icons.cross_small; resources.ApplyResources(this.btnDelete, "btnDelete"); this.btnDelete.Name = "btnDelete"; this.btnDelete.UseVisualStyleBackColor = true; @@ -142,7 +142,7 @@ namespace NAPS2.WinForms // this.btnScan.BackColor = System.Drawing.SystemColors.Control; resources.ApplyResources(this.btnScan, "btnScan"); - this.btnScan.Image = global::NAPS2.WinForms.Icons.control_play_blue; + this.btnScan.Image = global::NAPS2.Icons.control_play_blue; this.btnScan.Name = "btnScan"; this.btnScan.UseVisualStyleBackColor = true; this.btnScan.Click += new System.EventHandler(this.btnScan_Click);