Merge pull request #199 from mrpimpunicorn/master

Converted logo to PNG
This commit is contained in:
Drew DeVault 2015-09-22 15:07:55 -04:00
commit 9c10e8f769
4 changed files with 8 additions and 7 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

View File

@ -39,9 +39,9 @@ namespace TrueCraft.Launcher
MultiplayerView = new MultiplayerView(this);
SingleplayerView = new SingleplayerView(this);
InteractionBox = new VBox();
using (var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("TrueCraft.Launcher.Content.truecraft_logo.svg"))
TrueCraftLogoImage = new ImageView(Image.FromStream(stream));
using (var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("TrueCraft.Launcher.Content.truecraft_logo.png"))
TrueCraftLogoImage = new ImageView(Image.FromStream(stream).WithBoxSize(350, 75));
WebScrollView.Content = WebView;
MainContainer.PackStart(WebScrollView, true);

View File

@ -67,6 +67,7 @@
<Content Include="Content\default-pack.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<EmbeddedResource Include="Content\truecraft_logo.png" />
<Content Include="Xwt.Gtk.dll.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@ -106,7 +107,7 @@
<ItemGroup>
<EmbeddedResource Include="Content\truecraft-logo.png" />
<EmbeddedResource Include="Content\default-server-icon.png" />
<EmbeddedResource Include="Content\truecraft_logo.svg" />
<None Include="Content\truecraft_logo.svg" />
</ItemGroup>
<PropertyGroup Condition=" '$(OS)' == 'UNIX' ">
<PostBuildEvent>rm $(TargetDir)/MonoGame.Framework.dll &amp;&amp; cp $(SolutionDir)/packages/MonoGame.Framework.Linux.3.4.0.459/lib/net40/MonoGame.Framework.dll $(TargetDir)/MonoGame.Framework.Linux.dll &amp;&amp; cp $(SolutionDir)/packages/MonoGame.Framework.WindowsGL.3.4.0.459/lib/net40/MonoGame.Framework.dll $(TargetDir)/MonoGame.Framework.Windows.dll &amp;&amp; cp $(SolutionDir)/packages/MonoGame.Framework.MacOS.3.4.0.459/lib/net40/MonoGame.Framework.dll $(TargetDir)/MonoGame.Framework.MacOS.dll</PostBuildEvent>
@ -125,4 +126,4 @@ copy $(SolutionDir)packages\MonoGame.Framework.MacOS.3.4.0.459\lib\net40\MonoGam
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
</Project>
</Project>

View File

@ -43,8 +43,8 @@ namespace TrueCraft.Launcher.Views
RememberCheckBox.Active = true;
}
using (var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("TrueCraft.Launcher.Content.truecraft_logo.svg"))
TrueCraftLogoImage = new ImageView(Image.FromStream(stream));
using (var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("TrueCraft.Launcher.Content.truecraft_logo.png"))
TrueCraftLogoImage = new ImageView(Image.FromStream(stream).WithBoxSize(350, 75));
UsernameText.PlaceholderText = "Username";
PasswordText.PlaceholderText = "Password";