diff --git a/MediaBrowser.Installer/App.config b/Installation/MediaBrowser.Server.Installer.exe.config similarity index 77% rename from MediaBrowser.Installer/App.config rename to Installation/MediaBrowser.Server.Installer.exe.config index 558196382b..efff9590da 100644 --- a/MediaBrowser.Installer/App.config +++ b/Installation/MediaBrowser.Server.Installer.exe.config @@ -2,9 +2,9 @@ - + - + \ No newline at end of file diff --git a/MediaBrowser.Common.Implementations/Updates/ApplicationUpdater.cs b/MediaBrowser.Common.Implementations/Updates/ApplicationUpdater.cs index 9dc0eb85c8..6c2aa2f5c7 100644 --- a/MediaBrowser.Common.Implementations/Updates/ApplicationUpdater.cs +++ b/MediaBrowser.Common.Implementations/Updates/ApplicationUpdater.cs @@ -15,15 +15,19 @@ namespace MediaBrowser.Common.Implementations.Updates /// public class ApplicationUpdater { - private const string UpdaterExe = "Mediabrowser.Installer.exe"; + private const string UpdaterExe = "Mediabrowser.Updater.exe"; + private const string UpdaterDll = "Mediabrowser.InstallUtil.dll"; public void UpdateApplication(MBApplication app, IApplicationPaths appPaths, string archive) { // Use our installer passing it the specific archive // We need to copy to a temp directory and execute it there var source = Path.Combine(appPaths.ProgramSystemPath, UpdaterExe); var tempUpdater = Path.Combine(Path.GetTempPath(), UpdaterExe); - var product = app == MBApplication.MBTheater ? "mbt" : "server"; File.Copy(source, tempUpdater, true); + source = Path.Combine(appPaths.ProgramSystemPath, UpdaterDll); + var tempUpdaterDll = Path.Combine(Path.GetTempPath(), UpdaterDll); + File.Copy(source, tempUpdaterDll, true); + var product = app == MBApplication.MBTheater ? "mbt" : "server"; // Our updater needs SS and ionic source = Path.Combine(appPaths.ProgramSystemPath, "ServiceStack.Text.dll"); File.Copy(source, Path.Combine(Path.GetTempPath(), "ServiceStack.Text.dll"), true); diff --git a/MediaBrowser.Installer/App.xaml b/MediaBrowser.Installer/App.xaml deleted file mode 100644 index 84c9b11d45..0000000000 --- a/MediaBrowser.Installer/App.xaml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/MediaBrowser.Installer/App.xaml.cs b/MediaBrowser.Installer/App.xaml.cs deleted file mode 100644 index 3e1230d441..0000000000 --- a/MediaBrowser.Installer/App.xaml.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Windows; - -namespace MediaBrowser.Installer -{ - /// - /// Interaction logic for App.xaml - /// - public partial class App : Application - { - } -} diff --git a/MediaBrowser.Installer/Code/DownloadAnimation.xaml b/MediaBrowser.Installer/Code/DownloadAnimation.xaml deleted file mode 100644 index 26a0ca6770..0000000000 --- a/MediaBrowser.Installer/Code/DownloadAnimation.xaml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MediaBrowser.Installer/Code/DownloadAnimation.xaml.cs b/MediaBrowser.Installer/Code/DownloadAnimation.xaml.cs deleted file mode 100644 index 8fa8908166..0000000000 --- a/MediaBrowser.Installer/Code/DownloadAnimation.xaml.cs +++ /dev/null @@ -1,68 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; -using System.Windows.Threading; - -namespace MediaBrowser.Installer.Code -{ - /// - /// Interaction logic for DownloadAnimation.xaml - /// - public partial class DownloadAnimation : UserControl - { - private int _i; - private readonly double _startPos; - private readonly DispatcherTimer _timer; - - public DownloadAnimation() - { - _i = 0; - InitializeComponent(); - - // Store start position of sliding canvas - _startPos = Canvas.GetLeft(SlidingCanvas); - - // Create animation timer - _timer = new DispatcherTimer {Interval = TimeSpan.FromMilliseconds(100)}; - _timer.Tick += TimerTick; - } - - public void StartAnimation() - { - _timer.Start(); - } - - public void StopAnimation() - { - _timer.Stop(); - } - - private void TimerTick(object sender, EventArgs e) - { - _i++; - - if (_i < 16) - { - // Move SlidingCanvas containing the three colored dots 14 units to the right - Canvas.SetLeft(SlidingCanvas, Canvas.GetLeft(SlidingCanvas) + 14); - } - else - { - // Move SlidingCanvas back to its starting position and reset counter - _i = 0; - Canvas.SetLeft(SlidingCanvas, _startPos); - } - } - } -} diff --git a/MediaBrowser.Installer/Code/Images/computer_256.png b/MediaBrowser.Installer/Code/Images/computer_256.png deleted file mode 100644 index 42f3c22fa7..0000000000 Binary files a/MediaBrowser.Installer/Code/Images/computer_256.png and /dev/null differ diff --git a/MediaBrowser.Installer/Code/Images/internet-globe.jpg b/MediaBrowser.Installer/Code/Images/internet-globe.jpg deleted file mode 100644 index 26d064d7bf..0000000000 Binary files a/MediaBrowser.Installer/Code/Images/internet-globe.jpg and /dev/null differ diff --git a/MediaBrowser.Installer/Code/Images/mb3logo800.png b/MediaBrowser.Installer/Code/Images/mb3logo800.png deleted file mode 100644 index fbc769a6f1..0000000000 Binary files a/MediaBrowser.Installer/Code/Images/mb3logo800.png and /dev/null differ diff --git a/MediaBrowser.Installer/Code/ModelExtensions.cs b/MediaBrowser.Installer/Code/ModelExtensions.cs deleted file mode 100644 index 66e51ec117..0000000000 --- a/MediaBrowser.Installer/Code/ModelExtensions.cs +++ /dev/null @@ -1,43 +0,0 @@ - -using System.Collections.Generic; - -namespace MediaBrowser.Installer.Code -{ - /// - /// Class ModelExtensions - /// - static class ModelExtensions - { - /// - /// Values the or default. - /// - /// The STR. - /// The def. - /// System.String. - public static string ValueOrDefault(this string str, string def = "") - { - return string.IsNullOrEmpty(str) ? def : str; - } - - /// - /// Helper method for Dictionaries since they throw on not-found keys - /// - /// - /// - /// The dictionary. - /// The key. - /// The default value. - /// ``1. - public static U GetValueOrDefault(this Dictionary dictionary, T key, U defaultValue) - { - U val; - if (!dictionary.TryGetValue(key, out val)) - { - val = defaultValue; - } - return val; - - } - - } -} diff --git a/MediaBrowser.Installer/Code/PackageInfo.cs b/MediaBrowser.Installer/Code/PackageInfo.cs deleted file mode 100644 index adfe54dd63..0000000000 --- a/MediaBrowser.Installer/Code/PackageInfo.cs +++ /dev/null @@ -1,119 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace MediaBrowser.Installer.Code -{ - /// - /// Class PackageInfo - /// - public class PackageInfo - { - /// - /// Gets or sets the name. - /// - /// The name. - public string name { get; set; } - - /// - /// Gets or sets the short description. - /// - /// The short description. - public string shortDescription { get; set; } - - /// - /// Gets or sets the overview. - /// - /// The overview. - public string overview { get; set; } - - /// - /// Gets or sets a value indicating whether this instance is premium. - /// - /// true if this instance is premium; otherwise, false. - public bool isPremium { get; set; } - - /// - /// Gets or sets the rich desc URL. - /// - /// The rich desc URL. - public string richDescUrl { get; set; } - - /// - /// Gets or sets the thumb image. - /// - /// The thumb image. - public string thumbImage { get; set; } - - /// - /// Gets or sets the preview image. - /// - /// The preview image. - public string previewImage { get; set; } - - /// - /// Gets or sets the type. - /// - /// The type. - public PackageType type { get; set; } - - /// - /// Gets or sets the target filename. - /// - /// The target filename. - public string targetFilename { get; set; } - - /// - /// Gets or sets the owner. - /// - /// The owner. - public string owner { get; set; } - - /// - /// Gets or sets the category. - /// - /// The category. - public string category { get; set; } - - /// - /// Gets or sets the catalog tile color. - /// - /// The owner. - public string tileColor { get; set; } - - /// - /// Gets or sets the feature id of this package (if premium). - /// - /// The feature id. - public string featureId { get; set; } - - /// - /// Gets or sets the registration info for this package (if premium). - /// - /// The registration info. - public string regInfo { get; set; } - - /// - /// Gets or sets the price for this package (if premium). - /// - /// The price. - public float price { get; set; } - - /// - /// Gets or sets whether or not this package is registered. - /// - /// True if registered. - public bool isRegistered { get; set; } - - /// - /// Gets or sets the expiration date for this package. - /// - /// Expiration Date. - public DateTime expDate { get; set; } - - /// - /// Gets or sets the versions. - /// - /// The versions. - public List versions { get; set; } - } -} diff --git a/MediaBrowser.Installer/Code/PackageType.cs b/MediaBrowser.Installer/Code/PackageType.cs deleted file mode 100644 index 964025a73c..0000000000 --- a/MediaBrowser.Installer/Code/PackageType.cs +++ /dev/null @@ -1,21 +0,0 @@ -namespace MediaBrowser.Installer.Code -{ - /// - /// Enum PackageType - /// - public enum PackageType - { - /// - /// All - /// - All, - /// - /// The system - /// - System, - /// - /// The user installed - /// - UserInstalled - } -} \ No newline at end of file diff --git a/MediaBrowser.Installer/Code/PackageVersionClass.cs b/MediaBrowser.Installer/Code/PackageVersionClass.cs deleted file mode 100644 index d046e5c602..0000000000 --- a/MediaBrowser.Installer/Code/PackageVersionClass.cs +++ /dev/null @@ -1,21 +0,0 @@ -namespace MediaBrowser.Installer.Code -{ - /// - /// Enum PackageVersionClass - /// - public enum PackageVersionClass - { - /// - /// The release - /// - Release = 0, - /// - /// The beta - /// - Beta = 1, - /// - /// The dev - /// - Dev = 2 - } -} \ No newline at end of file diff --git a/MediaBrowser.Installer/Code/PackageVersionInfo.cs b/MediaBrowser.Installer/Code/PackageVersionInfo.cs deleted file mode 100644 index d26c217caf..0000000000 --- a/MediaBrowser.Installer/Code/PackageVersionInfo.cs +++ /dev/null @@ -1,73 +0,0 @@ -using System; -using System.Runtime.Serialization; - -namespace MediaBrowser.Installer.Code -{ - /// - /// Class PackageVersionInfo - /// - public class PackageVersionInfo - { - /// - /// Gets or sets the name. - /// - /// The name. - public string name { get; set; } - - /// - /// Gets or sets the version STR. - /// - /// The version STR. - public string versionStr { get; set; } - - /// - /// The _version - /// - private Version _version; - /// - /// Gets or sets the version. - /// Had to make this an interpreted property since Protobuf can't handle Version - /// - /// The version. - public Version version - { - get { return _version ?? (_version = new Version(versionStr.ValueOrDefault("0.0.0.1"))); } - } - - /// - /// Gets or sets the classification. - /// - /// The classification. - public PackageVersionClass classification { get; set; } - - /// - /// Gets or sets the description. - /// - /// The description. - public string description { get; set; } - - /// - /// Gets or sets the required version STR. - /// - /// The required version STR. - public string requiredVersionStr { get; set; } - - /// - /// Gets or sets the source URL. - /// - /// The source URL. - public string sourceUrl { get; set; } - - /// - /// Gets or sets the source URL. - /// - /// The source URL. - public Guid checksum { get; set; } - - /// - /// Gets or sets the target filename. - /// - /// The target filename. - public string targetFilename { get; set; } - } -} diff --git a/MediaBrowser.Installer/Code/ShellLinkNative.cs b/MediaBrowser.Installer/Code/ShellLinkNative.cs deleted file mode 100644 index d603fe3a5d..0000000000 --- a/MediaBrowser.Installer/Code/ShellLinkNative.cs +++ /dev/null @@ -1,277 +0,0 @@ -/************************************************************************** -* -* Filename: ShellLinkNative.cs -* Author: Mattias Sjögren (mattias@mvps.org) -* http://www.msjogren.net/dotnet/ -* -* Description: Defines the native types used to manipulate shell shortcuts. -* -* Public types: enum SLR_FLAGS -* enum SLGP_FLAGS -* struct WIN32_FIND_DATA[A|W] -* interface IPersistFile -* interface IShellLink[A|W] -* class ShellLink -* -* -* Copyright ©2001-2002, Mattias Sjögren -* -**************************************************************************/ - -using System; -using System.Runtime.InteropServices; -using System.Text; -using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME; - -namespace MediaBrowser.Installer.Code -{ - // IShellLink.Resolve fFlags - [Flags()] - public enum SLR_FLAGS - { - SLR_NO_UI = 0x1, - SLR_ANY_MATCH = 0x2, - SLR_UPDATE = 0x4, - SLR_NOUPDATE = 0x8, - SLR_NOSEARCH = 0x10, - SLR_NOTRACK = 0x20, - SLR_NOLINKINFO = 0x40, - SLR_INVOKE_MSI = 0x80 - } - - // IShellLink.GetPath fFlags - [Flags()] - public enum SLGP_FLAGS - { - SLGP_SHORTPATH = 0x1, - SLGP_UNCPRIORITY = 0x2, - SLGP_RAWPATH = 0x4 - } - - [StructLayout(LayoutKind.Sequential, CharSet=CharSet.Ansi)] - public struct WIN32_FIND_DATAA - { - public int dwFileAttributes; - public FILETIME ftCreationTime; - public FILETIME ftLastAccessTime; - public FILETIME ftLastWriteTime; - public int nFileSizeHigh; - public int nFileSizeLow; - public int dwReserved0; - public int dwReserved1; - [MarshalAs(UnmanagedType.ByValTStr, SizeConst=MAX_PATH)] - public string cFileName; - [MarshalAs(UnmanagedType.ByValTStr, SizeConst=14)] - public string cAlternateFileName; - private const int MAX_PATH = 260; - } - - [StructLayoutAttribute(LayoutKind.Sequential, CharSet=CharSet.Unicode)] - public struct WIN32_FIND_DATAW - { - public int dwFileAttributes; - public FILETIME ftCreationTime; - public FILETIME ftLastAccessTime; - public FILETIME ftLastWriteTime; - public int nFileSizeHigh; - public int nFileSizeLow; - public int dwReserved0; - public int dwReserved1; - [MarshalAs(UnmanagedType.ByValTStr, SizeConst=MAX_PATH)] - public string cFileName; - [MarshalAs(UnmanagedType.ByValTStr, SizeConst=14)] - public string cAlternateFileName; - private const int MAX_PATH = 260; - } - - [ - ComImport(), - InterfaceType(ComInterfaceType.InterfaceIsIUnknown), - Guid("0000010B-0000-0000-C000-000000000046") - ] - public interface IPersistFile - { - #region Methods inherited from IPersist - - void GetClassID( - out Guid pClassID); - - #endregion - - [PreserveSig()] - int IsDirty(); - - void Load( - [MarshalAs(UnmanagedType.LPWStr)] string pszFileName, - int dwMode); - - void Save( - [MarshalAs(UnmanagedType.LPWStr)] string pszFileName, - [MarshalAs(UnmanagedType.Bool)] bool fRemember); - - void SaveCompleted( - [MarshalAs(UnmanagedType.LPWStr)] string pszFileName); - - void GetCurFile( - out IntPtr ppszFileName); - - } - - [ - ComImport(), - InterfaceType(ComInterfaceType.InterfaceIsIUnknown), - Guid("000214EE-0000-0000-C000-000000000046") - ] - public interface IShellLinkA - { - void GetPath( - [Out(), MarshalAs(UnmanagedType.LPStr)] StringBuilder pszFile, - int cchMaxPath, - out WIN32_FIND_DATAA pfd, - SLGP_FLAGS fFlags); - - void GetIDList( - out IntPtr ppidl); - - void SetIDList( - IntPtr pidl); - - void GetDescription( - [Out(), MarshalAs(UnmanagedType.LPStr)] StringBuilder pszName, - int cchMaxName); - - void SetDescription( - [MarshalAs(UnmanagedType.LPStr)] string pszName); - - void GetWorkingDirectory( - [Out(), MarshalAs(UnmanagedType.LPStr)] StringBuilder pszDir, - int cchMaxPath); - - void SetWorkingDirectory( - [MarshalAs(UnmanagedType.LPStr)] string pszDir); - - void GetArguments( - [Out(), MarshalAs(UnmanagedType.LPStr)] StringBuilder pszArgs, - int cchMaxPath); - - void SetArguments( - [MarshalAs(UnmanagedType.LPStr)] string pszArgs); - - void GetHotkey( - out short pwHotkey); - - void SetHotkey( - short wHotkey); - - void GetShowCmd( - out int piShowCmd); - - void SetShowCmd( - int iShowCmd); - - void GetIconLocation( - [Out(), MarshalAs(UnmanagedType.LPStr)] StringBuilder pszIconPath, - int cchIconPath, - out int piIcon); - - void SetIconLocation( - [MarshalAs(UnmanagedType.LPStr)] string pszIconPath, - int iIcon); - - void SetRelativePath( - [MarshalAs(UnmanagedType.LPStr)] string pszPathRel, - int dwReserved); - - void Resolve( - IntPtr hwnd, - SLR_FLAGS fFlags); - - void SetPath( - [MarshalAs(UnmanagedType.LPStr)] string pszFile); - - } - - [ - ComImport(), - InterfaceType(ComInterfaceType.InterfaceIsIUnknown), - Guid("000214F9-0000-0000-C000-000000000046") - ] - public interface IShellLinkW - { - void GetPath( - [Out(), MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszFile, - int cchMaxPath, - out WIN32_FIND_DATAW pfd, - SLGP_FLAGS fFlags); - - void GetIDList( - out IntPtr ppidl); - - void SetIDList( - IntPtr pidl); - - void GetDescription( - [Out(), MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszName, - int cchMaxName); - - void SetDescription( - [MarshalAs(UnmanagedType.LPWStr)] string pszName); - - void GetWorkingDirectory( - [Out(), MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszDir, - int cchMaxPath); - - void SetWorkingDirectory( - [MarshalAs(UnmanagedType.LPWStr)] string pszDir); - - void GetArguments( - [Out(), MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszArgs, - int cchMaxPath); - - void SetArguments( - [MarshalAs(UnmanagedType.LPWStr)] string pszArgs); - - void GetHotkey( - out short pwHotkey); - - void SetHotkey( - short wHotkey); - - void GetShowCmd( - out int piShowCmd); - - void SetShowCmd( - int iShowCmd); - - void GetIconLocation( - [Out(), MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszIconPath, - int cchIconPath, - out int piIcon); - - void SetIconLocation( - [MarshalAs(UnmanagedType.LPWStr)] string pszIconPath, - int iIcon); - - void SetRelativePath( - [MarshalAs(UnmanagedType.LPWStr)] string pszPathRel, - int dwReserved); - - void Resolve( - IntPtr hwnd, - SLR_FLAGS fFlags); - - void SetPath( - [MarshalAs(UnmanagedType.LPWStr)] string pszFile); - - } - - - [ - ComImport(), - Guid("00021401-0000-0000-C000-000000000046") - ] - public class ShellLink // : IPersistFile, IShellLinkA, IShellLinkW - { - } - -} diff --git a/MediaBrowser.Installer/Code/ShellShortcut.cs b/MediaBrowser.Installer/Code/ShellShortcut.cs deleted file mode 100644 index 33b60732c3..0000000000 --- a/MediaBrowser.Installer/Code/ShellShortcut.cs +++ /dev/null @@ -1,348 +0,0 @@ -/************************************************************************** -* -* Filename: ShellShortcut.cs -* Author: Mattias Sjögren (mattias@mvps.org) -* http://www.msjogren.net/dotnet/ -* -* Description: Defines a .NET friendly class, ShellShortcut, for reading -* and writing shortcuts. -* Define the conditional compilation symbol UNICODE to use -* IShellLinkW internally. -* -* Public types: class ShellShortcut -* -* -* Dependencies: ShellLinkNative.cs -* -* -* Copyright ©2001-2002, Mattias Sjögren -* -**************************************************************************/ - -using System; -using System.Diagnostics; -using System.Drawing; -using System.IO; -using System.Runtime.InteropServices; -using System.Text; -using System.Windows.Forms; - - -namespace MediaBrowser.Installer.Code -{ - /// - /// .NET friendly wrapper for the ShellLink class - /// - public class ShellShortcut : IDisposable - { - private const int INFOTIPSIZE = 1024; - private const int MAX_PATH = 260; - - private const int SW_SHOWNORMAL = 1; - private const int SW_SHOWMINIMIZED = 2; - private const int SW_SHOWMAXIMIZED = 3; - private const int SW_SHOWMINNOACTIVE = 7; - - - #if UNICODE - private IShellLinkW m_Link; - #else - private IShellLinkA m_Link; - #endif - private string m_sPath; - - /// - /// - /// Path to new or existing shortcut file (.lnk). - /// - /// - public ShellShortcut(string linkPath) - { - IPersistFile pf; - - m_sPath = linkPath; - - #if UNICODE - m_Link = (IShellLinkW) new ShellLink(); - #else - m_Link = (IShellLinkA) new ShellLink(); - #endif - - if ( File.Exists( linkPath ) ) { - pf = (IPersistFile)m_Link; - pf.Load( linkPath, 0 ); - } - - } - - // - // IDisplosable implementation - // - public void Dispose() - { - if ( m_Link != null ) { - Marshal.ReleaseComObject( m_Link ); - m_Link = null; - } - } - - /// - /// Gets or sets the argument list of the shortcut. - /// - public string Arguments - { - get - { - StringBuilder sb = new StringBuilder( INFOTIPSIZE ); - m_Link.GetArguments( sb, sb.Capacity ); - return sb.ToString(); - } - set { m_Link.SetArguments( value ); } - } - - /// - /// Gets or sets a description of the shortcut. - /// - public string Description - { - get - { - StringBuilder sb = new StringBuilder( INFOTIPSIZE ); - m_Link.GetDescription( sb, sb.Capacity ); - return sb.ToString(); - } - set { m_Link.SetDescription( value ); } - } - - /// - /// Gets or sets the working directory (aka start in directory) of the shortcut. - /// - public string WorkingDirectory - { - get - { - StringBuilder sb = new StringBuilder( MAX_PATH ); - m_Link.GetWorkingDirectory( sb, sb.Capacity ); - return sb.ToString(); - } - set { m_Link.SetWorkingDirectory( value ); } - } - - // - // If Path returns an empty string, the shortcut is associated with - // a PIDL instead, which can be retrieved with IShellLink.GetIDList(). - // This is beyond the scope of this wrapper class. - // - /// - /// Gets or sets the target path of the shortcut. - /// - public string Path - { - get - { - #if UNICODE - WIN32_FIND_DATAW wfd = new WIN32_FIND_DATAW(); - #else - WIN32_FIND_DATAA wfd = new WIN32_FIND_DATAA(); - #endif - StringBuilder sb = new StringBuilder( MAX_PATH ); - - m_Link.GetPath( sb, sb.Capacity, out wfd, SLGP_FLAGS.SLGP_UNCPRIORITY ); - return sb.ToString(); - } - set { m_Link.SetPath( value ); } - } - - /// - /// Gets or sets the path of the assigned to the shortcut. - /// - /// - /// - /// - public string IconPath - { - get - { - StringBuilder sb = new StringBuilder( MAX_PATH ); - int nIconIdx; - m_Link.GetIconLocation( sb, sb.Capacity, out nIconIdx ); - return sb.ToString(); - } - set { m_Link.SetIconLocation( value, IconIndex ); } - } - - /// - /// Gets or sets the index of the assigned to the shortcut. - /// Set to zero when the property specifies a .ICO file. - /// - /// - /// - /// - public int IconIndex - { - get - { - StringBuilder sb = new StringBuilder( MAX_PATH ); - int nIconIdx; - m_Link.GetIconLocation( sb, sb.Capacity, out nIconIdx ); - return nIconIdx; - } - set { m_Link.SetIconLocation( IconPath, value ); } - } - - /// - /// Retrieves the Icon of the shortcut as it will appear in Explorer. - /// Use the and - /// properties to change it. - /// - public Icon Icon - { - get - { - StringBuilder sb = new StringBuilder( MAX_PATH ); - int nIconIdx; - IntPtr hIcon, hInst; - Icon ico, clone; - - - m_Link.GetIconLocation( sb, sb.Capacity, out nIconIdx ); - hInst = Marshal.GetHINSTANCE( this.GetType().Module ); - hIcon = Native.ExtractIcon( hInst, sb.ToString(), nIconIdx ); - if ( hIcon == IntPtr.Zero ) - return null; - - // Return a cloned Icon, because we have to free the original ourselves. - ico = Icon.FromHandle( hIcon ); - clone = (Icon)ico.Clone(); - ico.Dispose(); - Native.DestroyIcon( hIcon ); - return clone; - } - } - - /// - /// Gets or sets the System.Diagnostics.ProcessWindowStyle value - /// that decides the initial show state of the shortcut target. Note that - /// ProcessWindowStyle.Hidden is not a valid property value. - /// - public ProcessWindowStyle WindowStyle - { - get - { - int nWS; - m_Link.GetShowCmd( out nWS ); - - switch ( nWS ) { - case SW_SHOWMINIMIZED: - case SW_SHOWMINNOACTIVE: - return ProcessWindowStyle.Minimized; - - case SW_SHOWMAXIMIZED: - return ProcessWindowStyle.Maximized; - - default: - return ProcessWindowStyle.Normal; - } - } - set - { - int nWS; - - switch ( value ) { - case ProcessWindowStyle.Normal: - nWS = SW_SHOWNORMAL; - break; - - case ProcessWindowStyle.Minimized: - nWS = SW_SHOWMINNOACTIVE; - break; - - case ProcessWindowStyle.Maximized: - nWS = SW_SHOWMAXIMIZED; - break; - - default: // ProcessWindowStyle.Hidden - throw new ArgumentException("Unsupported ProcessWindowStyle value."); - } - - m_Link.SetShowCmd( nWS ); - - } - } - - /// - /// Gets or sets the hotkey for the shortcut. - /// - public Keys Hotkey - { - get - { - short wHotkey; - int dwHotkey; - - m_Link.GetHotkey( out wHotkey ); - - // - // Convert from IShellLink 16-bit format to Keys enumeration 32-bit value - // IShellLink: 0xMMVK - // Keys: 0x00MM00VK - // MM = Modifier (Alt, Control, Shift) - // VK = Virtual key code - // - dwHotkey = ((wHotkey & 0xFF00) << 8) | (wHotkey & 0xFF); - return (Keys) dwHotkey; - } - set - { - short wHotkey; - - if ( (value & Keys.Modifiers) == 0 ) - throw new ArgumentException("Hotkey must include a modifier key."); - - // - // Convert from Keys enumeration 32-bit value to IShellLink 16-bit format - // IShellLink: 0xMMVK - // Keys: 0x00MM00VK - // MM = Modifier (Alt, Control, Shift) - // VK = Virtual key code - // - wHotkey = unchecked((short) ( ((int) (value & Keys.Modifiers) >> 8) | (int) (value & Keys.KeyCode) )); - m_Link.SetHotkey( wHotkey ); - - } - } - - /// - /// Saves the shortcut to disk. - /// - public void Save() - { - IPersistFile pf = (IPersistFile) m_Link; - pf.Save( m_sPath, true ); - } - - /// - /// Returns a reference to the internal ShellLink object, - /// which can be used to perform more advanced operations - /// not supported by this wrapper class, by using the - /// IShellLink interface directly. - /// - public object ShellLink - { - get { return m_Link; } - } - - - #region Native Win32 API functions - private class Native - { - [DllImport("shell32.dll", CharSet=CharSet.Auto)] - public static extern IntPtr ExtractIcon(IntPtr hInst, string lpszExeFileName, int nIconIndex); - - [DllImport("user32.dll")] - public static extern bool DestroyIcon(IntPtr hIcon); - } - #endregion - - } -} diff --git a/MediaBrowser.Installer/Icon.ico b/MediaBrowser.Installer/Icon.ico deleted file mode 100644 index 4acd8f9219..0000000000 Binary files a/MediaBrowser.Installer/Icon.ico and /dev/null differ diff --git a/MediaBrowser.Installer/MainWindow.xaml b/MediaBrowser.Installer/MainWindow.xaml deleted file mode 100644 index 06727dfaee..0000000000 --- a/MediaBrowser.Installer/MainWindow.xaml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - -