Skip to content

Commit 3aef2a7

Browse files
committed
Merge branch 'DevLabel' into FixNarrowSizes
2 parents 11cae7d + 08a482a commit 3aef2a7

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

Flow.Launcher.Infrastructure/Constant.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Diagnostics;
1+
using System.Diagnostics;
22
using System.IO;
33
using System.Reflection;
44

@@ -21,6 +21,7 @@ public static class Constant
2121
public static readonly string PreinstalledDirectory = Path.Combine(ProgramDirectory, Plugins);
2222
public const string Issue = "https://github.com/Flow-Launcher/Flow.Launcher/issues/new";
2323
public static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location.NonNull()).ProductVersion;
24+
public static readonly string Dev = "Dev";
2425
public const string Documentation = "https://flowlauncher.com/docs/#/usage-tips";
2526

2627
public static readonly int ThumbnailSize = 64;

Flow.Launcher/ViewModel/SettingWindowViewModel.cs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,20 @@ public bool ShortcutExists(string key)
758758
public string Documentation => Constant.Documentation;
759759
public string Docs => Constant.Docs;
760760
public string Github => Constant.GitHub;
761-
public static string Version => Constant.Version;
761+
public string Version
762+
{
763+
get
764+
{
765+
if (Constant.Version == "1.0.0")
766+
{
767+
return Constant.Dev;
768+
}
769+
else
770+
{
771+
return Constant.Version;
772+
}
773+
}
774+
}
762775
public string ActivatedTimes => string.Format(_translater.GetTranslation("about_activate_times"), Settings.ActivateTimes);
763776

764777
public string CheckLogFolder

0 commit comments

Comments
 (0)