Merge pull request #1 from RyanWalpoleEnterprises/unstable-dev

Merge Unstable to Main
RyanWalpoleEnterprises · Mar 16, 2023 · b5acbdd · b5acbdd
2 parents 57c52f1 + 69c3e14
commit b5acbdd
Show file tree

Hide file tree

Showing 51 changed files with 13,513 additions and 29 deletions.
diff --git a/installer/cver.txt b/installer/cver.txt
@@ -1 +1 @@
-230101
+230301
diff --git a/installer/installmoxoquickweb.exe b/installer/installmoxoquickweb.exe
diff --git a/moxolib/win32/moxo.web.UI/.vs/moxo.web.UI/v17/.suo b/moxolib/win32/moxo.web.UI/.vs/moxo.web.UI/v17/.suo
diff --git a/moxolib/win32/moxo.web.UI/Moxo Web UI/Moxo Web UI.csproj b/moxolib/win32/moxo.web.UI/Moxo Web UI/Moxo Web UI.csproj
@@ -101,9 +101,6 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="Resources\Dark-Arrow-Left.png" />
   </ItemGroup>

diff --git a/moxolib/win32/moxo.web.UI/Moxo Web UI/Program.cs b/moxolib/win32/moxo.web.UI/Moxo Web UI/Program.cs
@@ -20,21 +20,18 @@ static void Main()
 
             try
             {
-                string WV = CoreWebView2Environment.GetAvailableBrowserVersionString();
-
-                if (WV != null)
+                var version = CoreWebView2Environment.GetAvailableBrowserVersionString();
+                if(version != null)
                 {
                     Application.Run(new Startup());
                 }
-                else
-                {
-                    //Microsoft Edge WebView2 Runtime Not Installed
-                    MessageBox.Show("WebView2 is not installed on this system. For more information, visit https://github.com/RyanWalpoleEnterprises/Moxo-QuickWeb");
-                }
+                // Do something with `version` if needed.
             }
-            catch
+            catch (WebView2RuntimeNotFoundException exception)
             {
-                //Microsoft Edge WebView2 Runtime Assumed Not Installed
+                // Handle the runtime not being installed.
+                // `exception.Message` is very nicely specific: It (currently at least) says "Couldn't find a compatible Webview2 Runtime installation to host WebViews."
+                //Microsoft Edge WebView2 Runtime Not Installed
                 MessageBox.Show("WebView2 is not installed on this system. For more information, visit https://github.com/RyanWalpoleEnterprises/Moxo-QuickWeb");
             }
         }

diff --git a/moxolib/win32/moxo.web.UI/Moxo Web UI/Startup.Designer.cs b/moxolib/win32/moxo.web.UI/Moxo Web UI/Startup.Designer.cs
diff --git a/moxolib/win32/moxo.web.UI/Moxo Web UI/Startup.cs b/moxolib/win32/moxo.web.UI/Moxo Web UI/Startup.cs
@@ -37,6 +37,22 @@ public Startup()
             this.Height = Properties.Settings.Default.MainWindowHeight;
             this.Width = Properties.Settings.Default.MainWindowWidth;
             this.Text = Properties.Settings.Default.ApplicationName;
+
+            //Set iconography
+            UI_Button_Back.Image = Properties.Resources.Dark_Arrow_Left;
+            UI_Button_Forward.Image = Properties.Resources.ic_fluent_arrow_right_24_filled;
+            UI_Button_Refresh.Image = Properties.Resources.Dark_Reload;
+            UI_Button_About.Image = Properties.Resources.ic_fluent_chat_help_24_filled;
+
+            try
+            {
+                //Set the URL for the WebView
+                UI_WebView.Source = new Uri(Settings.Default.WebViewSource);
+            }
+            catch
+            {
+                //
+            }
         }
 
         private void PreInitializeBrowserAsync()

diff --git a/...xo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/369fe137-7b2f-46a1-8c09-818c962ef2b9.vsidx b/...xo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/369fe137-7b2f-46a1-8c09-818c962ef2b9.vsidx
diff --git a/...1528484-6e2d-4930-aced-04b219b01a77.vsidx → ...29fdbaa-7d53-440f-8461-4103fb9d29fd.vsidx b/...1528484-6e2d-4930-aced-04b219b01a77.vsidx → ...29fdbaa-7d53-440f-8461-4103fb9d29fd.vsidx
diff --git a/...xo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/61f453ea-960f-4663-8249-300c649ce112.vsidx b/...xo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/61f453ea-960f-4663-8249-300c649ce112.vsidx
diff --git a/...xo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/b0d0f57e-a85f-438a-bdf5-9b6aa343e0e0.vsidx b/...xo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/b0d0f57e-a85f-438a-bdf5-9b6aa343e0e0.vsidx
diff --git a/...f7b1d69-2bb5-4ec7-b70e-3afa848b338f.vsidx → ...11876e5-abf1-4a8c-9192-31c7dd2dc9e9.vsidx b/...f7b1d69-2bb5-4ec7-b70e-3afa848b338f.vsidx → ...11876e5-abf1-4a8c-9192-31c7dd2dc9e9.vsidx
diff --git a/...xo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/f6ae5fed-0cb7-4723-be36-ba65441e70ad.vsidx b/...xo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/f6ae5fed-0cb7-4723-be36-ba65441e70ad.vsidx
diff --git a/src/Moxo QuickWeb/.vs/Moxo QuickWeb/v17/.suo b/src/Moxo QuickWeb/.vs/Moxo QuickWeb/v17/.suo
diff --git a/src/Moxo QuickWeb/App.config b/src/Moxo QuickWeb/App.config
@@ -11,11 +11,14 @@
     <userSettings>
         <Moxo_QuickWeb.Properties.Settings>
             <setting name="Version" serializeAs="String">
-                <value>230201</value>
+                <value>230301</value>
             </setting>
             <setting name="dotLX_tmpICO" serializeAs="String">
                 <value />
             </setting>
+            <setting name="BuildVersion" serializeAs="String">
+                <value>10031603A</value>
+            </setting>
         </Moxo_QuickWeb.Properties.Settings>
     </userSettings>
 </configuration>