Merge pull request #10 from RyanWalpoleEnterprises/unstable-dev

Release v230303 [11312303P]

installer/Moxo QuickWeb Install Script.iss

@@ -2,13 +2,16 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Moxo QuickWeb Studio"
-#define MyAppVersion "230302"
+#define MyAppVersion "230303"
 #define MyAppPublisher "Ryan Walpole Enterprises"
 #define MyAppURL "https://ryanwalpole.com/developer/moxo"
 #define MyAppExeName "Moxo QuickWeb.exe"
 #define MyAppAssocName "Moxo QuickWeb Project"
 #define MyAppAssocExt ".mqw"
 #define MyAppAssocKey StringChange(MyAppAssocName, " ", "") + MyAppAssocExt
+#define MyAppAssocName2 "dotLX Code File"
+#define MyAppAssocExt2 ".clx"
+#define MyAppAssocKey2 StringChange(MyAppAssocName2, " ", "") + MyAppAssocExt2
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
@@ -55,6 +58,12 @@ Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\DefaultIcon"; ValueType: s
 Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""
 Root: HKA; Subkey: "Software\Classes\Applications\{#MyAppExeName}\SupportedTypes"; ValueType: string; ValueName: ".myp"; ValueData: ""
 
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocExt2}\OpenWithProgids"; ValueType: string; ValueName: "{#MyAppAssocKey2}"; ValueData: ""; Flags: uninsdeletevalue
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey2}"; ValueType: string; ValueName: ""; ValueData: "{#MyAppAssocName2}"; Flags: uninsdeletekey
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey2}\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\LXFileIcon.ico,0"
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey2}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""
+Root: HKA; Subkey: "Software\Classes\Applications\{#MyAppExeName}\SupportedTypes"; ValueType: string; ValueName: ".myp"; ValueData: ""
+
 [Icons]
 Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
 Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon

installer/cver.txt

@@ -1 +1 @@
-230302
+230303

src/Moxo QuickWeb/App.config

@@ -11,20 +11,26 @@
     <userSettings>
         <Moxo_QuickWeb.Properties.Settings>
             <setting name="Version" serializeAs="String">
-                <value>230302</value>
+                <value>230303</value>
             </setting>
             <setting name="dotLX_tmpICO" serializeAs="String">
                 <value />
             </setting>
             <setting name="BuildVersion" serializeAs="String">
-                <value>01502103P</value>
+                <value>11312303P</value>
             </setting>
             <setting name="CheckUpdate" serializeAs="String">
                 <value>TRUE</value>
             </setting>
             <setting name="UpdateReady" serializeAs="String">
                 <value />
             </setting>
+            <setting name="LaunchArg" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="CancelRoute" serializeAs="String">
+                <value />
+            </setting>
         </Moxo_QuickWeb.Properties.Settings>
     </userSettings>
 </configuration>

src/Moxo QuickWeb/Dashboard.cs

@@ -28,9 +28,16 @@ public Dashboard()
 
         private void CheckForUpdates_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
+            CheckForUpdates.Text = "Checking for updates...";
+
+            DelayUpdateCheck.Start();
+        }
+
+        private void DelayUpdateCheck_Tick(object sender, EventArgs e)
+        {
+            DelayUpdateCheck.Stop();
             try
             {
-                CheckForUpdates.Text = "Checking for updates...";
                 string CurrentUpdateVersion = "https://raw.githubusercontent.com/RyanWalpoleEnterprises/Moxo-QuickWeb/main/installer/cver.txt";
 
                 //View current stable version number
@@ -43,6 +50,7 @@ private void CheckForUpdates_LinkClicked(object sender, LinkLabelLinkClickedEven
                 if (CVER.Contains(Properties.Settings.Default.Version))
                 {
                     Properties.Settings.Default.UpdateReady = "FALSE";
+                    CheckForUpdates.Text = "No updates available";
                 }
                 else if (!CVER.Contains(Properties.Settings.Default.Version))
                 {
@@ -63,7 +71,8 @@ private void CheckForUpdates_LinkClicked(object sender, LinkLabelLinkClickedEven
             }
             catch
             {
-
+                Properties.Settings.Default.UpdateReady = "FALSE";
+                CheckForUpdates.Text = "Couldn't connect to update server";
             }
         }
 
@@ -145,5 +154,6 @@ private void IssueReport_LinkClicked(object sender, LinkLabelLinkClickedEventArg
         {
             Process.Start("https://github.com/RyanWalpoleEnterprises/Moxo-QuickWeb/issues");
         }
+
     }
 }

src/Moxo QuickWeb/Dashboard.resx

@@ -120,6 +120,9 @@
   <metadata name="UpdateCheck.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="DelayUpdateCheck.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>141, 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>