CLI mode (hide window)

CodeLegacy/Flowframes.csproj

@@ -3,11 +3,14 @@
   <Import Project="packages\ILRepack.MSBuild.Task.2.0.13\build\ILRepack.MSBuild.Task.props" Condition="Exists('packages\ILRepack.MSBuild.Task.2.0.13\build\ILRepack.MSBuild.Task.props')" />
   <Import Project="packages\ILRepack.2.0.34\build\ILRepack.props" Condition="Exists('packages\ILRepack.2.0.34\build\ILRepack.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <DefineConstants>WINDOWS_APP</DefineConstants>
+  </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{389E42DD-A163-49D7-9E0A-AE41090A07B3}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
+    <OutputType>Exe</OutputType>
     <RootNamespace>Flowframes</RootNamespace>
     <AssemblyName>Flowframes</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
@@ -66,10 +69,11 @@
     <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
+    <OutputPath>bin\RelGui</OutputPath>
+    <OutputType>WinExe</OutputType>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -77,8 +81,22 @@
     <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
+    <Prefer32Bit>false</Prefer32Bit>
-    <DebugSymbols>true</DebugSymbols>
+    <DebugSymbols>false</DebugSymbols>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ConsoleRelease|x64'">
+    <OutputPath>bin\RelCmd</OutputPath>
+    <OutputType>Exe</OutputType>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>false</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+    <DebugSymbols>false</DebugSymbols>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
   <ItemGroup>
@@ -645,7 +663,7 @@
     <Error Condition="!Exists('packages\ILRepack.MSBuild.Task.2.0.13\build\ILRepack.MSBuild.Task.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\ILRepack.MSBuild.Task.2.0.13\build\ILRepack.MSBuild.Task.props'))" />
     <Error Condition="!Exists('packages\Magick.NET-Q8-x64.13.10.0\build\netstandard20\Magick.NET-Q8-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Magick.NET-Q8-x64.13.10.0\build\netstandard20\Magick.NET-Q8-x64.targets'))" />
   </Target>
-  <Target Name="ILRepack" AfterTargets="Build" Condition="'$(Configuration)' == 'Release'">
+  <Target Name="ILRepack" AfterTargets="Build" Condition="'$(Configuration)' == 'ReleaseRepack'">
     <PropertyGroup>
       <WorkingDirectory>$(MSBuildThisFileDirectory)bin\x64\Release</WorkingDirectory>
     </PropertyGroup>

CodeLegacy/Flowframes.sln

@@ -1,18 +1,24 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
+# Visual Studio Version 17
-VisualStudioVersion = 16.0.30413.136
+VisualStudioVersion = 17.11.35303.130
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flowframes", "Flowframes.csproj", "{389E42DD-A163-49D7-9E0A-AE41090A07B3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		ConsoleRelease|Any CPU = ConsoleRelease|Any CPU
+		ConsoleRelease|x64 = ConsoleRelease|x64
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
 		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{389E42DD-A163-49D7-9E0A-AE41090A07B3}.ConsoleRelease|Any CPU.ActiveCfg = ConsoleRelease|Any CPU
+		{389E42DD-A163-49D7-9E0A-AE41090A07B3}.ConsoleRelease|Any CPU.Build.0 = ConsoleRelease|Any CPU
+		{389E42DD-A163-49D7-9E0A-AE41090A07B3}.ConsoleRelease|x64.ActiveCfg = ConsoleRelease|x64
+		{389E42DD-A163-49D7-9E0A-AE41090A07B3}.ConsoleRelease|x64.Build.0 = ConsoleRelease|x64
 		{389E42DD-A163-49D7-9E0A-AE41090A07B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{389E42DD-A163-49D7-9E0A-AE41090A07B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{389E42DD-A163-49D7-9E0A-AE41090A07B3}.Debug|x64.ActiveCfg = Debug|x64

CodeLegacy/Forms/Main/Form1.cs

@@ -34,9 +34,31 @@ namespace Flowframes.Forms.Main
 
         public bool ShowModelDownloader = false;
 
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                CreateParams cp = base.CreateParams;
+                if (Program.CmdMode)
+                {
+                    const int WS_EX_TOOLWINDOW = 0x80;
+                    cp.ExStyle |= WS_EX_TOOLWINDOW; // Makes the window not appear in Alt-Tab
+                }
+                return cp;
+            }
+        }
+
         public Form1()
         {
             InitializeComponent();
+
+            new SplashForm().Show();
+
+            if (Program.CmdMode)
+            {
+                ShowInTaskbar = false;
+                Opacity = 0;
+            }
         }
 
         private async void Form1_Load(object sender, EventArgs e)
@@ -47,7 +69,6 @@ namespace Flowframes.Forms.Main
 
         private async void Form1_Shown(object sender, EventArgs e)
         {
-            new SplashForm().Show();
             Refresh();
             await Task.Delay(1);
 
@@ -439,7 +460,10 @@ namespace Flowframes.Forms.Main
         public void Initialized()
         {
             Application.OpenForms.OfType<SplashForm>().ToList().ForEach(f => f.Close());
-            Opacity = 1.0f;
+
+            if (!Program.CmdMode)
+                Opacity = 1.0f;
+
             _initialized = true;
             runBtn.Enabled = true;
             SetStatus("Ready");
@@ -852,7 +876,7 @@ namespace Flowframes.Forms.Main
             float inFps = fpsInTbox.GetFloat();
             float outFps = fpsOutTbox.GetFloat();
 
-            if(inFps == 0 || outFps == 0)
+            if (inFps == 0 || outFps == 0)
                 return;
 
             var targetFactorRounded = Math.Round((Decimal)(outFps / inFps), 3, MidpointRounding.AwayFromZero);

CodeLegacy/Forms/SplashForm.Designer.cs

@@ -53,14 +53,19 @@
             this.ClientSize = new System.Drawing.Size(480, 220);
             this.Controls.Add(this.loadingTextLabel);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.MaximizeBox = false;
             this.MaximumSize = new System.Drawing.Size(480, 220);
+            this.MinimizeBox = false;
             this.MinimumSize = new System.Drawing.Size(480, 220);
             this.Name = "SplashForm";
+            this.Opacity = 0D;
             this.ShowIcon = false;
             this.ShowInTaskbar = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "SplashForm";
+            this.Text = "Flowframes";
+            this.TopMost = true;
             this.UseWaitCursor = true;
+            this.Load += new System.EventHandler(this.SplashForm_Load);
             this.ResumeLayout(false);
 
         }

CodeLegacy/Forms/SplashForm.cs

@@ -1,12 +1,4 @@
-using System;
+using System.Windows.Forms;
-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 Flowframes.Forms
 {
@@ -16,5 +8,13 @@ namespace Flowframes.Forms
         {
             InitializeComponent();
         }
+
+        private void SplashForm_Load(object sender, System.EventArgs e)
+        {
+            if (!Program.CmdMode)
+            {
+                Opacity = 1f;
+            }
+        }
     }
 }

CodeLegacy/Program.cs

@@ -28,10 +28,13 @@ namespace Flowframes
         public static bool lastInputPathIsSsd;
 
         public static Queue<InterpSettings> batchQueue = new Queue<InterpSettings>();
+        public static bool CmdMode = false;
 
         [STAThread]
         static void Main()
         {
+            CmdMode = new FileInfo(Paths.GetExe()).Name.Contains("Cmd");
+
             // Force culture to en-US across entire application (to avoid number parsing issues etc)
             var culture = new CultureInfo("en-US");
             Thread.CurrentThread.CurrentCulture = culture;

CodeLegacy/Ui/GetWebInfo.cs

@@ -43,7 +43,7 @@ namespace Flowframes.Ui
         {
             try
             {
-                Logger.Log("Parsing Patrons from CSV...", true);
+                // Logger.Log("Parsing Patrons from CSV...", true);
                 List<string> goldPatrons = new List<string>();
                 List<string> silverPatrons = new List<string>();
                 string str = "Gold:\n";
@@ -68,7 +68,7 @@ namespace Flowframes.Ui
                     }
                 }
 
-                Logger.Log($"Found {goldPatrons.Count} Gold Patrons, {silverPatrons.Count} Silver Patrons", true);
+                // Logger.Log($"Found {goldPatrons.Count} Gold Patrons, {silverPatrons.Count} Silver Patrons", true);
 
                 foreach (string pat in goldPatrons)
                     str += pat + "\n";