From fd045fcc396e9b6b64e1ce68f8cce65c5b4c299e Mon Sep 17 00:00:00 2001 From: CamAlvar Date: Fri, 28 Jul 2017 08:56:12 -0500 Subject: [PATCH] Added images to buttons, updated the dockpanel version --- mRemoteNG.Specs/App.config | 2 +- mRemoteNGTests/app.config | 2 +- mRemoteNGTests/mRemoteNGTests.csproj | 8 ++------ mRemoteNGTests/packages.config | 3 +-- mRemoteV1/Themes/ThemeManager.cs | 2 +- mRemoteV1/UI/Controls/Base/NGButton.cs | 11 +++++++++++ mRemoteV1/app.config | 2 +- mRemoteV1/mRemoteV1.csproj | 23 +++++++++++------------ mRemoteV1/packages.config | 10 +++++----- 9 files changed, 34 insertions(+), 29 deletions(-) diff --git a/mRemoteNG.Specs/App.config b/mRemoteNG.Specs/App.config index 1435f9ee..f77e579d 100644 --- a/mRemoteNG.Specs/App.config +++ b/mRemoteNG.Specs/App.config @@ -10,7 +10,7 @@ - + diff --git a/mRemoteNGTests/app.config b/mRemoteNGTests/app.config index df19e59f..c1d7119d 100644 --- a/mRemoteNGTests/app.config +++ b/mRemoteNGTests/app.config @@ -4,7 +4,7 @@ - + diff --git a/mRemoteNGTests/mRemoteNGTests.csproj b/mRemoteNGTests/mRemoteNGTests.csproj index 79b86b51..317e2f4c 100644 --- a/mRemoteNGTests/mRemoteNGTests.csproj +++ b/mRemoteNGTests/mRemoteNGTests.csproj @@ -84,12 +84,8 @@ - - ..\packages\DockPanelSuite.2.10.0\lib\net40\WeifenLuo.WinFormsUI.Docking.dll - True - - - ..\packages\DockPanelSuite.ThemeVS2012Light.2.10.0\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2012Light.dll + + ..\packages\DockPanelSuite.2.16.1\lib\net40\WeifenLuo.WinFormsUI.Docking.dll True diff --git a/mRemoteNGTests/packages.config b/mRemoteNGTests/packages.config index a09d4baa..ef206d06 100644 --- a/mRemoteNGTests/packages.config +++ b/mRemoteNGTests/packages.config @@ -1,8 +1,7 @@  - - + diff --git a/mRemoteV1/Themes/ThemeManager.cs b/mRemoteV1/Themes/ThemeManager.cs index b4beaec4..4bb0eaa7 100644 --- a/mRemoteV1/Themes/ThemeManager.cs +++ b/mRemoteV1/Themes/ThemeManager.cs @@ -157,7 +157,7 @@ namespace mRemoteNG.Themes { get { - return (ThemeInfo)themes["vs2015light"];//_activeTheme; + return _activeTheme; } set { diff --git a/mRemoteV1/UI/Controls/Base/NGButton.cs b/mRemoteV1/UI/Controls/Base/NGButton.cs index e8f6facc..d58a85fe 100644 --- a/mRemoteV1/UI/Controls/Base/NGButton.cs +++ b/mRemoteV1/UI/Controls/Base/NGButton.cs @@ -92,10 +92,21 @@ namespace mRemoteNG.UI.Controls.Base fore = _themeManager.ActiveTheme.ExtendedPalette.getColor("Button_Disabled_Foreground"); border = _themeManager.ActiveTheme.ExtendedPalette.getColor("Button_Disabled_Border"); } + + + e.Graphics.FillRectangle(new SolidBrush(back), e.ClipRectangle); e.Graphics.DrawRectangle(new Pen(border, 1), 0, 0, base.Width - 1, base.Height - 1); e.Graphics.SmoothingMode = SmoothingMode.AntiAlias; e.Graphics.TextRenderingHint = TextRenderingHint.AntiAlias; + //Warning. the app doesnt use many images in buttons so this positions are kinda tailored just for the used by the app + //not by general usage of iamges in buttons + if (Image != null) + { + SizeF stringSize = e.Graphics.MeasureString(Text, Font); + + e.Graphics.DrawImageUnscaled(Image, Width / 2 - (int)stringSize.Width / 2 - Image.Width + 2, Height / 2 - Image.Height/2); + } TextRenderer.DrawText(e.Graphics, this.Text, Font, ClientRectangle, fore, TextFormatFlags.HorizontalCenter | TextFormatFlags.VerticalCenter); } } diff --git a/mRemoteV1/app.config b/mRemoteV1/app.config index b6f4fc11..ae9329aa 100644 --- a/mRemoteV1/app.config +++ b/mRemoteV1/app.config @@ -787,7 +787,7 @@ - + diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj index 1611e994..61e44f5f 100644 --- a/mRemoteV1/mRemoteV1.csproj +++ b/mRemoteV1/mRemoteV1.csproj @@ -95,22 +95,21 @@ False References\VncSharp.dll - - ..\packages\DockPanelSuite.2.15.0\lib\net40\WeifenLuo.WinFormsUI.Docking.dll + + ..\packages\DockPanelSuite.2.16.1\lib\net40\WeifenLuo.WinFormsUI.Docking.dll + True - - ..\packages\DockPanelSuite.ThemeVS2003.2.15.0\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2003.dll + + ..\packages\DockPanelSuite.ThemeVS2003.2.16.1\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2003.dll - - ..\packages\DockPanelSuite.ThemeVS2012.2.15.0\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2012.dll - global + + ..\packages\DockPanelSuite.ThemeVS2012.2.16.1\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2012.dll - - ..\packages\DockPanelSuite.ThemeVS2013.2.15.0\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2013.dll - global + + ..\packages\DockPanelSuite.ThemeVS2013.2.16.1\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2013.dll - - ..\packages\DockPanelSuite.ThemeVS2015.2.15.0\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2015.dll + + ..\packages\DockPanelSuite.ThemeVS2015.2.16.1\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2015.dll diff --git a/mRemoteV1/packages.config b/mRemoteV1/packages.config index 514cfbde..f61479a7 100644 --- a/mRemoteV1/packages.config +++ b/mRemoteV1/packages.config @@ -1,11 +1,11 @@  - - - - - + + + + +