Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixes and improvements

Browse Source 
Defaulting extended palette in embedded themes, removed the reference to the dockpanel theme palette, that only exist in vs2015
This commit is contained in:
CamAlvar
2017-06-28 00:26:01 -05:00
parent 509acd1192
commit 5429bb7d2b
14 changed files with 23368 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mRemoteNG.Specs/App.config
View File

@@ -6,4 +6,12 @@
<specFlow>
<!-- For additional details on SpecFlow configuration options see http://go.specflow.org/doc-config -->
<!-- For additional details on SpecFlow configuration options see http://go.specflow.org/doc-config --><unitTestProvider name="NUnit" /></specFlow>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.15.0.0" newVersion="2.15.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

11
mRemoteNGTests/app.config Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

1
mRemoteNGTests/mRemoteNGTests.csproj
View File

@@ -228,6 +228,7 @@
<Compile Include="UI\Window\ConnectionTreeWindowTests.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>

7733
mRemoteV1/Resources/Themes/vs2015blue.vstheme Normal file
View File

File diff suppressed because it is too large Load Diff

7729
mRemoteV1/Resources/Themes/vs2015dark.vstheme Normal file
View File

File diff suppressed because it is too large Load Diff

7760
mRemoteV1/Resources/Themes/vs2015light.vstheme Normal file
View File

File diff suppressed because it is too large Load Diff

16
mRemoteV1/Themes/ExtendedColorPalette.cs
View File

@@ -37,8 +37,17 @@ namespace mRemoteNG.Themes
public BasicPalette ButtonHover { get; set; }
}
public class TextBoxPalette : BasicPalette
{
public Color TextBoxBorder { get; set; }
public Color TextBoxBorderDisabled { get; set; }
public Color TextBoxBorderFocused { get; set; }
public BasicPalette TextBoxFocused { get; set; }
public BasicPalette TextBoxDisabled { get; set; }
}
public class ExtendedColorPalette
{
public TreeViewPalette TreeViewPalette { get; set; }
@@ -46,6 +55,7 @@ namespace mRemoteNG.Themes
public ButtonPalette ButtonPalette { get; set; }
public BasicPalette ErrorText { get; set; }
public BasicPalette WarningText { get; set; }
public TextBoxPalette TextBoxPalette { get; set; }
public ExtendedColorPalette()
{
@@ -62,6 +72,10 @@ namespace mRemoteNG.Themes
ButtonPalette.ButtonHover = new BasicPalette();
ErrorText = new BasicPalette();
WarningText = new BasicPalette();
TextBoxPalette = new TextBoxPalette();
TextBoxPalette.TextBoxFocused = new BasicPalette();
TextBoxPalette.TextBoxDisabled = new BasicPalette();
}
}

11
mRemoteV1/Themes/MremoteNGPaletteLoader.cs
View File

@@ -54,6 +54,17 @@ namespace mRemoteNG.Themes
palette.WarningText.Foreground = ColorTranslatorFromHtml("Text Editor Text Marker Items", "compiler warning", true);
palette.ErrorText.Background = ColorTranslatorFromHtml("Text Editor Text Marker Items", "compiler error", false);
palette.ErrorText.Foreground = ColorTranslatorFromHtml("Text Editor Text Marker Items", "compiler error", true);
//Text box colors
palette.TextBoxPalette.Background = ColorTranslatorFromHtml("CommonControls", "TextBoxBackground", false);
palette.TextBoxPalette.Foreground = ColorTranslatorFromHtml("CommonControls", "TextBoxText", false);
palette.TextBoxPalette.TextBoxBorder = ColorTranslatorFromHtml("CommonControls", "TextBoxBorder", false);
palette.TextBoxPalette.TextBoxBorderDisabled = ColorTranslatorFromHtml("CommonControls", "TextBoxBorderDisabled", false);
palette.TextBoxPalette.TextBoxBorderFocused = ColorTranslatorFromHtml("CommonControls", "TextBoxBorderFocused", false);
palette.TextBoxPalette.TextBoxDisabled.Background = ColorTranslatorFromHtml("CommonControls", "TextBoxBackgroundDisabled", false);
palette.TextBoxPalette.TextBoxDisabled.Foreground = ColorTranslatorFromHtml("CommonControls", "TextBoxTextDisabled", false);
palette.TextBoxPalette.TextBoxFocused.Background = ColorTranslatorFromHtml("CommonControls", "TextBoxBackgroundFocused", false);
palette.TextBoxPalette.TextBoxFocused.Foreground = ColorTranslatorFromHtml("CommonControls", "TextBoxTextFocused", false);
return palette;
}

47
mRemoteV1/Themes/ThemeManager.cs
View File

@@ -51,32 +51,8 @@ namespace mRemoteNG.Themes
{
themes = new Hashtable();
//Load the embedded themes
ThemeInfo vs2003 = new ThemeInfo("Vs2003", new VS2003Theme(), "", VisualStudioToolStripExtender.VsVersion.Vs2003);
themes.Add("Vs2003", vs2003);
ThemeInfo vs2005 = new ThemeInfo("Vs2005", new VS2005Theme(), "", VisualStudioToolStripExtender.VsVersion.Vs2005);
themes.Add("Vs2005", vs2005);
ThemeInfo vs2012Light = new ThemeInfo("vs2012Light", new VS2012LightTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2012);
themes.Add("vs2012Light", vs2012Light);
ThemeInfo vs2012Dark = new ThemeInfo("vs2012Dark", new VS2012DarkTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2012);
themes.Add("vs2012Dark", vs2012Dark);
ThemeInfo vs2012Blue = new ThemeInfo("vs2012Blue", new VS2012BlueTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2012);
themes.Add("vs2012Blue", vs2012Blue);
ThemeInfo vs2013Light = new ThemeInfo("vs2013Light", new VS2013LightTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2013);
themes.Add("vs2013Light", vs2013Light);
ThemeInfo vs2013Dark = new ThemeInfo("vs2013Dark", new VS2013DarkTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2013);
themes.Add("vs2013Dark", vs2013Dark);
ThemeInfo vs2013Blue = new ThemeInfo("vs2013Blue", new VS2013BlueTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2013);
themes.Add("vs2013Blue", vs2013Blue);
ThemeInfo vs2015Light = new ThemeInfo("vs2015Light", new VS2015LightTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2015);
themes.Add("vs2015Light", vs2015Light);
ThemeInfo vs2015Dark = new ThemeInfo("vs2015Dark", new VS2015DarkTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2015);
themes.Add("vs2015Dark", vs2015Dark);
ThemeInfo vs2015Blue = new ThemeInfo("vs2005Blue", new VS2015BlueTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2015);
themes.Add("vs2005Blue", vs2015Blue);
//Load the files in theme folder
string[] themeFiles = Directory.GetFiles(Path.Combine(App.Info.SettingsFileInfo.SettingsPath, "themes"),"*.vstheme");
//Load the files in theme folder first, to incluide vstheme light as default
string[] themeFiles = Directory.GetFiles(Path.Combine(App.Info.SettingsFileInfo.SettingsPath, "themes"), "*.vstheme");
foreach (string themeFile in themeFiles)
{
@@ -88,6 +64,23 @@ namespace mRemoteNG.Themes
}
//Load the embedded themes, extended palettes are taken from the vs2015 themes
ThemeInfo vs2003 = new ThemeInfo("Vs2003", new VS2003Theme(), "", VisualStudioToolStripExtender.VsVersion.Vs2003, ((ThemeInfo)themes["vs2015light"]).ExtendedPalette);
themes.Add("Vs2003", vs2003);
ThemeInfo vs2005 = new ThemeInfo("Vs2005", new VS2005Theme(), "", VisualStudioToolStripExtender.VsVersion.Vs2005, ((ThemeInfo)themes["vs2015light"]).ExtendedPalette);
themes.Add("Vs2005", vs2005);
ThemeInfo vs2012Light = new ThemeInfo("vs2012Light", new VS2012LightTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2012,((ThemeInfo)themes["vs2015light"]).ExtendedPalette);
themes.Add("vs2012Light", vs2012Light);
ThemeInfo vs2012Dark = new ThemeInfo("vs2012Dark", new VS2012DarkTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2012, ((ThemeInfo)themes["vs2015dark"]).ExtendedPalette);
themes.Add("vs2012Dark", vs2012Dark);
ThemeInfo vs2012Blue = new ThemeInfo("vs2012Blue", new VS2012BlueTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2012, ((ThemeInfo)themes["vs2015blue"]).ExtendedPalette);
themes.Add("vs2012Blue", vs2012Blue);
ThemeInfo vs2013Light = new ThemeInfo("vs2013Light", new VS2013LightTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2013, ((ThemeInfo)themes["vs2015light"]).ExtendedPalette);
themes.Add("vs2013Light", vs2013Light);
ThemeInfo vs2013Dark = new ThemeInfo("vs2013Dark", new VS2013DarkTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2013, ((ThemeInfo)themes["vs2015dark"]).ExtendedPalette);
themes.Add("vs2013Dark", vs2013Dark);
ThemeInfo vs2013Blue = new ThemeInfo("vs2013Blue", new VS2013BlueTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2013, ((ThemeInfo)themes["vs2015blue"]).ExtendedPalette);
themes.Add("vs2013Blue", vs2013Blue);
}
@@ -136,7 +129,7 @@ namespace mRemoteNG.Themes
{
get
{
return (ThemeInfo) themes["darcula"];
return (ThemeInfo) themes["vs2015light"];
}
}

8
mRemoteV1/UI/Window/ConfigWindow.cs
View File

@@ -610,13 +610,13 @@ namespace mRemoteNG.UI.Window
private void ApplyTheme()
{
_pGrid.BackColor = _themeManager.ActiveTheme.Theme.ColorPalette.CommandBarMenuDefault.Background;
_pGrid.ForeColor = _themeManager.ActiveTheme.Theme.ColorPalette.CommandBarMenuDefault.Text;
_pGrid.BackColor = _themeManager.ActiveTheme.ExtendedPalette.TextBoxPalette.Background;
_pGrid.ForeColor = _themeManager.ActiveTheme.ExtendedPalette.TextBoxPalette.Foreground;
_pGrid.ViewBackColor = _themeManager.ActiveTheme.ExtendedPalette.ListPalette.ListItem.Background;
_pGrid.ViewForeColor = _themeManager.ActiveTheme.ExtendedPalette.ListPalette.ListItem.Foreground;
_pGrid.LineColor = _themeManager.ActiveTheme.ExtendedPalette.ListPalette.ListItemBorder;
_pGrid.HelpBackColor = _themeManager.ActiveTheme.Theme.ColorPalette.CommandBarMenuDefault.Background;
_pGrid.HelpForeColor = _themeManager.ActiveTheme.Theme.ColorPalette.CommandBarMenuDefault.Text;
_pGrid.HelpBackColor = _themeManager.ActiveTheme.ExtendedPalette.TextBoxPalette.Background;
_pGrid.HelpForeColor = _themeManager.ActiveTheme.ExtendedPalette.TextBoxPalette.Foreground;
_pGrid.CategoryForeColor = _themeManager.ActiveTheme.ExtendedPalette.ListPalette.ListHeader.Foreground;
_pGrid.CommandsDisabledLinkColor = _themeManager.ActiveTheme.ExtendedPalette.ListPalette.ListItemDisabled.Foreground;
_pGrid.CommandsBackColor = _themeManager.ActiveTheme.ExtendedPalette.ListPalette.ListItemDisabled.Background;

20
mRemoteV1/UI/Window/ErrorAndInfoWindow.cs
View File

@@ -52,8 +52,8 @@ namespace mRemoteNG.UI.Window
#region Private Methods
private void ApplyTheme()
{
lvErrorCollector.BackColor = _themeManager.ActiveTheme.Theme.ColorPalette.CommandBarMenuDefault.Background;
lvErrorCollector.ForeColor = _themeManager.ActiveTheme.Theme.ColorPalette.CommandBarMenuDefault.Text;
lvErrorCollector.BackColor = _themeManager.ActiveTheme.ExtendedPalette.TextBoxPalette.Background;
lvErrorCollector.ForeColor = _themeManager.ActiveTheme.ExtendedPalette.TextBoxPalette.Foreground;
}
@@ -194,17 +194,17 @@ namespace mRemoteNG.UI.Window
break;
case MessageClass.WarningMsg:
pbError.Image = Resources.Warning;
pnlErrorMsg.BackColor = _themeManager.ActiveTheme.ExtendedPalette.WarningText.Foreground;
pnlErrorMsg.ForeColor = _themeManager.ActiveTheme.ExtendedPalette.WarningText.Background;
txtMsgText.BackColor = _themeManager.ActiveTheme.ExtendedPalette.WarningText.Foreground;
txtMsgText.ForeColor = _themeManager.ActiveTheme.ExtendedPalette.WarningText.Background;
pnlErrorMsg.BackColor = _themeManager.ActiveTheme.ExtendedPalette.WarningText.Background;
pnlErrorMsg.ForeColor = _themeManager.ActiveTheme.ExtendedPalette.WarningText.Foreground;
txtMsgText.BackColor = _themeManager.ActiveTheme.ExtendedPalette.WarningText.Background;
txtMsgText.ForeColor = _themeManager.ActiveTheme.ExtendedPalette.WarningText.Foreground;
break;
case MessageClass.ErrorMsg:
pbError.Image = Resources._Error;
pnlErrorMsg.BackColor = _themeManager.ActiveTheme.ExtendedPalette.ErrorText.Foreground;
pnlErrorMsg.ForeColor = _themeManager.ActiveTheme.ExtendedPalette.ErrorText.Background;
txtMsgText.BackColor = _themeManager.ActiveTheme.ExtendedPalette.ErrorText.Foreground;
txtMsgText.ForeColor = _themeManager.ActiveTheme.ExtendedPalette.ErrorText.Background;
pnlErrorMsg.BackColor = _themeManager.ActiveTheme.ExtendedPalette.ErrorText.Background;
pnlErrorMsg.ForeColor = _themeManager.ActiveTheme.ExtendedPalette.ErrorText.Foreground;
txtMsgText.BackColor = _themeManager.ActiveTheme.ExtendedPalette.ErrorText.Background;
txtMsgText.ForeColor = _themeManager.ActiveTheme.ExtendedPalette.ErrorText.Foreground;
break;
}

98
mRemoteV1/app.config
View File

@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="mRemoteNG.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
<section name="mRemoteNG.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="mRemoteNG.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
<section name="mRemoteNG.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</sectionGroup>
</configSections>
<log4net>
<logger name="Logger">
<level value="DEBUG"/>
<level value="DEBUG" />
</logger>
<root>
<level value="ALL"/>
<appender-ref ref="LogFileAppender"/>
<level value="ALL" />
<appender-ref ref="LogFileAppender" />
</root>
<appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
<file value="${APPDATA}\mRemoteNG\mRemoteNG.log"/>
<appendToFile value="true"/>
<rollingStyle value="Size"/>
<maxSizeRollBackups value="5"/>
<maximumFileSize value="10MB"/>
<staticLogFileName value="true"/>
<file value="${APPDATA}\mRemoteNG\mRemoteNG.log" />
<appendToFile value="true" />
<rollingStyle value="Size" />
<maxSizeRollBackups value="5" />
<maximumFileSize value="10MB" />
<staticLogFileName value="true" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date [%thread] %-6level- %message%newline"/>
<conversionPattern value="%date [%thread] %-6level- %message%newline" />
</layout>
</appender>
</log4net>
@@ -50,7 +50,7 @@
<value>True</value>
</setting>
<setting name="CustomPuttyPath" serializeAs="String">
<value/>
<value />
</setting>
<setting name="SwitchToMCOnInformation" serializeAs="String">
<value>True</value>
@@ -68,7 +68,7 @@
<value>False</value>
</setting>
<setting name="CustomConsPath" serializeAs="String">
<value/>
<value />
</setting>
<setting name="SaveConsOnExit" serializeAs="String">
<value>True</value>
@@ -95,13 +95,13 @@
<value>noinfo</value>
</setting>
<setting name="DefaultUsername" serializeAs="String">
<value/>
<value />
</setting>
<setting name="DefaultPassword" serializeAs="String">
<value/>
<value />
</setting>
<setting name="DefaultDomain" serializeAs="String">
<value/>
<value />
</setting>
<setting name="UseCustomPuttyPath" serializeAs="String">
<value>False</value>
@@ -119,7 +119,7 @@
<value>False</value>
</setting>
<setting name="UpdateProxyAddress" serializeAs="String">
<value/>
<value />
</setting>
<setting name="UpdateProxyPort" serializeAs="String">
<value>80</value>
@@ -128,13 +128,13 @@
<value>False</value>
</setting>
<setting name="UpdateProxyAuthUser" serializeAs="String">
<value/>
<value />
</setting>
<setting name="UpdateProxyAuthPass" serializeAs="String">
<value/>
<value />
</setting>
<setting name="ConDefaultDescription" serializeAs="String">
<value/>
<value />
</setting>
<setting name="ConDefaultProtocol" serializeAs="String">
<value>RDP</value>
@@ -221,13 +221,13 @@
<value>False</value>
</setting>
<setting name="SQLHost" serializeAs="String">
<value/>
<value />
</setting>
<setting name="SQLUser" serializeAs="String">
<value/>
<value />
</setting>
<setting name="SQLPass" serializeAs="String">
<value/>
<value />
</setting>
<setting name="InhDefaultCacheBitmaps" serializeAs="String">
<value>False</value>
@@ -299,10 +299,10 @@
<value>False</value>
</setting>
<setting name="ConDefaultPreExtApp" serializeAs="String">
<value/>
<value />
</setting>
<setting name="ConDefaultPostExtApp" serializeAs="String">
<value/>
<value />
</setting>
<setting name="InhDefaultPreExtApp" serializeAs="String">
<value>False</value>
@@ -341,10 +341,10 @@
<value>EncHextile</value>
</setting>
<setting name="ConDefaultVNCProxyIP" serializeAs="String">
<value/>
<value />
</setting>
<setting name="ConDefaultVNCProxyPassword" serializeAs="String">
<value/>
<value />
</setting>
<setting name="ConDefaultVNCProxyPort" serializeAs="String">
<value>0</value>
@@ -353,7 +353,7 @@
<value>ProxyNone</value>
</setting>
<setting name="ConDefaultVNCProxyUsername" serializeAs="String">
<value/>
<value />
</setting>
<setting name="InhDefaultVNCAuthMode" serializeAs="String">
<value>False</value>
@@ -407,7 +407,7 @@
<value>False</value>
</setting>
<setting name="XULRunnerPath" serializeAs="String">
<value/>
<value />
</setting>
<setting name="ConDefaultRenderingEngine" serializeAs="String">
<value>IE</value>
@@ -416,7 +416,7 @@
<value>False</value>
</setting>
<setting name="ConDefaultMacAddress" serializeAs="String">
<value/>
<value />
</setting>
<setting name="InhDefaultMacAddress" serializeAs="String">
<value>False</value>
@@ -425,13 +425,13 @@
<value>False</value>
</setting>
<setting name="ConDefaultUserField" serializeAs="String">
<value/>
<value />
</setting>
<setting name="InhDefaultUserField" serializeAs="String">
<value>False</value>
</setting>
<setting name="ConDefaultExtApp" serializeAs="String">
<value/>
<value />
</setting>
<setting name="InhDefaultExtApp" serializeAs="String">
<value>False</value>
@@ -479,19 +479,19 @@
<value>5</value>
</setting>
<setting name="OverrideUICulture" serializeAs="String">
<value/>
<value />
</setting>
<setting name="ConDefaultRDGatewayHostname" serializeAs="String">
<value/>
<value />
</setting>
<setting name="ConDefaultRDGatewayUsername" serializeAs="String">
<value/>
<value />
</setting>
<setting name="ConDefaultRDGatewayPassword" serializeAs="String">
<value/>
<value />
</setting>
<setting name="ConDefaultRDGatewayDomain" serializeAs="String">
<value/>
<value />
</setting>
<setting name="ConDefaultEnableFontSmoothing" serializeAs="String">
<value>False</value>
@@ -533,22 +533,22 @@
<value>release</value>
</setting>
<setting name="ThemeName" serializeAs="String">
<value/>
<value />
</setting>
<setting name="ShowConfigHelpText" serializeAs="String">
<value>True</value>
</setting>
<setting name="PuttySavedSessionsName" serializeAs="String">
<value/>
<value />
</setting>
<setting name="PuttySavedSessionsPanel" serializeAs="String">
<value/>
<value />
</setting>
<setting name="CompatibilityWarnLenovoAutoScrollUtility" serializeAs="String">
<value>True</value>
</setting>
<setting name="ConDefaultLoadBalanceInfo" serializeAs="String">
<value/>
<value />
</setting>
<setting name="ConDefaultAutomaticResize" serializeAs="String">
<value>True</value>
@@ -608,7 +608,7 @@
<value>00000000-0000-0000-0000-000000000000</value>
</setting>
<setting name="LogFilePath" serializeAs="String">
<value/>
<value />
</setting>
<setting name="TextLogMessageWriterWriteDebugMsgs" serializeAs="String">
<value>False</value>
@@ -666,13 +666,13 @@
</applicationSettings>
<runtime>
<generatePublisherEvidence enabled="false"/>
<generatePublisherEvidence enabled="false" />
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2.13.0.0" newVersion="2.13.0.0"/>
<assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.15.0.0" newVersion="2.15.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" /></startup></configuration>

22
mRemoteV1/mRemoteV1.csproj
View File

@@ -95,20 +95,22 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>References\VncSharp.dll</HintPath>
</Reference>
<Reference Include="WeifenLuo.WinFormsUI.Docking, Version=2.13.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
<HintPath>..\packages\DockPanelSuite.2.14.0\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
<Reference Include="WeifenLuo.WinFormsUI.Docking, Version=2.15.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
<HintPath>..\packages\DockPanelSuite.2.15.0\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
</Reference>
<Reference Include="WeifenLuo.WinFormsUI.Docking.ThemeVS2003, Version=2.13.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
<HintPath>..\packages\DockPanelSuite.ThemeVS2003.2.14.0\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2003.dll</HintPath>
<Reference Include="WeifenLuo.WinFormsUI.Docking.ThemeVS2003, Version=2.15.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
<HintPath>..\packages\DockPanelSuite.ThemeVS2003.2.15.0\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2003.dll</HintPath>
</Reference>
<Reference Include="WeifenLuo.WinFormsUI.Docking.ThemeVS2012, Version=2.13.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
<HintPath>..\packages\DockPanelSuite.ThemeVS2012.2.14.0\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2012.dll</HintPath>
<Reference Include="WeifenLuo.WinFormsUI.Docking.ThemeVS2012, Version=2.15.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
<HintPath>..\packages\DockPanelSuite.ThemeVS2012.2.15.0\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2012.dll</HintPath>
<Aliases>global</Aliases>
</Reference>
<Reference Include="WeifenLuo.WinFormsUI.Docking.ThemeVS2013, Version=2.13.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
<HintPath>..\packages\DockPanelSuite.ThemeVS2013.2.14.0\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2013.dll</HintPath>
<Reference Include="WeifenLuo.WinFormsUI.Docking.ThemeVS2013, Version=2.15.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
<HintPath>..\packages\DockPanelSuite.ThemeVS2013.2.15.0\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2013.dll</HintPath>
<Aliases>global</Aliases>
</Reference>
<Reference Include="WeifenLuo.WinFormsUI.Docking.ThemeVS2015, Version=2.13.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
<HintPath>..\packages\DockPanelSuite.ThemeVS2015.2.14.0\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2015.dll</HintPath>
<Reference Include="WeifenLuo.WinFormsUI.Docking.ThemeVS2015, Version=2.15.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
<HintPath>..\packages\DockPanelSuite.ThemeVS2015.2.15.0\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2015.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" />
</ItemGroup>

10
mRemoteV1/packages.config
View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="BouncyCastle" version="1.8.1" targetFramework="net40" />
<package id="DockPanelSuite" version="2.14.0" targetFramework="net40" />
<package id="DockPanelSuite.ThemeVS2003" version="2.14.0" targetFramework="net40" />
<package id="DockPanelSuite.ThemeVS2012" version="2.14.0" targetFramework="net40" />
<package id="DockPanelSuite.ThemeVS2013" version="2.14.0" targetFramework="net40" />
<package id="DockPanelSuite.ThemeVS2015" version="2.14.0" targetFramework="net40" />
<package id="DockPanelSuite" version="2.15.0" targetFramework="net40" />
<package id="DockPanelSuite.ThemeVS2003" version="2.15.0" targetFramework="net40" />
<package id="DockPanelSuite.ThemeVS2012" version="2.15.0" targetFramework="net40" />
<package id="DockPanelSuite.ThemeVS2013" version="2.15.0" targetFramework="net40" />
<package id="DockPanelSuite.ThemeVS2015" version="2.15.0" targetFramework="net40" />
<package id="Geckofx45" version="45.0.22" targetFramework="net40" />
<package id="log4net" version="2.0.8" targetFramework="net40" />
<package id="ObjectListView.Official" version="2.9.1" targetFramework="net40" />