From a08e8cac33d20aeb91c96b6f0fdb23b10d53deab Mon Sep 17 00:00:00 2001 From: TSG Date: Sat, 11 May 2019 12:33:11 -0400 Subject: [PATCH] Add commit hash to about - Added commit hash to about form as per suggested in #9 --- .gitignore | 3 +- FModel/FModel.csproj | 4 + FModel/Forms/About.Designer.cs | 17 ++++- FModel/Forms/About.cs | 1 + FModel/Properties/Resources.Designer.cs | 98 ++++++++++++++----------- FModel/Properties/Resources.resx | 3 + 6 files changed, 80 insertions(+), 46 deletions(-) diff --git a/.gitignore b/.gitignore index 7023fb37..2753b136 100644 --- a/.gitignore +++ b/.gitignore @@ -327,4 +327,5 @@ ASALocalRun/ *.nvuser # MFractors (Xamarin productivity tool) working folder -.mfractor/ \ No newline at end of file +.mfractor/ +FModel/CurrentCommit.txt diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj index 52dc0f9e..70c13e20 100644 --- a/FModel/FModel.csproj +++ b/FModel/FModel.csproj @@ -204,6 +204,7 @@ Always + @@ -247,4 +248,7 @@ + + git rev-parse --short HEAD > "$(ProjectDir)\CurrentCommit.txt" + \ No newline at end of file diff --git a/FModel/Forms/About.Designer.cs b/FModel/Forms/About.Designer.cs index 1b8bd20f..2fac7cad 100644 --- a/FModel/Forms/About.Designer.cs +++ b/FModel/Forms/About.Designer.cs @@ -38,6 +38,7 @@ this.label4 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); + this.commitHash = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -85,7 +86,7 @@ // label2 // this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(108, 12); + this.label2.Location = new System.Drawing.Point(108, 8); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(360, 39); this.label2.TabIndex = 4; @@ -137,11 +138,24 @@ this.label6.Text = "• FireMonkey"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // commitHash + // + this.commitHash.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.commitHash.AutoSize = true; + this.commitHash.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.commitHash.Location = new System.Drawing.Point(406, 124); + this.commitHash.Name = "commitHash"; + this.commitHash.Size = new System.Drawing.Size(49, 13); + this.commitHash.TabIndex = 9; + this.commitHash.Text = "1234567"; + this.commitHash.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // About // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(467, 145); + this.Controls.Add(this.commitHash); this.Controls.Add(this.label6); this.Controls.Add(this.label5); this.Controls.Add(this.label4); @@ -175,5 +189,6 @@ private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label commitHash; } } \ No newline at end of file diff --git a/FModel/Forms/About.cs b/FModel/Forms/About.cs index a629e02e..bc22ddaf 100644 --- a/FModel/Forms/About.cs +++ b/FModel/Forms/About.cs @@ -9,6 +9,7 @@ namespace FModel.Forms InitializeComponent(); label2.Text += @" " + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString().Substring(0, 5); + commitHash.Text = FModel.Properties.Resources.CurrentCommit; } private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) diff --git a/FModel/Properties/Resources.Designer.cs b/FModel/Properties/Resources.Designer.cs index 951cb282..4b2ab967 100644 --- a/FModel/Properties/Resources.Designer.cs +++ b/FModel/Properties/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// Ce code a été généré par un outil. -// Version du runtime :4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si -// le code est régénéré. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -13,13 +13,13 @@ namespace FModel.Properties { /// - /// Une classe de ressource fortement typée destinée, entre autres, à la consultation des chaînes localisées. + /// A strongly-typed resource class, for looking up localized strings, etc. /// - // Cette classe a été générée automatiquement par la classe StronglyTypedResourceBuilder - // à l'aide d'un outil, tel que ResGen ou Visual Studio. - // Pour ajouter ou supprimer un membre, modifiez votre fichier .ResX, puis réexécutez ResGen - // avec l'option /str ou régénérez votre projet VS. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -33,7 +33,7 @@ namespace FModel.Properties { } /// - /// Retourne l'instance ResourceManager mise en cache utilisée par cette classe. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ namespace FModel.Properties { } /// - /// Remplace la propriété CurrentUICulture du thread actuel pour toutes - /// les recherches de ressources à l'aide de cette classe de ressource fortement typée. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap BG512 { get { @@ -71,7 +71,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Byte[]. + /// Looks up a localized resource of type System.Byte[]. /// internal static byte[] BurbankBigCondensed_Black { get { @@ -81,7 +81,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Byte[]. + /// Looks up a localized resource of type System.Byte[]. /// internal static byte[] BurbankBigCondensed_Bold { get { @@ -91,7 +91,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap C512 { get { @@ -101,7 +101,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Challenges_Slider { get { @@ -111,7 +111,17 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized string similar to 71e11bb + ///. + /// + internal static string CurrentCommit { + get { + return ResourceManager.GetString("CurrentCommit", resourceCulture); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap E512 { get { @@ -121,7 +131,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Icon semblable à (Icône). + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// internal static System.Drawing.Icon FModel { get { @@ -131,7 +141,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap FModel_Logo { get { @@ -141,7 +151,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap folder_16x { get { @@ -151,7 +161,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap folder_Closed_16xLG { get { @@ -161,7 +171,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap L512 { get { @@ -171,7 +181,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap M512 { get { @@ -181,7 +191,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Marvel512 { get { @@ -191,7 +201,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap properties_16xLG { get { @@ -201,7 +211,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Quest { get { @@ -211,7 +221,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap R512 { get { @@ -221,7 +231,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap StatusAnnotations_Information_16xLG_color { get { @@ -231,7 +241,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap T_FNBR_BattlePoints_L { get { @@ -241,7 +251,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap T_FNBR_SeasonalXP_L { get { @@ -251,7 +261,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap T_Icon_Adaptive_64 { get { @@ -261,7 +271,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap T_Icon_Animated_64 { get { @@ -271,7 +281,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap T_Icon_Pets_64 { get { @@ -281,7 +291,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap T_Icon_Quests_64 { get { @@ -291,7 +301,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap T_Icon_Traversal_64 { get { @@ -301,7 +311,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap T_Icon_Variant_64 { get { @@ -311,7 +321,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap T_Items_MTX_L { get { @@ -321,7 +331,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap T512 { get { @@ -331,7 +341,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap U512 { get { @@ -341,7 +351,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap unknown512 { get { @@ -351,7 +361,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap wTemplate { get { @@ -361,7 +371,7 @@ namespace FModel.Properties { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap wTemplateF { get { diff --git a/FModel/Properties/Resources.resx b/FModel/Properties/Resources.resx index af9b14ea..0097387b 100644 --- a/FModel/Properties/Resources.resx +++ b/FModel/Properties/Resources.resx @@ -211,4 +211,7 @@ ..\Resources\Challenges_Slider.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\CurrentCommit.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + \ No newline at end of file