Tidy up program

Diglett2 · Oct 8, 2015 · 256807d · 256807d
1 parent f5f84f5
commit 256807d
Show file tree

Hide file tree

Showing 12 changed files with 128 additions and 37 deletions.
diff --git a/ifme/Global.cs b/ifme/Global.cs
@@ -37,12 +37,25 @@ public static string VersionRelease
 				get { return Application.ProductVersion; }
 			}
 
-			public static string Type
+			public static string VersionCompiled
+			{
+				get { return $"ifme_{Version}_{(OS.Is64bit ? "x64" : "x86")}-{(OS.IsWindows ? "windows" : "linux")}-{ReleaseType}"; }
+			}
+
+			public static string ReleaseType
 			{
 #if DEBUG
+	#if !STEAM
 				get { return "experimental"; }
+	#else
+				get { return "steam-experimental"; }
+	#endif
 #elif RELEASE
+	#if !STEAM
 				get { return "stable"; }
+	#else
+				get { return "steam-stable"; }
+	#endif
 #endif
 			}
 

diff --git a/ifme/MediaEncoder.cs b/ifme/MediaEncoder.cs
@@ -238,8 +238,8 @@ public static void Mux(Queue item)
 			{
 				fileout += ".mkv";
 
-				string tags = string.Format(Properties.Resources.Tags, Global.App.NameFull, "Nemu System 5.1.1");
-				string cmdvideo = null;
+				string tags = string.Format(Properties.Resources.Tags, Global.App.NameFull, Global.App.VersionCompiled);
+                string cmdvideo = null;
 				string cmdaudio = null;
 				string cmdsubs = null;
 				string cmdattach = null;

diff --git a/ifme/Program.cs b/ifme/Program.cs
@@ -53,7 +53,8 @@ static void Head()
 		{
 			ForegroundColor = ConsoleColor.Yellow;
 			WriteLine(Global.App.NameFull);
-			WriteLine($"Compiled release: {Global.App.Version}-{(OS.Is64bit ? "x64" : "x86")}-{Global.App.Type}\n");
+			WriteLine("Release: " + Global.App.VersionCompiled);
+			WriteLine();
 			ResetColor();
 		}
 
@@ -75,8 +76,8 @@ static void DisplayHelp()
 			WriteLine();
 			WriteLine("Option GUI & CLI are cannot combine together, CLI will implies GUI.");
 			WriteLine();
-			WriteLine("Report bugs to: <https://github.com/Anime4000/IFME/issues>");
 			WriteLine("IFME home page: <https://x265.github.io/>");
+			WriteLine("Report bugs to: <https://github.com/Anime4000/IFME/issues>");
 			WriteLine("IFME fb page  : <https://fb.com/internetfriendlymediaencoder/>");
 		}
 

diff --git a/ifme/Properties/Resources.Designer.cs b/ifme/Properties/Resources.Designer.cs
diff --git a/ifme/Properties/Resources.resx b/ifme/Properties/Resources.resx
@@ -242,4 +242,7 @@
   <data name="CodeName" xml:space="preserve">
     <value>FLUORITE DIARY</value>
   </data>
+  <data name="donate" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\donate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/ifme/Resources/donate.png b/ifme/Resources/donate.png
diff --git a/ifme/frmAbout.cs b/ifme/frmAbout.cs
@@ -40,7 +40,7 @@ private void frmAbout_Load(object sender, EventArgs e)
 			}
 
 			lblAppName.Text = Global.App.Name;
-            lblAppBuild.Text = $"{Global.App.Type} {Global.App.VersionRelease} ({Global.App.Version} x64 '{Global.App.CodeName}')";
+            lblAppBuild.Text = $"{Global.App.ReleaseType} {Global.App.VersionRelease} ({Global.App.Version} x64 '{Global.App.CodeName}')";
 
             lblTitleA.Text = string.Format(lblTitleA.Text, Global.App.Name);
 

diff --git a/ifme/frmMain.Designer.cs b/ifme/frmMain.Designer.cs