Merge branch 'unstable-dev'

installer/Moxo QuickWeb Install Script.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Moxo QuickWeb Studio"
-#define MyAppVersion "230301"
+#define MyAppVersion "230302"
 #define MyAppPublisher "Ryan Walpole Enterprises"
 #define MyAppURL "https://ryanwalpole.com/developer/moxo"
 #define MyAppExeName "Moxo QuickWeb.exe"
@@ -34,6 +34,8 @@ SetupIconFile=C:\Users\rwalpole\Downloads\MoxoIcon.ico
 Compression=lzma
 SolidCompression=yes
 WizardStyle=modern
+UninstallDisplayIcon={app}\{#MyAppExeName}
+UninstallDisplayName=Moxo QuickWeb Studio
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"

installer/cver.txt

@@ -1 +1 @@
-230301
+230302

src/Moxo QuickWeb/App.config

@@ -11,13 +11,19 @@
     <userSettings>
         <Moxo_QuickWeb.Properties.Settings>
             <setting name="Version" serializeAs="String">
-                <value>230301</value>
+                <value>230302</value>
             </setting>
             <setting name="dotLX_tmpICO" serializeAs="String">
                 <value />
             </setting>
             <setting name="BuildVersion" serializeAs="String">
-                <value>10031603A</value>
+                <value>01502103P</value>
+            </setting>
+            <setting name="CheckUpdate" serializeAs="String">
+                <value>TRUE</value>
+            </setting>
+            <setting name="UpdateReady" serializeAs="String">
+                <value />
             </setting>
         </Moxo_QuickWeb.Properties.Settings>
     </userSettings>

src/Moxo QuickWeb/Dashboard.cs

@@ -19,40 +19,52 @@ public Dashboard()
         {
             InitializeComponent();
             Version.Text = "Version: " + Properties.Settings.Default.Version + "(" + Properties.Settings.Default.BuildVersion + ")";
+
+            if(Properties.Settings.Default.CheckUpdate == "TRUE")
+            {
+                UpdateCheck.RunWorkerAsync();
+            }
         }
 
         private void CheckForUpdates_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
-            CheckForUpdates.Text = "Checking for updates...";
-            string CurrentUpdateVersion = "https://raw.githubusercontent.com/RyanWalpoleEnterprises/Moxo-QuickWeb/main/installer/cver.txt";
-
-            //View current stable version number
-            WebClient client = new WebClient();
-            client.Proxy = null;
-            Stream stream = client.OpenRead(CurrentUpdateVersion);
-            StreamReader reader = new StreamReader(stream);
-            String CVER = reader.ReadToEnd();
-
-            if(CVER == Properties.Settings.Default.Version)
+            try
             {
-                //Current version matches the web's most up to date version
-                CheckForUpdates.Text = "No updates available.";
-            }
-            else
-            {
-                CheckForUpdates.Text = "Updates available.";
-                DialogResult result = MessageBox.Show("Moxo QuickWeb Studio has available updates. Would you like to download and install these updates now?","Moxo QuickWeb Studio",MessageBoxButtons.YesNo,MessageBoxIcon.Question);
-                if(result == DialogResult.Yes)
+                CheckForUpdates.Text = "Checking for updates...";
+                string CurrentUpdateVersion = "https://raw.githubusercontent.com/RyanWalpoleEnterprises/Moxo-QuickWeb/main/installer/cver.txt";
+
+                //View current stable version number
+                WebClient client = new WebClient();
+                client.Proxy = null;
+                Stream stream = client.OpenRead(CurrentUpdateVersion);
+                StreamReader reader = new StreamReader(stream);
+                String CVER = reader.ReadToEnd();
+
+                if (CVER.Contains(Properties.Settings.Default.Version))
                 {
-                    Update update = new Update();
-                    update.ShowDialog();
-                    this.Hide();
+                    Properties.Settings.Default.UpdateReady = "FALSE";
                 }
-                else
+                else if (!CVER.Contains(Properties.Settings.Default.Version))
                 {
-                    //
+                    Properties.Settings.Default.UpdateReady = "TRUE";
+                    CheckForUpdates.Text = "Updates available";
+                    DialogResult result = MessageBox.Show("Moxo QuickWeb Studio has available updates. Would you like to download and install these updates now?", "Moxo QuickWeb Studio", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+                    if (result == DialogResult.Yes)
+                    {
+                        Update update = new Update();
+                        update.ShowDialog();
+                        this.Hide();
+                    }
+                    else
+                    {
+                        //
+                    }
                 }
             }
+            catch
+            {
+
+            }
         }
 
         private void StartDotNet_Click(object sender, EventArgs e)
@@ -83,5 +95,55 @@ private void StartDotLX_Click(object sender, EventArgs e)
             newproject.Show();
             this.Hide();
         }
+
+        private void UpdateCheck_DoWork(object sender, DoWorkEventArgs e)
+        {
+            CheckForUpdates.Text = "Checking for updates...";
+            string CurrentUpdateVersion = "https://raw.githubusercontent.com/RyanWalpoleEnterprises/Moxo-QuickWeb/main/installer/cver.txt";
+
+            //View current stable version number
+            WebClient client = new WebClient();
+            client.Proxy = null;
+            Stream stream = client.OpenRead(CurrentUpdateVersion);
+            StreamReader reader = new StreamReader(stream);
+            String CVER = reader.ReadToEnd();
+
+            if (CVER.Contains(Properties.Settings.Default.Version))
+            {
+                Properties.Settings.Default.UpdateReady = "FALSE";
+            }
+            else if(!CVER.Contains(Properties.Settings.Default.Version))
+            {
+                Properties.Settings.Default.UpdateReady = "TRUE";
+            }
+        }
+
+        private void UpdateCheck_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
+        {
+            if(Properties.Settings.Default.UpdateReady == "TRUE")
+            {
+                CheckForUpdates.Text = "Updates available";
+                DialogResult result = MessageBox.Show("Moxo QuickWeb Studio has available updates. Would you like to download and install these updates now?", "Moxo QuickWeb Studio", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+                if (result == DialogResult.Yes)
+                {
+                    Update update = new Update();
+                    update.ShowDialog();
+                    this.Hide();
+                }
+                else
+                {
+                    //
+                }
+            }
+            else if(Properties.Settings.Default.UpdateReady == "FALSE")
+            {
+                CheckForUpdates.Text = "No updates available";
+            }
+        }
+
+        private void IssueReport_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            Process.Start("https://github.com/RyanWalpoleEnterprises/Moxo-QuickWeb/issues");
+        }
     }
 }

src/Moxo QuickWeb/Dashboard.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="UpdateCheck.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="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

src/Moxo QuickWeb/Moxo QuickWeb.csproj

@@ -143,6 +143,9 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="MoxoIcon.ico" />
+    <None Include="Resources\MoxoQWSWhiteFullLogo.png" />
+    <None Include="Resources\MoxoQWSColorLogo.png" />
+    <None Include="Resources\MoxoQWSWhiteLogo.png" />
     <None Include="Resources\check-circle %28Custom%29.png" />
     <None Include="Resources\check-circle.png" />
     <None Include="Resources\file-cancel %28Custom%29 %281%29.png" />