diff --git a/Setup/builder2_setup.iss b/Setup/builder2_setup.iss index 36f17b45..fdadbc40 100644 --- a/Setup/builder2_setup.iss +++ b/Setup/builder2_setup.iss @@ -19,7 +19,7 @@ SolidCompression=true SourceDir=F:\Projects\Doom Builder\Build SetupLogging=false AppMutex=doombuilder2 -PrivilegesRequired=poweruser +PrivilegesRequired=admin ShowLanguageDialog=no LanguageDetectionMethod=none MinVersion=0,5.01.2600 @@ -32,6 +32,9 @@ Name: english; MessagesFile: compiler:Default.isl Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked [Files] +Source: Setup\dotnetfx35setup.exe; DestDir: {tmp}; Flags: dontcopy +Source: Setup\dxwebsetup.exe; DestDir: {tmp}; Flags: dontcopy +Source: Setup\slimdx.msi; DestDir: {tmp}; Flags: dontcopy Source: Builder.exe; DestDir: {app}; Flags: ignoreversion Source: Builder.cfg; DestDir: {app}; Flags: ignoreversion Source: Refmanual.chm; DestDir: {app}; Flags: ignoreversion @@ -44,7 +47,6 @@ Source: Configurations\*; DestDir: {app}\Configurations; Flags: ignoreversion Source: Scripting\*; DestDir: {app}\Scripting; Flags: ignoreversion ; NOTE: Don't use "Flags: ignoreversion" on any shared system files Source: Plugins\BuilderModes.dll; DestDir: {app}\Plugins; Flags: ignoreversion -Source: Setup\*; DestDir: {app}\Setup; Flags: ignoreversion Source: Sprites\*; DestDir: {app}\Sprites; Flags: ignoreversion [Icons] @@ -60,24 +62,51 @@ Name: {localappdata}\Doom Builder; Type: filesandordirs Name: {app}\Builder.pdb; Type: files [Registry] Root: HKLM; Subkey: SOFTWARE\CodeImp\Doom Builder\; ValueType: string; ValueName: Location; ValueData: {app}; Flags: uninsdeletevalue +[Messages] +ReadyLabel2a=Continue to begin with the installation, or click Back if you want to review or change any settings. [Code] // Global variables var page_info_net: TOutputMsgWizardPage; + page_info_netfailed: TOutputMsgWizardPage; page_setup_net: TOutputProgressWizardPage; page_setup_components: TOutputProgressWizardPage; componentsinstalled: Boolean; restartneeded: Boolean; + netinstallfailed: Boolean; + netisinstalled: Boolean; +procedure CheckNetIsInstalled(); +begin + netisinstalled := RegKeyExists(HKLM, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.5') or + RegKeyExists(HKLM, 'SOFTWARE\Wow6432Node\Microsoft\NET Framework Setup\NDP\v3.5'); +end; // When the wizard initializes procedure InitializeWizard(); begin restartneeded := false; componentsinstalled := false; - page_info_net := CreateOutputMsgPage(wpInstalling, 'Installing Microsoft .NET Framework', '', 'Setup has detected that your system is missing the required version of the Microsoft .NET Framework. Setup will now download and install or update your Microsoft .NET Framework. This requires an internet connection and may take several minutes to complete.' + #10 + #10 + 'WARNING: The installer will download the Microsoft .NET Framework from the internet, but the progress bar will not go forward until the download is complete. You may send Microsoft an angry letter about this bug.' + #10 + #10 + 'Press Next to begin.'); + netinstallfailed := false; + CheckNetIsInstalled(); + + page_info_net := CreateOutputMsgPage(wpPreparing, + 'Installing Microsoft .NET Framework', '', + 'Setup has detected that your system is missing the required version of the Microsoft .NET Framework. ' + + 'Setup will now download and install or update your Microsoft .NET Framework. This requires an internet connection ' + + 'and may take several minutes to complete.' + #10 + #10 + + 'WARNING: The installer will download the Microsoft .NET Framework from the internet, but the progress bar will not ' + + 'go forward until the download is complete. You may send Microsoft an angry letter about that.' + #10 + #10 + + 'Click Install to begin.'); + + page_info_netfailed := CreateOutputMsgPage(page_info_net.ID, + 'Installing Microsoft .NET Framework', '', + 'Setup could not install the Microsoft .NET Framework. Make sure you have an internet connection ' + + 'and click Back to try again.' + #10 + #10 + + 'Click Back to try again, or Cancel to exit Setup.'); + page_setup_net := CreateOutputProgressPage('Installing Microsoft .NET Framework', 'Setup is installing Microsoft .NET Framework, please wait.....'); - page_setup_components := CreateOutputProgressPage('Installing Components', 'Setup is installing required components.....'); + page_setup_components := CreateOutputProgressPage('Installing Components', 'Setup is installing required components. This may take a few minutes......'); end; @@ -87,9 +116,11 @@ function ShouldSkipPage(PageID: Integer): Boolean; begin // Skip the .NET page? if(PageID = page_info_net.ID) then - Result := RegKeyExists(HKLM, 'SOFTWARE\Microsoft\.NETFramework\policy\v2.0') + Result := netisinstalled + else if(PageID = page_info_netfailed.ID) then + Result := (not netinstallfailed) and netisinstalled else - Result := False; + Result := false; end; @@ -105,15 +136,37 @@ procedure CurPageChanged(CurPageID: Integer); var errorcode: Integer; begin - if(CurPageID = wpFinished) then - if(componentsinstalled = False) then + if(CurPageID = wpReady) then + begin + if(netisinstalled = false) then + WizardForm.NextButton.Caption := 'Next >'; + end + else if(CurPageID = wpFinished) then + begin + if(componentsinstalled = false) then begin page_setup_components.Show; - ShellExec('open', ExpandConstant('{app}\Setup\dxwebsetup.exe'), '/Q', '', SW_SHOW, ewWaitUntilTerminated, errorcode); - ShellExec('open', 'msiexec', ExpandConstant('/passive /i "{app}\Setup\slimdx.msi"'), '', SW_SHOW, ewWaitUntilTerminated, errorcode); - componentsinstalled := True; + ExtractTemporaryFile('dxwebsetup.exe'); + Exec(ExpandConstant('{tmp}\dxwebsetup.exe'), '/Q', '', SW_SHOW, ewWaitUntilTerminated, errorcode); + ExtractTemporaryFile('slimdx.msi'); + ShellExec('open', 'msiexec', ExpandConstant('/passive /i "{tmp}\slimdx.msi"'), '', SW_SHOW, ewWaitUntilTerminated, errorcode); + componentsinstalled := true; page_setup_components.Hide; end + end + else if(CurPageID = page_info_net.ID) then + begin + WizardForm.NextButton.Caption := 'Install'; + end + else if(CurPageID = page_info_netfailed.ID) then + begin + WizardForm.NextButton.Visible := true; + WizardForm.NextButton.Enabled := false; + WizardForm.BackButton.Visible := true; + WizardForm.BackButton.Enabled := true; + WizardForm.CancelButton.Visible := true; + WizardForm.CancelButton.Enabled := true; + end; end; @@ -121,6 +174,7 @@ end; function NextButtonClick(CurPage: Integer): Boolean; var errorcode: Integer; + tempfile: String; begin // Next pressed on .NET info page? @@ -130,12 +184,27 @@ begin page_setup_net.Show; try begin - ShellExec('open', ExpandConstant('{app}\Setup\dotnetfx35setup.exe'), '/qb /norestart', '', SW_SHOW, ewWaitUntilTerminated, errorcode); - if(errorcode = 3010) then + + netinstallfailed := false; + ExtractTemporaryFile('dotnetfx35setup.exe'); + // We copy the file to the real temp directory so that it isn't removed when Setup is closed. + // Judging from the return codes, this installer may want to run again after a reboot. + // See the return codes here: http://msdn.microsoft.com/en-us/library/cc160716.aspx + tempfile := RemoveBackslash(GetTempDir()) + '\dotnetfx35setup.exe'; + FileCopy(ExpandConstant('{tmp}\dotnetfx35setup.exe'), tempfile, false); + Exec(tempfile, '/qb /norestart', '', SW_SHOW, ewWaitUntilTerminated, errorcode); + + if((errorcode = 1641) or (errorcode = 3010)) then begin - restartneeded := True; - // Actually we should restart immediately here and tell the user to install again after restart + // Success, but restart needed! + restartneeded := true; end + else if(errorcode <> 0) then + begin + netinstallfailed := true; + end; + + CheckNetIsInstalled(); end finally page_setup_net.Hide; @@ -157,6 +226,22 @@ end; + + + + + + + + + + + + + + + + diff --git a/Source/Core/Builder.csproj b/Source/Core/Builder.csproj index 7c911225..0860f39d 100644 --- a/Source/Core/Builder.csproj +++ b/Source/Core/Builder.csproj @@ -689,6 +689,7 @@ ScriptFindReplaceForm.cs + Form diff --git a/Source/Core/General/General.cs b/Source/Core/General/General.cs index f6e1a12d..106ed51c 100644 --- a/Source/Core/General/General.cs +++ b/Source/Core/General/General.cs @@ -165,6 +165,7 @@ namespace CodeImp.DoomBuilder private static TypesManager types; private static Clock clock; private static ErrorLogger errorlogger; + private static Mutex appmutex; // Configurations private static List configs; @@ -565,12 +566,16 @@ namespace CodeImp.DoomBuilder // Enable OS visual styles Application.EnableVisualStyles(); Application.DoEvents(); // This must be here to work around a .NET bug - + ToolStripManager.Renderer = new ToolStripProfessionalRenderer(new TanColorTable()); + // Hook to DLL loading failure event AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(CurrentDomain_AssemblyResolve); // Set current thread name Thread.CurrentThread.Name = "Main Application"; + + // Application is running + appmutex = new Mutex(false, "doombuilder2"); // Get a reference to this assembly thisasm = Assembly.GetExecutingAssembly(); diff --git a/Source/Core/Rendering/D3DDevice.cs b/Source/Core/Rendering/D3DDevice.cs index 89396fd1..3fd02942 100644 --- a/Source/Core/Rendering/D3DDevice.cs +++ b/Source/Core/Rendering/D3DDevice.cs @@ -116,7 +116,7 @@ namespace CodeImp.DoomBuilder.Rendering rendertarget = null; if(backbuffer != null) backbuffer.Dispose(); if(depthbuffer != null) depthbuffer.Dispose(); - device.Dispose(); + if(device != null) device.Dispose(); if(font != null) font.Dispose(); if(fonttexture != null) fonttexture.Dispose(); diff --git a/Source/Core/Windows/MainForm.Designer.cs b/Source/Core/Windows/MainForm.Designer.cs index a27a0034..8f57a626 100644 --- a/Source/Core/Windows/MainForm.Designer.cs +++ b/Source/Core/Windows/MainForm.Designer.cs @@ -854,6 +854,7 @@ namespace CodeImp.DoomBuilder.Windows // // toolbar // + this.toolbar.AutoSize = false; this.toolbar.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; this.toolbar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.buttonnewmap, diff --git a/Source/Core/Windows/TanColorTable.cs b/Source/Core/Windows/TanColorTable.cs new file mode 100644 index 00000000..3a193fc1 --- /dev/null +++ b/Source/Core/Windows/TanColorTable.cs @@ -0,0 +1,786 @@ + +#region ================== Copyright (c) 2007 Pascal vd Heiden + +/* + * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com + * This program is released under GNU General Public License + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#endregion + +#region ================== Namespaces + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Globalization; +using System.Runtime.InteropServices; +using System.Text; +using System.Windows.Forms; +using System.IO; +using System.Reflection; +using System.Drawing; +using System.ComponentModel; +using System.Windows.Forms.VisualStyles; +using CodeImp.DoomBuilder.Map; +using Microsoft.Win32; +using SlimDX.Direct3D9; +using SlimDX; +using CodeImp.DoomBuilder.Geometry; +using System.Drawing.Imaging; +using CodeImp.DoomBuilder.Data; +using CodeImp.DoomBuilder.Editing; + +#endregion + +namespace CodeImp.DoomBuilder.Windows +{ + // Taken from http://blogs.msdn.com/jfoscoding/archive/2005/11/06/489641.aspx + + internal class TanColorTable : ProfessionalColorTable + { + // Methods + public TanColorTable() + { + } + + internal Color FromKnownColor(TanColorTable.KnownColors color) + { + return (Color)this.ColorTable[color]; + } + + internal static void InitTanLunaColors(ref Dictionary rgbTable) + { + rgbTable[TanColorTable.KnownColors.GripDark] = Color.FromArgb(0xc1, 190, 0xb3); + rgbTable[TanColorTable.KnownColors.SeparatorDark] = Color.FromArgb(0xc5, 0xc2, 0xb8); + rgbTable[TanColorTable.KnownColors.MenuItemSelected] = Color.FromArgb(0xc1, 210, 0xee); + rgbTable[TanColorTable.KnownColors.ButtonPressedBorder] = Color.FromArgb(0x31, 0x6a, 0xc5); + rgbTable[TanColorTable.KnownColors.CheckBackground] = Color.FromArgb(0xe1, 230, 0xe8); + rgbTable[TanColorTable.KnownColors.MenuItemBorder] = Color.FromArgb(0x31, 0x6a, 0xc5); + rgbTable[TanColorTable.KnownColors.CheckBackgroundMouseOver] = Color.FromArgb(0x31, 0x6a, 0xc5); + rgbTable[TanColorTable.KnownColors.MenuItemBorderMouseOver] = Color.FromArgb(0x4b, 0x4b, 0x6f); + rgbTable[TanColorTable.KnownColors.ToolStripDropDownBackground] = Color.FromArgb(0xfc, 0xfc, 0xf9); + rgbTable[TanColorTable.KnownColors.MenuBorder] = Color.FromArgb(0x8a, 0x86, 0x7a); + rgbTable[TanColorTable.KnownColors.SeparatorLight] = Color.FromArgb(0xff, 0xff, 0xff); + rgbTable[TanColorTable.KnownColors.ToolStripBorder] = Color.FromArgb(0xa3, 0xa3, 0x7c); + rgbTable[TanColorTable.KnownColors.MenuStripGradientBegin] = Color.FromArgb(0xe5, 0xe5, 0xd7); + rgbTable[TanColorTable.KnownColors.MenuStripGradientEnd] = Color.FromArgb(0xf4, 0xf2, 0xe8); + rgbTable[TanColorTable.KnownColors.ImageMarginGradientBegin] = Color.FromArgb(0xfe, 0xfe, 0xfb); + rgbTable[TanColorTable.KnownColors.ImageMarginGradientMiddle] = Color.FromArgb(0xec, 0xe7, 0xe0); + rgbTable[TanColorTable.KnownColors.ImageMarginGradientEnd] = Color.FromArgb(0xbd, 0xbd, 0xa3); + rgbTable[TanColorTable.KnownColors.OverflowButtonGradientBegin] = Color.FromArgb(0xf3, 0xf2, 240); + rgbTable[TanColorTable.KnownColors.OverflowButtonGradientMiddle] = Color.FromArgb(0xe2, 0xe1, 0xdb); + rgbTable[TanColorTable.KnownColors.OverflowButtonGradientEnd] = Color.FromArgb(0x92, 0x92, 0x76); + rgbTable[TanColorTable.KnownColors.MenuItemPressedGradientBegin] = Color.FromArgb(0xfc, 0xfc, 0xf9); + rgbTable[TanColorTable.KnownColors.MenuItemPressedGradientEnd] = Color.FromArgb(0xf6, 0xf4, 0xec); + rgbTable[TanColorTable.KnownColors.ImageMarginRevealedGradientBegin] = Color.FromArgb(0xf7, 0xf6, 0xef); + rgbTable[TanColorTable.KnownColors.ImageMarginRevealedGradientMiddle] = Color.FromArgb(0xf2, 240, 0xe4); + rgbTable[TanColorTable.KnownColors.ImageMarginRevealedGradientEnd] = Color.FromArgb(230, 0xe3, 210); + rgbTable[TanColorTable.KnownColors.ButtonCheckedGradientBegin] = Color.FromArgb(0xe1, 230, 0xe8); + rgbTable[TanColorTable.KnownColors.ButtonCheckedGradientMiddle] = Color.FromArgb(0xe1, 230, 0xe8); + rgbTable[TanColorTable.KnownColors.ButtonCheckedGradientEnd] = Color.FromArgb(0xe1, 230, 0xe8); + rgbTable[TanColorTable.KnownColors.ButtonSelectedGradientBegin] = Color.FromArgb(0xc1, 210, 0xee); + rgbTable[TanColorTable.KnownColors.ButtonSelectedGradientMiddle] = Color.FromArgb(0xc1, 210, 0xee); + rgbTable[TanColorTable.KnownColors.ButtonSelectedGradientEnd] = Color.FromArgb(0xc1, 210, 0xee); + rgbTable[TanColorTable.KnownColors.ButtonPressedGradientBegin] = Color.FromArgb(0x98, 0xb5, 0xe2); + rgbTable[TanColorTable.KnownColors.ButtonPressedGradientMiddle] = Color.FromArgb(0x98, 0xb5, 0xe2); + rgbTable[TanColorTable.KnownColors.ButtonPressedGradientEnd] = Color.FromArgb(0x98, 0xb5, 0xe2); + rgbTable[TanColorTable.KnownColors.GripLight] = Color.FromArgb(0xff, 0xff, 0xff); + } + + public override Color ButtonCheckedGradientBegin + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ButtonCheckedGradientBegin); + } + return base.ButtonCheckedGradientBegin; + } + } + + public override Color ButtonCheckedGradientEnd + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ButtonCheckedGradientEnd); + } + return base.ButtonCheckedGradientEnd; + } + } + + public override Color ButtonCheckedGradientMiddle + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ButtonCheckedGradientMiddle); + } + return base.ButtonCheckedGradientMiddle; + } + } + + + public override Color ButtonPressedBorder + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ButtonPressedBorder); + } + return base.ButtonPressedBorder; + } + } + + public override Color ButtonPressedGradientBegin + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ButtonPressedGradientBegin); + } + return base.ButtonPressedGradientBegin; + } + } + + public override Color ButtonPressedGradientEnd + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ButtonPressedGradientEnd); + } + return base.ButtonPressedGradientEnd; + } + } + + + public override Color ButtonPressedGradientMiddle + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ButtonPressedGradientMiddle); + } + return base.ButtonPressedGradientMiddle; + } + } + + public override Color ButtonSelectedBorder + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ButtonPressedBorder); + } + return base.ButtonSelectedBorder; + } + } + + + public override Color ButtonSelectedGradientBegin + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ButtonSelectedGradientBegin); + } + return base.ButtonSelectedGradientBegin; + } + } + public override Color ButtonSelectedGradientEnd + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ButtonSelectedGradientEnd); + } + return base.ButtonSelectedGradientEnd; + } + } + public override Color ButtonSelectedGradientMiddle + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ButtonSelectedGradientMiddle); + } + return base.ButtonSelectedGradientMiddle; + } + } + + public override Color CheckBackground + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.CheckBackground); + } + return base.CheckBackground; + } + } + + public override Color CheckPressedBackground + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.CheckBackgroundMouseOver); + } + return base.CheckPressedBackground; + } + } + + public override Color CheckSelectedBackground + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.CheckBackgroundMouseOver); + } + return base.CheckSelectedBackground; + } + } + + + internal static string ColorScheme + { + get + { + return TanColorTable.DisplayInformation.ColorScheme; + } + } + + private Dictionary ColorTable + { + get + { + if(this.tanRGB == null) + { + this.tanRGB = new Dictionary((int)KnownColors.LastKnownColor); + TanColorTable.InitTanLunaColors(ref this.tanRGB); + } + return this.tanRGB; + } + } + + public override Color GripDark + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.GripDark); + } + return base.GripDark; + } + } + + public override Color GripLight + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.GripLight); + } + return base.GripLight; + } + } + public override Color ImageMarginGradientBegin + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ImageMarginGradientBegin); + } + return base.ImageMarginGradientBegin; + } + } + + public override Color ImageMarginGradientEnd + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ImageMarginGradientEnd); + } + return base.ImageMarginGradientEnd; + } + } + + public override Color ImageMarginGradientMiddle + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ImageMarginGradientMiddle); + } + return base.ImageMarginGradientMiddle; + } + } + + public override Color ImageMarginRevealedGradientBegin + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ImageMarginRevealedGradientBegin); + } + return base.ImageMarginRevealedGradientBegin; + } + } + + public override Color ImageMarginRevealedGradientEnd + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ImageMarginRevealedGradientEnd); + } + return base.ImageMarginRevealedGradientEnd; + } + } + + public override Color ImageMarginRevealedGradientMiddle + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ImageMarginRevealedGradientMiddle); + } + return base.ImageMarginRevealedGradientMiddle; + } + } + + public override Color MenuBorder + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.MenuBorder); + } + return base.MenuItemBorder; + } + } + + + public override Color MenuItemBorder + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.MenuItemBorder); + } + return base.MenuItemBorder; + } + } + + public override Color MenuItemPressedGradientBegin + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.MenuItemPressedGradientBegin); + } + return base.MenuItemPressedGradientBegin; + } + } + + public override Color MenuItemPressedGradientEnd + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.MenuItemPressedGradientEnd); + } + return base.MenuItemPressedGradientEnd; + } + } + + public override Color MenuItemPressedGradientMiddle + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ImageMarginRevealedGradientMiddle); + } + return base.MenuItemPressedGradientMiddle; + } + } + + public override Color MenuItemSelected + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.MenuItemSelected); + } + return base.MenuItemSelected; + } + } + + public override Color MenuItemSelectedGradientBegin + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ButtonSelectedGradientBegin); + } + return base.MenuItemSelectedGradientBegin; + } + } + + public override Color MenuItemSelectedGradientEnd + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ButtonSelectedGradientEnd); + } + return base.MenuItemSelectedGradientEnd; + } + } + + + public override Color MenuStripGradientBegin + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.MenuStripGradientBegin); + } + return base.MenuStripGradientBegin; + } + } + + public override Color MenuStripGradientEnd + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.MenuStripGradientEnd); + } + return base.MenuStripGradientEnd; + } + } + + public override Color OverflowButtonGradientBegin + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.OverflowButtonGradientBegin); + } + return base.OverflowButtonGradientBegin; + } + } + + public override Color OverflowButtonGradientEnd + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.OverflowButtonGradientEnd); + } + return base.OverflowButtonGradientEnd; + } + } + + public override Color OverflowButtonGradientMiddle + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.OverflowButtonGradientMiddle); + } + return base.OverflowButtonGradientMiddle; + } + } + + + public override Color RaftingContainerGradientBegin + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.MenuStripGradientBegin); + } + return base.RaftingContainerGradientBegin; + } + } + + public override Color RaftingContainerGradientEnd + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.MenuStripGradientEnd); + } + return base.RaftingContainerGradientEnd; + } + } + + + public override Color SeparatorDark + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.SeparatorDark); + } + return base.SeparatorDark; + } + } + + public override Color SeparatorLight + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.SeparatorLight); + } + return base.SeparatorLight; + } + } + + public override Color ToolStripBorder + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ToolStripBorder); + } + return base.ToolStripBorder; + } + } + + + public override Color ToolStripDropDownBackground + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ToolStripDropDownBackground); + } + return base.ToolStripDropDownBackground; + } + } + + public override Color ToolStripGradientBegin + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ImageMarginGradientBegin); + } + return base.ToolStripGradientBegin; + } + } + + public override Color ToolStripGradientEnd + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ImageMarginGradientEnd); + } + return base.ToolStripGradientEnd; + } + } + + public override Color ToolStripGradientMiddle + { + get + { + if(!this.UseBaseColorTable) + { + return this.FromKnownColor(TanColorTable.KnownColors.ImageMarginGradientMiddle); + } + return base.ToolStripGradientMiddle; + } + } + + private bool UseBaseColorTable + { + get + { + bool flag1 = !TanColorTable.DisplayInformation.IsLunaTheme || + ((TanColorTable.ColorScheme != oliveColorScheme) && + (TanColorTable.ColorScheme != blueColorScheme)); + if(flag1 && (this.tanRGB != null)) + { + this.tanRGB.Clear(); + this.tanRGB = null; + } + return flag1; + } + } + + + + // Fields + private const string blueColorScheme = "NormalColor"; + private const string oliveColorScheme = "HomeStead"; + private const string silverColorScheme = "Metallic"; + private Dictionary tanRGB; + + // Nested Types + private static class DisplayInformation + { + // Methods + static DisplayInformation() + { + SystemEvents.UserPreferenceChanged += TanColorTable.DisplayInformation.OnUserPreferenceChanged; + TanColorTable.DisplayInformation.SetScheme(); + } + + private static void OnUserPreferenceChanged(object sender, UserPreferenceChangedEventArgs e) + { + TanColorTable.DisplayInformation.SetScheme(); + } + + private static void SetScheme() + { + TanColorTable.DisplayInformation.isLunaTheme = false; + if(VisualStyleRenderer.IsSupported) + { + DisplayInformation.colorScheme = VisualStyleInformation.ColorScheme; + + if(!VisualStyleInformation.IsEnabledByUser) + { + return; + } + StringBuilder builder1 = new StringBuilder(0x200); + GetCurrentThemeName(builder1, builder1.Capacity, null, 0, null, 0); + string text1 = builder1.ToString(); + TanColorTable.DisplayInformation.isLunaTheme = string.Equals(lunaFileName, Path.GetFileName(text1), StringComparison.InvariantCultureIgnoreCase); + } + else + { + TanColorTable.DisplayInformation.colorScheme = null; + } + } + + + // Properties + + public static string ColorScheme + { + get + { + return colorScheme; + } + } + + internal static bool IsLunaTheme + { + get + { + return isLunaTheme; + } + } + + // Fields + [ThreadStatic] + private static string colorScheme; + [ThreadStatic] + private static bool isLunaTheme; + private const string lunaFileName = "luna.msstyles"; + + [DllImport("uxtheme.dll", CharSet = CharSet.Auto)] + public static extern int GetCurrentThemeName(StringBuilder pszThemeFileName, int dwMaxNameChars, StringBuilder pszColorBuff, int dwMaxColorChars, StringBuilder pszSizeBuff, int cchMaxSizeChars); + + } + + internal enum KnownColors + { + ButtonPressedBorder, + MenuItemBorder, + MenuItemBorderMouseOver, + MenuItemSelected, + CheckBackground, + CheckBackgroundMouseOver, + GripDark, + GripLight, + MenuStripGradientBegin, + MenuStripGradientEnd, + ImageMarginRevealedGradientBegin, + ImageMarginRevealedGradientEnd, + ImageMarginRevealedGradientMiddle, + MenuItemPressedGradientBegin, + MenuItemPressedGradientEnd, + ButtonPressedGradientBegin, + ButtonPressedGradientEnd, + ButtonPressedGradientMiddle, + ButtonSelectedGradientBegin, + ButtonSelectedGradientEnd, + ButtonSelectedGradientMiddle, + OverflowButtonGradientBegin, + OverflowButtonGradientEnd, + OverflowButtonGradientMiddle, + ButtonCheckedGradientBegin, + ButtonCheckedGradientEnd, + ButtonCheckedGradientMiddle, + ImageMarginGradientBegin, + ImageMarginGradientEnd, + ImageMarginGradientMiddle, + MenuBorder, + ToolStripDropDownBackground, + ToolStripBorder, + SeparatorDark, + SeparatorLight, + LastKnownColor = SeparatorLight, + + } + } + +} \ No newline at end of file