diff --git a/Logo/64.png b/Logo/64.png new file mode 100644 index 000000000..8ef72896e Binary files /dev/null and b/Logo/64.png differ diff --git a/NzbDrone.Core/Notifications/Xbmc/HttpApiProvider.cs b/NzbDrone.Core/Notifications/Xbmc/HttpApiProvider.cs index 7f3755f9c..d03f88473 100644 --- a/NzbDrone.Core/Notifications/Xbmc/HttpApiProvider.cs +++ b/NzbDrone.Core/Notifications/Xbmc/HttpApiProvider.cs @@ -23,7 +23,7 @@ namespace NzbDrone.Core.Notifications.Xbmc public void Notify(XbmcSettings settings, string title, string message) { - var notification = String.Format("Notification({0},{1},{2},{3})", title, message, settings.DisplayTime * 1000, "https://raw.github.com/NzbDrone/NzbDrone/vnext/NzbDrone.Core/NzbDrone.jpg"); + var notification = String.Format("Notification({0},{1},{2},{3})", title, message, settings.DisplayTime * 1000, "https://raw.github.com/NzbDrone/NzbDrone/develop/Logo/64.png"); var command = BuildExecBuiltInCommand(notification); SendCommand(settings, command); diff --git a/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs b/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs index 520c1c3a2..af5fe2366 100644 --- a/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs +++ b/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs @@ -26,7 +26,7 @@ namespace NzbDrone.Core.Notifications.Xbmc var parameters = new JObject( new JProperty("title", title), new JProperty("message", message), - new JProperty("image", "https://raw.github.com/NzbDrone/NzbDrone/vnext/NzbDrone.Core/NzbDrone.jpg"), + new JProperty("image", "https://raw.github.com/NzbDrone/NzbDrone/develop/Logo/64.png"), new JProperty("displaytime", settings.DisplayTime * 1000)); var postJson = BuildJsonRequest("GUI.ShowNotification", parameters); diff --git a/NzbDrone.Core/Notifications/Xbmc/ResourceManager.cs b/NzbDrone.Core/Notifications/Xbmc/ResourceManager.cs deleted file mode 100644 index 2eed6b1f9..000000000 --- a/NzbDrone.Core/Notifications/Xbmc/ResourceManager.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System.Drawing; -using System.IO; - -namespace NzbDrone.Core.Notifications.Xbmc -{ - public class ResourceManager - { - public static Icon GetIcon(string Name) - { - Stream stm = typeof(ResourceManager).Assembly.GetManifestResourceStream(string.Format("NzbDrone.Core.{0}.ico", Name)); - if (stm == null) return null; - return new Icon(stm); - } - - public static byte[] GetRawData(string Name) - { - byte[] data; - using (Stream stm = typeof(ResourceManager).Assembly.GetManifestResourceStream(string.Format("NzbDrone.Core.{0}.ico", Name))) - { - if (stm == null) return null; - data = new byte[stm.Length]; - stm.Read(data, 0, data.Length); - } - - return data; - } - - public static byte[] GetRawLogo(string Name) - { - byte[] data; - using (Stream stm = typeof(ResourceManager).Assembly.GetManifestResourceStream(string.Format("NzbDrone.Core.{0}", Name))) - { - if (stm == null) return null; - data = new byte[stm.Length]; - stm.Read(data, 0, data.Length); - } - - return data; - } - - public static Bitmap GetIconAsImage(string Name) - { - Stream stm = typeof(ResourceManager).Assembly.GetManifestResourceStream(string.Format("NzbDrone.Core.{0}.ico", Name)); - if (stm == null) return null; - Bitmap bmp; - using (Icon ico = new Icon(stm)) - { - bmp = new Bitmap(ico.Width, ico.Height); - using (Graphics g = Graphics.FromImage(bmp)) - { - g.DrawIcon(ico, 0, 0); - } - } - - return bmp; - } - } -} diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index 7cf532b23..0c9133304 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -541,7 +541,6 @@ Always -