beta2

wanjizheng · Nov 3, 2020 · 56779f0 · 56779f0
1 parent 186be56
commit 56779f0
Show file tree

Hide file tree

Showing 5 changed files with 136 additions and 26 deletions.
diff --git a/App.xaml.cs b/App.xaml.cs
@@ -734,15 +734,13 @@ private void ApplicationStart(object sender, StartupEventArgs e)
                HasInnerSpace = true;
             }
 
-            var mainWindow = new Windows.MainWindow();
-            //Re-enable normal shutdown mode.
-            Current.ShutdownMode = ShutdownMode.OnMainWindowClose;
-            Current.MainWindow = mainWindow;
-            mainWindow.Show();
+                var mainWindow = new Windows.MainWindow();
+                //Re-enable normal shutdown mode.
+                Current.ShutdownMode = ShutdownMode.OnMainWindowClose;
+                Current.MainWindow = mainWindow;
+                mainWindow.Show();
 
-
-
-            ProcessCommandLine(CommandLine);
+                ProcessCommandLine(CommandLine);
          }
       }
 

diff --git a/Windows/LoginBrowser.Designer.cs b/Windows/LoginBrowser.Designer.cs
diff --git a/Windows/LoginBrowser.cs b/Windows/LoginBrowser.cs
@@ -14,18 +14,40 @@ namespace ISBoxerEVELauncher.Windows
 {
     public partial class LoginBrowser : Form
     {
-        public string strCurrentAddress { get; set; }
-        public string strHTML_RequestVerificationToken { get; set; }
-        public string strURL_RequestVerificationToken { get; set; }
-        public string strHTML_VerficationCode { get; set; }
-        public string strURL_VerficationCode { get; set; }
-        public string strHTML_Result { get; set; }
-        public string strURL_Result { get; set; }
+        public string strCurrentAddress
+        {
+            get; set;
+        }
+        public string strHTML_RequestVerificationToken
+        {
+            get; set;
+        }
+        public string strURL_RequestVerificationToken
+        {
+            get; set;
+        }
+        public string strHTML_VerficationCode
+        {
+            get; set;
+        }
+        public string strURL_VerficationCode
+        {
+            get; set;
+        }
+        public string strHTML_Result
+        {
+            get; set;
+        }
+        public string strURL_Result
+        {
+            get; set;
+        }
 
         public LoginBrowser()
         {
             InitializeComponent();
             Clearup();
+            toolStripTextBox_Addressbar.Size = new Size(toolStrip_Main.Size.Width - toolStripButton_Refresh.Size.Width - 20, toolStripTextBox_Addressbar.Size.Height);
         }
 
         public void Clearup()
@@ -42,6 +64,7 @@ public void Clearup()
         private void chromiumWebBrowser_AddressChanged(object sender, CefSharp.AddressChangedEventArgs e)
         {
             strCurrentAddress = e.Address;
+            this.InvokeOnUiThreadIfRequired(() => toolStripTextBox_Addressbar.Text = e.Address);
         }
 
         private void chromiumWebBrowser_FrameLoadEnd(object sender, CefSharp.FrameLoadEndEventArgs e)
@@ -53,16 +76,12 @@ private void chromiumWebBrowser_FrameLoadEnd(object sender, CefSharp.FrameLoadEn
 
                 const string needle = "name=\"__RequestVerificationToken\" type=\"hidden\" value=\"";
                 int hashStart = taskHtml.Result.IndexOf(needle, StringComparison.Ordinal);
-                if (hashStart == -1)
-                {
-
-                }
-                else
+                if (hashStart != -1)
                 {
                     strHTML_RequestVerificationToken = taskHtml.Result;
                     strURL_RequestVerificationToken = strCurrentAddress;
                 }
-                
+
                 if (taskHtml.Result.Contains("Be sure to click the prompt above to login to the EVE Online launcher"))
                 {
                     strHTML_Result = taskHtml.Result;
@@ -81,8 +100,17 @@ private void chromiumWebBrowser_FrameLoadEnd(object sender, CefSharp.FrameLoadEn
             });
         }
 
+        private void LoginBrowser_Resize(object sender, EventArgs e)
+        {
+            toolStripTextBox_Addressbar.Size = new Size(toolStrip_Main.Size.Width - toolStripButton_Refresh.Size.Width - 20, toolStripTextBox_Addressbar.Size.Height);
+        }
 
+        private void toolStripButton_Refresh_Click(object sender, EventArgs e)
+        {
+            if (toolStripTextBox_Addressbar.Text != "")
+            {
+                this.InvokeOnUiThreadIfRequired(() => chromiumWebBrowser.Load(toolStripTextBox_Addressbar.Text));
+            }
+        }
     }
-
-
 }
diff --git a/Windows/LoginBrowser.resx b/Windows/LoginBrowser.resx
@@ -117,4 +117,45 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="toolStrip_Main.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="toolStripButton_Refresh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+</value>
+  </data>
 </root>
diff --git a/app.manifest b/app.manifest
@@ -16,7 +16,7 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
       </requestedPrivileges>
     </security>
   </trustInfo>