deadmoon 3 년 전
부모
커밋
7b322f8bc8

+ 1 - 1
Optimizer/Forms/HelperForm.Designer.cs

@@ -1,4 +1,4 @@
-namespace Optimizer
+namespace Optimizer
 {
     partial class HelperForm
     {

+ 1 - 1
Optimizer/Forms/HelperForm.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;

+ 1 - 1
Optimizer/Forms/HelperForm.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 

+ 24 - 23
Optimizer/Forms/MainForm.cs

@@ -55,7 +55,7 @@ namespace Optimizer
         readonly string _githubProjectLink = "https://github.com/hellzerg/optimizer";
 
         readonly string _latestVersionLink = "https://raw.githubusercontent.com/hellzerg/optimizer/master/version.txt";
-        readonly string _changelogLink = "https://github.com/hellzerg/optimizer/blob/master/CHANGELOG.md";
+        //readonly string _changelogLink = "https://github.com/hellzerg/optimizer/blob/master/CHANGELOG.md";
         readonly string _changelogRawLink = "https://raw.githubusercontent.com/hellzerg/optimizer/master/CHANGELOG.md";
 
         string _noNewVersionMessage = "You already have the latest version!";
@@ -707,7 +707,7 @@ namespace Optimizer
             listStartupItems.ListViewItemSorter = _columnSorter;
 
             specsTree.ImageList = imagesHw;
-            
+
             // STARTUP ITEMS
             if (!disableStartups)
             {
@@ -818,8 +818,6 @@ namespace Optimizer
 
             // network monitoring
             InitNetworkMonitoring();
-
-            ParseChangelog();
         }
 
         private void LoadTranslationAndSetSize()
@@ -2239,7 +2237,7 @@ namespace Optimizer
         {
             if (tabCollection.SelectedTab == hostsEditorTab) txtIP.Focus();
 
-            if (tabCollection.SelectedTab == pingerTab) txtPingInput.Focus();      
+            if (tabCollection.SelectedTab == pingerTab) txtPingInput.Focus();
         }
 
         private void button48_Click(object sender, EventArgs e)
@@ -3163,15 +3161,16 @@ namespace Optimizer
 
         private void btnChangelog_Click(object sender, EventArgs e)
         {
-            try
-            {
-                Process.Start(_changelogLink);
-            }
-            catch (Exception ex)
-            {
-                ErrorLogger.LogError("MainForm.btnChangelog_Click", ex.Message, ex.StackTrace);
-                MessageBox.Show(ex.Message, "Optimizer", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            }
+            //try
+            //{
+            //    Process.Start(_changelogLink);
+            //}
+            //catch (Exception ex)
+            //{
+            //    ErrorLogger.LogError("MainForm.btnChangelog_Click", ex.Message, ex.StackTrace);
+            //    MessageBox.Show(ex.Message, "Optimizer", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            //}
+            ParseChangelog();
         }
 
         private void chkReadOnly_CheckedChanged(object sender, EventArgs e)
@@ -4186,30 +4185,32 @@ namespace Optimizer
             {
                 ErrorLogger.LogError("MainForm.ParseChangelog", ex.Message, ex.StackTrace);
                 MessageBox.Show(ex.Message, "Optimizer", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                return;
             }
 
             if (changelogText.Count == 0) return;
 
             int markVersion = 0;
-  
             for (int d = 0; d < changelogText.Count; d++)
             {
                 if (changelogText[d].Contains($"## [{Program.GetCurrentVersionTostring()}]"))
                 {
                     markVersion = d;
-                  //  MessageBox.Show(changelogText[d]);
                     break;
                 }
-                else
-                {
-                    continue;
-                  
-                }
+                else continue;
             }
-            //MessageBox.Show("MARK: " + markVersion);
+
             changelogText.RemoveRange(markVersion, changelogText.Count - markVersion);
 
-            MessageBox.Show(string.Join(Environment.NewLine, changelogText.ToArray()));
+            if (changelogText.Count <= 0)
+            {
+                MessageBox.Show(_noNewVersionMessage, "Optimizer", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                return;
+            }
+
+            InfoForm f = new InfoForm(string.Join(Environment.NewLine, changelogText).Replace('-', '•'));
+            f.ShowDialog(this);
         }
     }
 }

+ 1 - 1
Optimizer/Optimize.cs

@@ -665,7 +665,7 @@ namespace Optimizer
             Utilities.StopService("XblGameSave");
             Utilities.StopService("XboxGipSvc");
             Utilities.StopService("xbgm");
-            
+
             Registry.SetValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\XboxNetApiSvc", "Start", "4", RegistryValueKind.DWord);
             Registry.SetValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\XblAuthManager", "Start", "4", RegistryValueKind.DWord);
             Registry.SetValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\XblGameSave", "Start", "4", RegistryValueKind.DWord);

+ 11 - 10
Optimizer/Optimizer.csproj

@@ -45,7 +45,8 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\bin\release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -152,6 +153,12 @@
     <Compile Include="Forms\CleanPreviewForm.Designer.cs">
       <DependentUpon>CleanPreviewForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\HelperForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\HelperForm.designer.cs">
+      <DependentUpon>HelperForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="Hardware.cs" />
     <Compile Include="Forms\HostsEditorForm.cs">
       <SubType>Form</SubType>
@@ -181,12 +188,6 @@
     <Compile Include="Options.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Forms\HelperForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\HelperForm.Designer.cs">
-      <DependentUpon>HelperForm.cs</DependentUpon>
-    </Compile>
     <Compile Include="Required.cs" />
     <Compile Include="SilentConfig.cs" />
     <Compile Include="SilentOps.cs" />
@@ -228,6 +229,9 @@
     <EmbeddedResource Include="Forms\CleanPreviewForm.resx">
       <DependentUpon>CleanPreviewForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\HelperForm.resx">
+      <DependentUpon>HelperForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\HostsEditorForm.resx">
       <DependentUpon>HostsEditorForm.cs</DependentUpon>
     </EmbeddedResource>
@@ -247,9 +251,6 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <EmbeddedResource Include="Forms\HelperForm.resx">
-      <DependentUpon>HelperForm.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Forms\SplashForm.resx">
       <DependentUpon>SplashForm.cs</DependentUpon>
     </EmbeddedResource>

+ 1 - 2
Optimizer/Program.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -14,7 +13,7 @@ namespace Optimizer
         /* DO NOT LEAVE THEM EMPTY */
 
         internal readonly static float Major = 12;
-        internal readonly static float Minor = 3;
+        internal readonly static float Minor = 4;
 
         internal readonly static bool EXPERIMENTAL_BUILD = false;
 

+ 1 - 1
Optimizer/Utilities.cs

@@ -27,7 +27,7 @@ namespace Optimizer
         internal static readonly string LocalMachineRunOnceWow = "Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\RunOnce";
         internal static readonly string CurrentUserRun = "Software\\Microsoft\\Windows\\CurrentVersion\\Run";
         internal static readonly string CurrentUserRunOnce = "Software\\Microsoft\\Windows\\CurrentVersion\\RunOnce";
-        
+
         internal static readonly string LocalMachineStartupFolder = CleanHelper.ProgramData + "\\Microsoft\\Windows\\Start Menu\\Programs\\Startup";
         internal static readonly string CurrentUserStartupFolder = CleanHelper.ProfileAppDataRoaming + "\\Microsoft\\Windows\\Start Menu\\Programs\\Startup";