Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump version to 2.5.2 #5706

Merged
merged 5 commits into from
Apr 19, 2021
Merged

Bump version to 2.5.2 #5706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
adf018e
Bump version to 2.5.2
retailcoder Mar 31, 2021
0c84c2d
updated splash, deleted corrupt designer
retailcoder Apr 2, 2021
b749061
updated splash background
retailcoder Apr 2, 2021
426c846
tweak version label bgcolor
retailcoder Apr 2, 2021
c009f17
made version label transparent, load image into picturebox
retailcoder Apr 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Rubberduck.Core/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Rubberduck.Core/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,8 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Splash2021f" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Splash2021f.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
Binary file added Rubberduck.Core/Resources/Splash2021f.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 14 additions & 1 deletion Rubberduck.Core/Rubberduck.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<AssemblyName>Rubberduck.Core</AssemblyName>
<Title>Rubberduck.Core</Title>
<Product>Rubberduck.Core</Product>
<Copyright>Copyright © 2014-2019</Copyright>
<Copyright>Copyright © 2014-2021</Copyright>
<ProjectGuid>{A1587EAC-7B54-407E-853F-4C7493D0323E}</ProjectGuid>
<DocumentationFile>bin\Debug\Rubberduck.Core.xml</DocumentationFile>
<!-- Disable "Missing XML documentation" warning (CS1591) -->
Expand Down Expand Up @@ -91,4 +91,17 @@
<Version>2.0.20525</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
</Project>
18 changes: 0 additions & 18 deletions Rubberduck.Core/UI/Splash.cs
View file
Open in desktop

This file was deleted.

1,340 changes: 0 additions & 1,340 deletions Rubberduck.Core/UI/Splash.resx
View file
Open in desktop

This file was deleted.

56 changes: 32 additions & 24 deletions Rubberduck.Core/UI/Splash.Designer.cs → Rubberduck.Core/UI/Splash2021.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 27 additions & 0 deletions Rubberduck.Core/UI/Splash2021.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Rubberduck.UI
{
public partial class Splash2021 : Form
{
public Splash2021()
{
InitializeComponent();
#if DEBUG
VersionLabel.Text = $"Version {GetType().Assembly.GetName().Version} (debug)";
#else
VersionLabel.Text = $"Version {GetType().Assembly.GetName().Version}";
#endif
VersionLabel.Parent = pictureBox1;
VersionLabel.BackColor = Color.Transparent;
}
}
}
Loading