Merge pull request #1 from RyanWalpoleEnterprises/unstable-dev

Merge Unstable to Main

Author: RyanWalpole

installer/cver.txt

@@ -1 +1 @@
-230101
+230301

installer/installmoxoquickweb.exe

@@ -101,9 +101,6 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="Resources\Dark-Arrow-Left.png" />
   </ItemGroup>

moxolib/win32/moxo.web.UI/.vs/moxo.web.UI/v17/.suo

@@ -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");
             }
         }

moxolib/win32/moxo.web.UI/Moxo Web UI/Moxo Web UI.csproj

@@ -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()