replaced logo in about screen

This commit is contained in:
Faryan Rezagholi
2018-12-23 21:17:22 +01:00
parent b2b78c67f4
commit 8bd2b9d7a7
10 changed files with 1051 additions and 38 deletions

View File

@@ -120,6 +120,16 @@ namespace mRemoteNG {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap AppIconPng {
get {
object obj = ResourceManager.GetObject("AppIconPng", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@@ -570,6 +580,16 @@ namespace mRemoteNG {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Header_dark {
get {
object obj = ResourceManager.GetObject("Header_dark", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@@ -770,16 +790,6 @@ namespace mRemoteNG {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Logo {
get {
object obj = ResourceManager.GetObject("Logo", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@@ -820,16 +830,6 @@ namespace mRemoteNG {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap mRemote {
get {
object obj = ResourceManager.GetObject("mRemote", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

View File

@@ -169,9 +169,6 @@
<data name="PuttyConfig" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Images\PuttyConfig.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="mRemote" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Images\mRemote.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Play_Quick" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Images\Play_Quick.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -406,9 +403,6 @@
<data name="JumpTo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Images\FamFamFam\JumpTo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Images\Logo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Monitor" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Images\FamFamFam\Monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -529,4 +523,10 @@
<data name="AppIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Icons\AppIcon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Header_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Images\Header_dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="AppIconPng" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Images\AppIconPng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 740 B

View File

@@ -4,6 +4,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.IO;
using System.Linq;
using WeifenLuo.WinFormsUI.Docking;
@@ -24,7 +25,6 @@ namespace mRemoteNG.Themes
private static ThemeManager themeInstance;
#endregion
#region Constructors
private ThemeManager()
{
@@ -233,5 +233,13 @@ namespace mRemoteNG.Themes
}
}
#endregion
}
#region mRemoteNG default colors
public readonly Color mRemoteNG_Dark = ColorTranslator.FromHtml("#343a40");
public readonly Color mRemoteNG_Light = ColorTranslator.FromHtml("#e9ecef");
public readonly Color mRemoteNG_Blue = ColorTranslator.FromHtml("#4f8aff");
public readonly Color mRemoteNG_White = ColorTranslator.FromHtml("#e9ecef");
public readonly Color mRemoteNG_Black = ColorTranslator.FromHtml("#212529");
#endregion mRemoteNG default colors
}
}

View File

@@ -122,7 +122,7 @@ namespace mRemoteNG.UI.Menu
//
// mMenInfoAbout
//
_mMenInfoAbout.Image = Resources.mRemote;
_mMenInfoAbout.Image = Resources.AppIconPng;
_mMenInfoAbout.Name = "mMenInfoAbout";
_mMenInfoAbout.Size = new System.Drawing.Size(190, 22);
_mMenInfoAbout.Text = Language.strMenuAbout;

View File

@@ -5,6 +5,7 @@ using System.IO;
using System.Text;
using mRemoteNG.App;
using mRemoteNG.App.Info;
using System.Drawing;
// ReSharper disable ArrangeRedundantParentheses
// ReSharper disable RedundantCast
@@ -26,9 +27,10 @@ namespace mRemoteNG.UI.Window
internal Controls.Base.NGLabel lblCredits;
internal Controls.Base.NGTextBox txtCredits;
internal Panel pnlTop;
private void InitializeComponent()
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutWindow));
this.pnlTop = new System.Windows.Forms.Panel();
this.lblEdition = new mRemoteNG.UI.Controls.Base.NGLabel();
this.pbLogo = new System.Windows.Forms.PictureBox();
@@ -50,7 +52,6 @@ namespace mRemoteNG.UI.Window
//
this.pnlTop.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.pnlTop.BackColor = System.Drawing.Color.Black;
this.pnlTop.Controls.Add(this.lblEdition);
this.pnlTop.Controls.Add(this.pbLogo);
this.pnlTop.ForeColor = System.Drawing.Color.White;
@@ -58,6 +59,7 @@ namespace mRemoteNG.UI.Window
this.pnlTop.Name = "pnlTop";
this.pnlTop.Size = new System.Drawing.Size(1121, 145);
this.pnlTop.TabIndex = 0;
this.pnlTop.BackColor = Themes.ThemeManager.getInstance().mRemoteNG_Dark;
//
// lblEdition
//
@@ -75,10 +77,10 @@ namespace mRemoteNG.UI.Window
//
// pbLogo
//
this.pbLogo.Image = global::mRemoteNG.Resources.Logo;
this.pbLogo.Image = global::mRemoteNG.Resources.Header_dark;
this.pbLogo.Location = new System.Drawing.Point(8, 8);
this.pbLogo.Name = "pbLogo";
this.pbLogo.Size = new System.Drawing.Size(492, 128);
this.pbLogo.Size = new System.Drawing.Size(450, 120);
this.pbLogo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
this.pbLogo.TabIndex = 1;
this.pbLogo.TabStop = false;
@@ -222,11 +224,17 @@ namespace mRemoteNG.UI.Window
this.ClientSize = new System.Drawing.Size(1117, 705);
this.Controls.Add(this.pnlTop);
this.Controls.Add(this.pnlBottom);
this.DockAreas = ((WeifenLuo.WinFormsUI.Docking.DockAreas)((((((WeifenLuo.WinFormsUI.Docking.DockAreas.Float | WeifenLuo.WinFormsUI.Docking.DockAreas.DockLeft)
| WeifenLuo.WinFormsUI.Docking.DockAreas.DockRight)
| WeifenLuo.WinFormsUI.Docking.DockAreas.DockTop)
| WeifenLuo.WinFormsUI.Docking.DockAreas.DockBottom)
| WeifenLuo.WinFormsUI.Docking.DockAreas.Document)));
this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.ForeColor = System.Drawing.SystemColors.ControlText;
this.Icon = global::mRemoteNG.Resources.AppIcon;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximumSize = new System.Drawing.Size(20000, 10000);
this.Name = "AboutWindow";
this.ShowHint = WeifenLuo.WinFormsUI.Docking.DockState.Unknown;
this.TabText = "About";
this.Text = "About";
this.Load += new System.EventHandler(this.About_Load);
@@ -268,7 +276,7 @@ namespace mRemoteNG.UI.Window
ForeColor = Themes.ThemeManager.getInstance().ActiveTheme.ExtendedPalette.getColor("Dialog_Foreground");
pnlBottom.BackColor = Themes.ThemeManager.getInstance().ActiveTheme.ExtendedPalette.getColor("Dialog_Background");
pnlBottom.ForeColor = Themes.ThemeManager.getInstance().ActiveTheme.ExtendedPalette.getColor("Dialog_Foreground");
pnlTop.BackColor = Themes.ThemeManager.getInstance().ActiveTheme.ExtendedPalette.getColor("Dialog_Background");
pnlTop.ForeColor = Themes.ThemeManager.getInstance().ActiveTheme.ExtendedPalette.getColor("Dialog_Background");
pnlTop.ForeColor = Themes.ThemeManager.getInstance().ActiveTheme.ExtendedPalette.getColor("Dialog_Foreground");
lblEdition.BackColor = Themes.ThemeManager.getInstance().ActiveTheme.ExtendedPalette.getColor("Dialog_Background");
lblEdition.ForeColor = Themes.ThemeManager.getInstance().ActiveTheme.ExtendedPalette.getColor("Dialog_Foreground");

File diff suppressed because it is too large Load Diff

View File

@@ -1012,6 +1012,8 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="Resources\Icons\AppIcon.ico" />
<None Include="Resources\Images\Header_dark.png" />
<None Include="Resources\Images\AppIconPng.png" />
<Content Include="Schemas\mremoteng_confcons_v2_6.xsd">
<SubType>Designer</SubType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -1255,7 +1257,6 @@
<None Include="Resources\Icons\Play_Quick_Icon.ico" />
<None Include="Resources\Icons\SSHTransfer_Icon.ico" />
<None Include="Resources\Images\SSHTransfer.png" />
<None Include="Resources\Images\mRemote.png" />
<None Include="Resources\Images\ErrorsAndInfos.png" />
<None Include="Resources\Images\Screenshot.png" />
<None Include="Resources\Images\Sessions.png" />
@@ -1488,7 +1489,6 @@
<None Include="Resources\Images\NewConnection.png" />
<None Include="Resources\Images\New.png" />
<None Include="Resources\Images\Minimize.png" />
<None Include="Resources\Images\Logo.png" />
<None Include="Resources\Images\Keyboard.png" />
<None Include="Resources\Images\InformationSmall.png" />
<None Include="Resources\Images\Information.png" />