From ab96a5a1a95d7a9dc52360543e04b8f9a0e0ce85 Mon Sep 17 00:00:00 2001 From: Chebotov Nick Date: Sun, 20 Oct 2019 18:14:10 +0300 Subject: [PATCH] Update icon resolution. --- CHANGELOG.md | 4 +++ .../Properties/AssemblyInfo.cs | 4 +-- .../Properties/Resources.Designer.cs | 30 +++++++++--------- .../Properties/Resources.resx | 4 +-- .../Provider.cs | 6 ++-- .../Resources/icon_32x32.png | Bin 4608 -> 0 bytes .../Unchase.OData.ConnectedService.csproj | 2 +- 7 files changed, 27 insertions(+), 23 deletions(-) delete mode 100644 src/Unchase.OData.ConnectedService/Resources/icon_32x32.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 19f1a48..e9895f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ These are the changes to each version that has been released on the official [Visual Studio extension gallery](https://marketplace.visualstudio.com/items?itemName=unchase.UnchaseODataConnectedService). +## v1.3.4 `2019-10-20` + +- [x] Update icon resolution + ## v1.3.3 `2019-10-03` - [x] Add fix: set `DtdProcessing` option in `XmlReaderSettings` diff --git a/src/Unchase.OData.ConnectedService/Properties/AssemblyInfo.cs b/src/Unchase.OData.ConnectedService/Properties/AssemblyInfo.cs index 906870e..bda8cd4 100644 --- a/src/Unchase.OData.ConnectedService/Properties/AssemblyInfo.cs +++ b/src/Unchase.OData.ConnectedService/Properties/AssemblyInfo.cs @@ -30,7 +30,7 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.3.3.0")] -[assembly: AssemblyFileVersion("1.3.3.0")] +[assembly: AssemblyVersion("1.3.4.0")] +[assembly: AssemblyFileVersion("1.3.4.0")] [assembly: NeutralResourcesLanguage("en")] diff --git a/src/Unchase.OData.ConnectedService/Properties/Resources.Designer.cs b/src/Unchase.OData.ConnectedService/Properties/Resources.Designer.cs index ccac765..e5f88a6 100644 --- a/src/Unchase.OData.ConnectedService/Properties/Resources.Designer.cs +++ b/src/Unchase.OData.ConnectedService/Properties/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// Этот код создан программой. -// Исполняемая версия:4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае -// повторной генерации кода. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -13,12 +13,12 @@ namespace Unchase.OData.ConnectedService.Properties { /// - /// Класс ресурса со строгой типизацией для поиска локализованных строк и т.д. + /// A strongly-typed resource class, for looking up localized strings, etc. /// - // Этот класс создан автоматически классом StronglyTypedResourceBuilder - // с помощью такого средства, как ResGen или Visual Studio. - // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen - // с параметром /str или перестройте свой проект VS. + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -33,7 +33,7 @@ internal Resources() { } /// - /// Возвращает кэшированный экземпляр ResourceManager, использованный этим классом. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ internal Resources() { } /// - /// Перезаписывает свойство CurrentUICulture текущего потока для всех - /// обращений к ресурсу с помощью этого класса ресурса со строгой типизацией. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -61,11 +61,11 @@ internal Resources() { } /// - /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap icon_32x32 { + internal static System.Drawing.Bitmap preview_200x200 { get { - object obj = ResourceManager.GetObject("icon_32x32", resourceCulture); + object obj = ResourceManager.GetObject("preview_200x200", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } diff --git a/src/Unchase.OData.ConnectedService/Properties/Resources.resx b/src/Unchase.OData.ConnectedService/Properties/Resources.resx index 500e281..c79867f 100644 --- a/src/Unchase.OData.ConnectedService/Properties/Resources.resx +++ b/src/Unchase.OData.ConnectedService/Properties/Resources.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\icon_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\preview_200x200.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/src/Unchase.OData.ConnectedService/Provider.cs b/src/Unchase.OData.ConnectedService/Provider.cs index c11d3ad..1d1b139 100644 --- a/src/Unchase.OData.ConnectedService/Provider.cs +++ b/src/Unchase.OData.ConnectedService/Provider.cs @@ -23,13 +23,13 @@ public Provider() Name = Constants.ExtensionName; Description = Constants.ExtensionDescription; Icon = Imaging.CreateBitmapSourceFromHBitmap( - Resources.icon_32x32.GetHbitmap(), + Resources.preview_200x200.GetHbitmap(), IntPtr.Zero, Int32Rect.Empty, - BitmapSizeOptions.FromWidthAndHeight(32, 32) + BitmapSizeOptions.FromWidthAndHeight(64, 64) ); CreatedBy = Constants.Author; - Version = new Version(1, 3, 3, 0); + Version = new Version(1, 3, 4, 0); Version = typeof(Provider).Assembly.GetName().Version; MoreInfoUri = new Uri(Constants.Website); } diff --git a/src/Unchase.OData.ConnectedService/Resources/icon_32x32.png b/src/Unchase.OData.ConnectedService/Resources/icon_32x32.png deleted file mode 100644 index 709f75272d7c46ee5d1300458ad0a987f5d94328..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4608 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 q)TGH_8nytrue Always - Always true @@ -197,6 +196,7 @@ ResXFileCodeGenerator Resources.Designer.cs + Designer