diff --git a/installer/Moxo QuickWeb Install Script.iss b/installer/Moxo QuickWeb Install Script.iss index 9d149a7..db56ebf 100644 --- a/installer/Moxo QuickWeb Install Script.iss +++ b/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" diff --git a/installer/cver.txt b/installer/cver.txt index 0d0d255..c587c8b 100644 --- a/installer/cver.txt +++ b/installer/cver.txt @@ -1 +1 @@ -230301 +230302 diff --git a/installer/installmoxoquickweb.exe b/installer/installmoxoquickweb.exe index 324731a..f18bc0e 100644 Binary files a/installer/installmoxoquickweb.exe and b/installer/installmoxoquickweb.exe differ diff --git a/src/Moxo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/0bd1fa93-83a3-4deb-aa26-7a5c96a93f81.vsidx b/src/Moxo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/0bd1fa93-83a3-4deb-aa26-7a5c96a93f81.vsidx new file mode 100644 index 0000000..8f4f358 Binary files /dev/null and b/src/Moxo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/0bd1fa93-83a3-4deb-aa26-7a5c96a93f81.vsidx differ diff --git a/src/Moxo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/0c796db2-d287-4677-817c-cad9c03ebfd6.vsidx b/src/Moxo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/0c796db2-d287-4677-817c-cad9c03ebfd6.vsidx new file mode 100644 index 0000000..ed23bde Binary files /dev/null and b/src/Moxo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/0c796db2-d287-4677-817c-cad9c03ebfd6.vsidx differ diff --git a/src/Moxo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/29c7cd39-25d5-4f66-8cc0-d49ab6efdab8.vsidx b/src/Moxo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/29c7cd39-25d5-4f66-8cc0-d49ab6efdab8.vsidx deleted file mode 100644 index 3734457..0000000 Binary files a/src/Moxo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/29c7cd39-25d5-4f66-8cc0-d49ab6efdab8.vsidx and /dev/null differ diff --git a/src/Moxo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/893be0b7-8c6a-4ad0-ad1b-6f848ac677aa.vsidx b/src/Moxo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/893be0b7-8c6a-4ad0-ad1b-6f848ac677aa.vsidx deleted file mode 100644 index 679c20b..0000000 Binary files a/src/Moxo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/893be0b7-8c6a-4ad0-ad1b-6f848ac677aa.vsidx and /dev/null differ diff --git a/src/Moxo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/adaacf52-4f37-45a7-b50f-7e05d03d9ac3.vsidx b/src/Moxo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/adaacf52-4f37-45a7-b50f-7e05d03d9ac3.vsidx new file mode 100644 index 0000000..553c18a Binary files /dev/null and b/src/Moxo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/adaacf52-4f37-45a7-b50f-7e05d03d9ac3.vsidx differ diff --git a/src/Moxo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/e29ab676-f6b1-44c0-9fe9-38f6973ddbd5.vsidx b/src/Moxo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/e29ab676-f6b1-44c0-9fe9-38f6973ddbd5.vsidx deleted file mode 100644 index f67141f..0000000 Binary files a/src/Moxo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/e29ab676-f6b1-44c0-9fe9-38f6973ddbd5.vsidx and /dev/null differ diff --git a/src/Moxo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/e38c381b-8c5b-40f2-9b05-1e01280c19e7.vsidx b/src/Moxo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/e38c381b-8c5b-40f2-9b05-1e01280c19e7.vsidx new file mode 100644 index 0000000..3a5bc52 Binary files /dev/null and b/src/Moxo QuickWeb/.vs/Moxo QuickWeb/FileContentIndex/e38c381b-8c5b-40f2-9b05-1e01280c19e7.vsidx differ diff --git a/src/Moxo QuickWeb/.vs/Moxo QuickWeb/v17/.suo b/src/Moxo QuickWeb/.vs/Moxo QuickWeb/v17/.suo index d6c014c..1a8d673 100644 Binary files a/src/Moxo QuickWeb/.vs/Moxo QuickWeb/v17/.suo and b/src/Moxo QuickWeb/.vs/Moxo QuickWeb/v17/.suo differ diff --git a/src/Moxo QuickWeb/App.config b/src/Moxo QuickWeb/App.config index 115ad2a..63ac5d6 100644 --- a/src/Moxo QuickWeb/App.config +++ b/src/Moxo QuickWeb/App.config @@ -11,13 +11,19 @@ - 230301 + 230302 - 10031603A + 01502103P + + + TRUE + + + diff --git a/src/Moxo QuickWeb/Dashboard.Designer.cs b/src/Moxo QuickWeb/Dashboard.Designer.cs index 68042db..4bf946e 100644 --- a/src/Moxo QuickWeb/Dashboard.Designer.cs +++ b/src/Moxo QuickWeb/Dashboard.Designer.cs @@ -37,18 +37,19 @@ private void InitializeComponent() this.StartDotLX = new System.Windows.Forms.Button(); this.DocsDotNet = new System.Windows.Forms.Button(); this.DocsDotLX = new System.Windows.Forms.Button(); + this.Version = new System.Windows.Forms.Label(); + this.UpdateCheck = new System.ComponentModel.BackgroundWorker(); this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.panel1 = new System.Windows.Forms.Panel(); + this.pictureBox4 = new System.Windows.Forms.PictureBox(); + this.Settings = new System.Windows.Forms.LinkLabel(); this.CheckForUpdates = new System.Windows.Forms.LinkLabel(); - this.label5 = new System.Windows.Forms.Label(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.Version = new System.Windows.Forms.Label(); this.IssueReport = new System.Windows.Forms.LinkLabel(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); this.SuspendLayout(); // // label1 @@ -131,6 +132,23 @@ private void InitializeComponent() this.DocsDotLX.UseVisualStyleBackColor = true; this.DocsDotLX.Click += new System.EventHandler(this.DocsDotLX_Click); // + // Version + // + this.Version.BackColor = System.Drawing.Color.Transparent; + this.Version.Font = new System.Drawing.Font("Segoe UI", 8.25F); + this.Version.ForeColor = System.Drawing.Color.Gray; + this.Version.Location = new System.Drawing.Point(6, 473); + this.Version.Name = "Version"; + this.Version.Size = new System.Drawing.Size(169, 23); + this.Version.TabIndex = 11; + this.Version.Text = "Version: "; + this.Version.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // UpdateCheck + // + this.UpdateCheck.DoWork += new System.ComponentModel.DoWorkEventHandler(this.UpdateCheck_DoWork); + this.UpdateCheck.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.UpdateCheck_RunWorkerCompleted); + // // pictureBox3 // this.pictureBox3.BackColor = System.Drawing.Color.Transparent; @@ -157,15 +175,42 @@ private void InitializeComponent() // this.panel1.BackgroundImage = global::Moxo_QuickWeb.Properties.Resources.MoxoBackground_Color; this.panel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.panel1.Controls.Add(this.pictureBox4); + this.panel1.Controls.Add(this.Settings); this.panel1.Controls.Add(this.CheckForUpdates); this.panel1.Controls.Add(this.IssueReport); - this.panel1.Controls.Add(this.label5); - this.panel1.Controls.Add(this.pictureBox1); this.panel1.Location = new System.Drawing.Point(-3, -1); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(554, 154); this.panel1.TabIndex = 0; // + // pictureBox4 + // + this.pictureBox4.BackColor = System.Drawing.Color.Transparent; + this.pictureBox4.Image = global::Moxo_QuickWeb.Properties.Resources.MoxoQWSWhiteFullLogo; + this.pictureBox4.Location = new System.Drawing.Point(21, 83); + this.pictureBox4.Name = "pictureBox4"; + this.pictureBox4.Size = new System.Drawing.Size(287, 55); + this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.pictureBox4.TabIndex = 13; + this.pictureBox4.TabStop = false; + // + // Settings + // + this.Settings.ActiveLinkColor = System.Drawing.Color.White; + this.Settings.BackColor = System.Drawing.Color.Transparent; + this.Settings.Font = new System.Drawing.Font("Segoe UI", 8F); + this.Settings.LinkBehavior = System.Windows.Forms.LinkBehavior.HoverUnderline; + this.Settings.LinkColor = System.Drawing.Color.White; + this.Settings.Location = new System.Drawing.Point(387, 88); + this.Settings.Name = "Settings"; + this.Settings.Size = new System.Drawing.Size(153, 19); + this.Settings.TabIndex = 12; + this.Settings.TabStop = true; + this.Settings.Text = "Settings"; + this.Settings.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Settings.Visible = false; + // // CheckForUpdates // this.CheckForUpdates.ActiveLinkColor = System.Drawing.Color.White; @@ -173,49 +218,15 @@ private void InitializeComponent() this.CheckForUpdates.Font = new System.Drawing.Font("Segoe UI", 8F); this.CheckForUpdates.LinkBehavior = System.Windows.Forms.LinkBehavior.HoverUnderline; this.CheckForUpdates.LinkColor = System.Drawing.Color.White; - this.CheckForUpdates.Location = new System.Drawing.Point(376, 104); + this.CheckForUpdates.Location = new System.Drawing.Point(387, 104); this.CheckForUpdates.Name = "CheckForUpdates"; - this.CheckForUpdates.Size = new System.Drawing.Size(153, 23); + this.CheckForUpdates.Size = new System.Drawing.Size(153, 19); this.CheckForUpdates.TabIndex = 10; this.CheckForUpdates.TabStop = true; this.CheckForUpdates.Text = "Check for Updates"; this.CheckForUpdates.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.CheckForUpdates.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.CheckForUpdates_LinkClicked); // - // label5 - // - this.label5.BackColor = System.Drawing.Color.Transparent; - this.label5.Font = new System.Drawing.Font("Segoe UI Semibold", 13.25F); - this.label5.ForeColor = System.Drawing.Color.White; - this.label5.Location = new System.Drawing.Point(15, 117); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(163, 28); - this.label5.TabIndex = 9; - this.label5.Text = "QuickWeb Studio"; - // - // pictureBox1 - // - this.pictureBox1.BackColor = System.Drawing.Color.Transparent; - this.pictureBox1.Image = global::Moxo_QuickWeb.Properties.Resources.MoxoLogoFullWhite; - this.pictureBox1.Location = new System.Drawing.Point(379, 30); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(153, 67); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureBox1.TabIndex = 1; - this.pictureBox1.TabStop = false; - // - // Version - // - this.Version.BackColor = System.Drawing.Color.Transparent; - this.Version.Font = new System.Drawing.Font("Segoe UI", 8.25F); - this.Version.ForeColor = System.Drawing.Color.Gray; - this.Version.Location = new System.Drawing.Point(6, 473); - this.Version.Name = "Version"; - this.Version.Size = new System.Drawing.Size(169, 23); - this.Version.TabIndex = 11; - this.Version.Text = "Version: "; - this.Version.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // // IssueReport // this.IssueReport.ActiveLinkColor = System.Drawing.Color.White; @@ -223,13 +234,14 @@ private void InitializeComponent() this.IssueReport.Font = new System.Drawing.Font("Segoe UI", 8F); this.IssueReport.LinkBehavior = System.Windows.Forms.LinkBehavior.HoverUnderline; this.IssueReport.LinkColor = System.Drawing.Color.White; - this.IssueReport.Location = new System.Drawing.Point(355, 123); + this.IssueReport.Location = new System.Drawing.Point(366, 119); this.IssueReport.Name = "IssueReport"; - this.IssueReport.Size = new System.Drawing.Size(174, 23); + this.IssueReport.Size = new System.Drawing.Size(174, 19); this.IssueReport.TabIndex = 11; this.IssueReport.TabStop = true; this.IssueReport.Text = "Give Feedback or Report Issues"; this.IssueReport.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.IssueReport.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.IssueReport_LinkClicked); // // Dashboard // @@ -260,7 +272,7 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.panel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); this.ResumeLayout(false); } @@ -268,10 +280,8 @@ private void InitializeComponent() #endregion private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.Label label1; private System.Windows.Forms.PictureBox pictureBox2; - private System.Windows.Forms.Label label5; private System.Windows.Forms.PictureBox pictureBox3; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label3; @@ -283,5 +293,8 @@ private void InitializeComponent() private System.Windows.Forms.Button DocsDotLX; private System.Windows.Forms.Label Version; private System.Windows.Forms.LinkLabel IssueReport; + private System.Windows.Forms.LinkLabel Settings; + private System.Windows.Forms.PictureBox pictureBox4; + public System.ComponentModel.BackgroundWorker UpdateCheck; } } \ No newline at end of file diff --git a/src/Moxo QuickWeb/Dashboard.cs b/src/Moxo QuickWeb/Dashboard.cs index 1439ad9..4eab0e8 100644 --- a/src/Moxo QuickWeb/Dashboard.cs +++ b/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"); + } } } diff --git a/src/Moxo QuickWeb/Dashboard.resx b/src/Moxo QuickWeb/Dashboard.resx index c2d998d..517062f 100644 --- a/src/Moxo QuickWeb/Dashboard.resx +++ b/src/Moxo QuickWeb/Dashboard.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + diff --git a/src/Moxo QuickWeb/Moxo QuickWeb.csproj b/src/Moxo QuickWeb/Moxo QuickWeb.csproj index 4a0f22d..09a7f1c 100644 --- a/src/Moxo QuickWeb/Moxo QuickWeb.csproj +++ b/src/Moxo QuickWeb/Moxo QuickWeb.csproj @@ -143,6 +143,9 @@ + + + diff --git a/src/Moxo QuickWeb/NewDotNET.Designer.cs b/src/Moxo QuickWeb/NewDotNET.Designer.cs index 8d76063..a472351 100644 --- a/src/Moxo QuickWeb/NewDotNET.Designer.cs +++ b/src/Moxo QuickWeb/NewDotNET.Designer.cs @@ -68,9 +68,9 @@ private void InitializeComponent() this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.panel1 = new System.Windows.Forms.Panel(); - this.pictureBox5 = new System.Windows.Forms.PictureBox(); this.label10 = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label(); + this.pictureBox4 = new System.Windows.Forms.PictureBox(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.Preview_Forward)).BeginInit(); @@ -81,7 +81,7 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); this.SuspendLayout(); // // SettingsSettings @@ -495,7 +495,7 @@ private void InitializeComponent() // this.panel1.BackgroundImage = global::Moxo_QuickWeb.Properties.Resources.MoxoBackground_Color; this.panel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.panel1.Controls.Add(this.pictureBox5); + this.panel1.Controls.Add(this.pictureBox4); this.panel1.Controls.Add(this.label10); this.panel1.Controls.Add(this.label11); this.panel1.Location = new System.Drawing.Point(-3, -6); @@ -503,17 +503,6 @@ private void InitializeComponent() this.panel1.Size = new System.Drawing.Size(950, 103); this.panel1.TabIndex = 31; // - // pictureBox5 - // - this.pictureBox5.BackColor = System.Drawing.Color.Transparent; - this.pictureBox5.Image = global::Moxo_QuickWeb.Properties.Resources.MoxoLogoFullWhite; - this.pictureBox5.Location = new System.Drawing.Point(737, 22); - this.pictureBox5.Name = "pictureBox5"; - this.pictureBox5.Size = new System.Drawing.Size(156, 63); - this.pictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureBox5.TabIndex = 32; - this.pictureBox5.TabStop = false; - // // label10 // this.label10.BackColor = System.Drawing.Color.Transparent; @@ -536,6 +525,17 @@ private void InitializeComponent() this.label11.TabIndex = 27; this.label11.Text = "Create New Web App"; // + // pictureBox4 + // + this.pictureBox4.BackColor = System.Drawing.Color.Transparent; + this.pictureBox4.Image = global::Moxo_QuickWeb.Properties.Resources.MoxoQWSWhiteFullLogo; + this.pictureBox4.Location = new System.Drawing.Point(647, 22); + this.pictureBox4.Name = "pictureBox4"; + this.pictureBox4.Size = new System.Drawing.Size(246, 63); + this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.pictureBox4.TabIndex = 37; + this.pictureBox4.TabStop = false; + // // NewDotNET // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -584,7 +584,7 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); this.panel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); this.ResumeLayout(false); } @@ -625,12 +625,12 @@ private void InitializeComponent() private System.Windows.Forms.Label label13; private System.Windows.Forms.Button CancelButton; private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.PictureBox pictureBox5; private System.Windows.Forms.PictureBox dotNetLink; private System.Windows.Forms.PictureBox Preview_Back; private System.Windows.Forms.PictureBox Preview_Refresh; private System.Windows.Forms.PictureBox Preview_Forward; private System.Windows.Forms.Label label14; private System.Windows.Forms.RichTextBox AppConfig; + private System.Windows.Forms.PictureBox pictureBox4; } } \ No newline at end of file diff --git a/src/Moxo QuickWeb/NewDotNET.cs b/src/Moxo QuickWeb/NewDotNET.cs index 384b7bb..9eb059a 100644 --- a/src/Moxo QuickWeb/NewDotNET.cs +++ b/src/Moxo QuickWeb/NewDotNET.cs @@ -163,6 +163,16 @@ private void ApplicationWindowWidth_TextChanged(object sender, EventArgs e) } private void CancelButton_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void dotNetLink_Click(object sender, EventArgs e) + { + Process.Start("https://github.com/RyanWalpoleEnterprises/Moxo-QuickWeb/wiki/QuickWeb-.NET"); + } + + private void NewDotNET_FormClosing(object sender, FormClosingEventArgs e) { string appdatadir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData); string userdatadir = appdatadir + @"\RWE\Moxo\QuickWeb\"; @@ -170,17 +180,12 @@ private void CancelButton_Click(object sender, EventArgs e) string propertiesdir = tmpdatafolder + @"\Moxo Web UI\Properties\"; string appconfig = tmpdatafolder + @"\Moxo Web UI\App.config"; - DialogResult dr = MessageBox.Show("Are you sure you want to abandon your progress?", "New .NET Project | Moxo QuickWeb Studio", MessageBoxButtons.YesNo, MessageBoxIcon.Question); - if(dr == DialogResult.Yes) + if (dr == DialogResult.Yes) { - if (Directory.Exists(tmpdatafolder)) - { - Directory.Delete(tmpdatafolder, true); - } - Dashboard db = new Dashboard(); db.Show(); + this.Close(); } else @@ -188,15 +193,5 @@ private void CancelButton_Click(object sender, EventArgs e) // } } - - private void dotNetLink_Click(object sender, EventArgs e) - { - Process.Start("https://github.com/RyanWalpoleEnterprises/Moxo-QuickWeb/wiki/QuickWeb-.NET"); - } - - private void NewDotNET_FormClosing(object sender, FormClosingEventArgs e) - { - CancelButton.PerformClick(); - } } } diff --git a/src/Moxo QuickWeb/NewdotLX.Designer.cs b/src/Moxo QuickWeb/NewdotLX.Designer.cs index 1bcb976..53874e8 100644 --- a/src/Moxo QuickWeb/NewdotLX.Designer.cs +++ b/src/Moxo QuickWeb/NewdotLX.Designer.cs @@ -31,13 +31,6 @@ private void InitializeComponent() this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NewdotLX)); this.label12 = new System.Windows.Forms.Label(); - this.dotNetLink = new System.Windows.Forms.PictureBox(); - this.panel1 = new System.Windows.Forms.Panel(); - this.pictureBox5 = new System.Windows.Forms.PictureBox(); - this.label10 = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); - this.CancelButton = new System.Windows.Forms.Button(); - this.ContinueButton = new System.Windows.Forms.Button(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.IncludeRefresh = new System.Windows.Forms.CheckBox(); this.IncludeForward = new System.Windows.Forms.CheckBox(); @@ -66,37 +59,44 @@ private void InitializeComponent() this.Tabs = new System.Windows.Forms.TabControl(); this.PreviewVisual = new System.Windows.Forms.TabPage(); this.label13 = new System.Windows.Forms.Label(); - this.Preview_Forward = new System.Windows.Forms.PictureBox(); - this.Preview_Refresh = new System.Windows.Forms.PictureBox(); - this.Preview_Back = new System.Windows.Forms.PictureBox(); this.Preview_Height = new System.Windows.Forms.Label(); this.Preview_Width = new System.Windows.Forms.Label(); this.Preview_URL = new System.Windows.Forms.Label(); this.Preview_Title = new System.Windows.Forms.Label(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.Assembly = new System.Windows.Forms.RichTextBox(); this.SettingsVisual = new System.Windows.Forms.RichTextBox(); this.SettingsSettings = new System.Windows.Forms.RichTextBox(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.AppConfig = new System.Windows.Forms.RichTextBox(); this.PreviewCode = new System.Windows.Forms.TabPage(); this.CodeFile = new System.Windows.Forms.RichTextBox(); this.DummyCleanup = new System.Windows.Forms.Timer(this.components); - ((System.ComponentModel.ISupportInitialize)(this.dotNetLink)).BeginInit(); - this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit(); + this.Preview_Forward = new System.Windows.Forms.PictureBox(); + this.Preview_Refresh = new System.Windows.Forms.PictureBox(); + this.Preview_Back = new System.Windows.Forms.PictureBox(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.pictureBox3 = new System.Windows.Forms.PictureBox(); + this.CancelButton = new System.Windows.Forms.Button(); + this.ContinueButton = new System.Windows.Forms.Button(); + this.dotNetLink = new System.Windows.Forms.PictureBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.pictureBox5 = new System.Windows.Forms.PictureBox(); + this.label10 = new System.Windows.Forms.Label(); + this.label11 = new System.Windows.Forms.Label(); this.groupBox2.SuspendLayout(); this.groupBox1.SuspendLayout(); this.Tabs.SuspendLayout(); this.PreviewVisual.SuspendLayout(); + this.PreviewCode.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.Preview_Forward)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Preview_Refresh)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Preview_Back)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); - this.PreviewCode.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dotNetLink)).BeginInit(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit(); this.SuspendLayout(); // // label12 @@ -108,91 +108,6 @@ private void InitializeComponent() this.label12.TabIndex = 33; this.label12.Text = "Web-App Configuration"; // - // dotNetLink - // - this.dotNetLink.BackColor = System.Drawing.Color.Transparent; - this.dotNetLink.Cursor = System.Windows.Forms.Cursors.Hand; - this.dotNetLink.Image = global::Moxo_QuickWeb.Properties.Resources.DotLXLogo; - this.dotNetLink.Location = new System.Drawing.Point(305, 110); - this.dotNetLink.Name = "dotNetLink"; - this.dotNetLink.Size = new System.Drawing.Size(83, 28); - this.dotNetLink.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.dotNetLink.TabIndex = 32; - this.dotNetLink.TabStop = false; - // - // panel1 - // - this.panel1.BackgroundImage = global::Moxo_QuickWeb.Properties.Resources.MoxoBackground_Color; - this.panel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.panel1.Controls.Add(this.pictureBox5); - this.panel1.Controls.Add(this.label10); - this.panel1.Controls.Add(this.label11); - this.panel1.Location = new System.Drawing.Point(-3, -6); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(950, 103); - this.panel1.TabIndex = 35; - // - // pictureBox5 - // - this.pictureBox5.BackColor = System.Drawing.Color.Transparent; - this.pictureBox5.Image = global::Moxo_QuickWeb.Properties.Resources.MoxoLogoFullWhite; - this.pictureBox5.Location = new System.Drawing.Point(737, 22); - this.pictureBox5.Name = "pictureBox5"; - this.pictureBox5.Size = new System.Drawing.Size(156, 63); - this.pictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureBox5.TabIndex = 32; - this.pictureBox5.TabStop = false; - // - // label10 - // - this.label10.BackColor = System.Drawing.Color.Transparent; - this.label10.Font = new System.Drawing.Font("Segoe UI", 14.25F); - this.label10.ForeColor = System.Drawing.Color.White; - this.label10.Location = new System.Drawing.Point(16, 57); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(456, 28); - this.label10.TabIndex = 28; - this.label10.Text = "Creating a new dotLX Moxo QuickWeb Application"; - // - // label11 - // - this.label11.BackColor = System.Drawing.Color.Transparent; - this.label11.Font = new System.Drawing.Font("Segoe UI Semibold", 19.25F); - this.label11.ForeColor = System.Drawing.Color.White; - this.label11.Location = new System.Drawing.Point(15, 22); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(282, 42); - this.label11.TabIndex = 27; - this.label11.Text = "Create New Web App"; - // - // CancelButton - // - this.CancelButton.Image = global::Moxo_QuickWeb.Properties.Resources.file_cancel__Custom___1_; - this.CancelButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.CancelButton.Location = new System.Drawing.Point(676, 551); - this.CancelButton.Name = "CancelButton"; - this.CancelButton.Size = new System.Drawing.Size(87, 44); - this.CancelButton.TabIndex = 36; - this.CancelButton.Text = "Cancel"; - this.CancelButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.CancelButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; - this.CancelButton.UseVisualStyleBackColor = true; - this.CancelButton.Click += new System.EventHandler(this.CancelButton_Click); - // - // ContinueButton - // - this.ContinueButton.Image = global::Moxo_QuickWeb.Properties.Resources.check_circle__Custom_; - this.ContinueButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.ContinueButton.Location = new System.Drawing.Point(770, 551); - this.ContinueButton.Name = "ContinueButton"; - this.ContinueButton.Size = new System.Drawing.Size(129, 44); - this.ContinueButton.TabIndex = 37; - this.ContinueButton.Text = "Create Application"; - this.ContinueButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.ContinueButton.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage; - this.ContinueButton.UseVisualStyleBackColor = true; - this.ContinueButton.Click += new System.EventHandler(this.ContinueButton_Click); - // // groupBox2 // this.groupBox2.Controls.Add(this.IncludeRefresh); @@ -539,36 +454,6 @@ private void InitializeComponent() this.label13.Text = "Preview designed only to give context to configuration values."; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // Preview_Forward - // - this.Preview_Forward.Image = global::Moxo_QuickWeb.Properties.Resources.MoxoForwardPreview; - this.Preview_Forward.Location = new System.Drawing.Point(149, 124); - this.Preview_Forward.Name = "Preview_Forward"; - this.Preview_Forward.Size = new System.Drawing.Size(62, 21); - this.Preview_Forward.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.Preview_Forward.TabIndex = 49; - this.Preview_Forward.TabStop = false; - // - // Preview_Refresh - // - this.Preview_Refresh.Image = global::Moxo_QuickWeb.Properties.Resources.MoxoRefreshPreview; - this.Preview_Refresh.Location = new System.Drawing.Point(87, 124); - this.Preview_Refresh.Name = "Preview_Refresh"; - this.Preview_Refresh.Size = new System.Drawing.Size(67, 21); - this.Preview_Refresh.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.Preview_Refresh.TabIndex = 48; - this.Preview_Refresh.TabStop = false; - // - // Preview_Back - // - this.Preview_Back.Image = global::Moxo_QuickWeb.Properties.Resources.MoxoBackPreview; - this.Preview_Back.Location = new System.Drawing.Point(38, 124); - this.Preview_Back.Name = "Preview_Back"; - this.Preview_Back.Size = new System.Drawing.Size(54, 21); - this.Preview_Back.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.Preview_Back.TabIndex = 47; - this.Preview_Back.TabStop = false; - // // Preview_Height // this.Preview_Height.BackColor = System.Drawing.Color.White; @@ -611,16 +496,6 @@ private void InitializeComponent() this.Preview_Title.TabIndex = 41; this.Preview_Title.Text = "Application Name"; // - // pictureBox1 - // - this.pictureBox1.Image = global::Moxo_QuickWeb.Properties.Resources.MoxoBlankWindowOutlined; - this.pictureBox1.Location = new System.Drawing.Point(32, 85); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(332, 265); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureBox1.TabIndex = 40; - this.pictureBox1.TabStop = false; - // // Assembly // this.Assembly.Location = new System.Drawing.Point(233, 297); @@ -648,26 +523,6 @@ private void InitializeComponent() this.SettingsSettings.Text = ""; this.SettingsSettings.Visible = false; // - // pictureBox2 - // - this.pictureBox2.Image = global::Moxo_QuickWeb.Properties.Resources.MoxoBracketHeightThin; - this.pictureBox2.Location = new System.Drawing.Point(345, 100); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(78, 235); - this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureBox2.TabIndex = 43; - this.pictureBox2.TabStop = false; - // - // pictureBox3 - // - this.pictureBox3.Image = global::Moxo_QuickWeb.Properties.Resources.MoxoBracketWidthThin; - this.pictureBox3.Location = new System.Drawing.Point(32, 24); - this.pictureBox3.Name = "pictureBox3"; - this.pictureBox3.Size = new System.Drawing.Size(332, 87); - this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureBox3.TabIndex = 44; - this.pictureBox3.TabStop = false; - // // AppConfig // this.AppConfig.Location = new System.Drawing.Point(306, 297); @@ -706,6 +561,152 @@ private void InitializeComponent() this.DummyCleanup.Interval = 125; this.DummyCleanup.Tick += new System.EventHandler(this.DummyCleanup_Tick); // + // Preview_Forward + // + this.Preview_Forward.Image = global::Moxo_QuickWeb.Properties.Resources.MoxoForwardPreview; + this.Preview_Forward.Location = new System.Drawing.Point(149, 124); + this.Preview_Forward.Name = "Preview_Forward"; + this.Preview_Forward.Size = new System.Drawing.Size(62, 21); + this.Preview_Forward.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.Preview_Forward.TabIndex = 49; + this.Preview_Forward.TabStop = false; + // + // Preview_Refresh + // + this.Preview_Refresh.Image = global::Moxo_QuickWeb.Properties.Resources.MoxoRefreshPreview; + this.Preview_Refresh.Location = new System.Drawing.Point(87, 124); + this.Preview_Refresh.Name = "Preview_Refresh"; + this.Preview_Refresh.Size = new System.Drawing.Size(67, 21); + this.Preview_Refresh.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.Preview_Refresh.TabIndex = 48; + this.Preview_Refresh.TabStop = false; + // + // Preview_Back + // + this.Preview_Back.Image = global::Moxo_QuickWeb.Properties.Resources.MoxoBackPreview; + this.Preview_Back.Location = new System.Drawing.Point(38, 124); + this.Preview_Back.Name = "Preview_Back"; + this.Preview_Back.Size = new System.Drawing.Size(54, 21); + this.Preview_Back.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.Preview_Back.TabIndex = 47; + this.Preview_Back.TabStop = false; + // + // pictureBox1 + // + this.pictureBox1.Image = global::Moxo_QuickWeb.Properties.Resources.MoxoBlankWindowOutlined; + this.pictureBox1.Location = new System.Drawing.Point(32, 85); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(332, 265); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.pictureBox1.TabIndex = 40; + this.pictureBox1.TabStop = false; + // + // pictureBox2 + // + this.pictureBox2.Image = global::Moxo_QuickWeb.Properties.Resources.MoxoBracketHeightThin; + this.pictureBox2.Location = new System.Drawing.Point(345, 100); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(78, 235); + this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.pictureBox2.TabIndex = 43; + this.pictureBox2.TabStop = false; + // + // pictureBox3 + // + this.pictureBox3.Image = global::Moxo_QuickWeb.Properties.Resources.MoxoBracketWidthThin; + this.pictureBox3.Location = new System.Drawing.Point(32, 24); + this.pictureBox3.Name = "pictureBox3"; + this.pictureBox3.Size = new System.Drawing.Size(332, 87); + this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.pictureBox3.TabIndex = 44; + this.pictureBox3.TabStop = false; + // + // CancelButton + // + this.CancelButton.Image = global::Moxo_QuickWeb.Properties.Resources.file_cancel__Custom___1_; + this.CancelButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.CancelButton.Location = new System.Drawing.Point(676, 551); + this.CancelButton.Name = "CancelButton"; + this.CancelButton.Size = new System.Drawing.Size(87, 44); + this.CancelButton.TabIndex = 36; + this.CancelButton.Text = "Cancel"; + this.CancelButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CancelButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.CancelButton.UseVisualStyleBackColor = true; + this.CancelButton.Click += new System.EventHandler(this.CancelButton_Click); + // + // ContinueButton + // + this.ContinueButton.Image = global::Moxo_QuickWeb.Properties.Resources.check_circle__Custom_; + this.ContinueButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.ContinueButton.Location = new System.Drawing.Point(770, 551); + this.ContinueButton.Name = "ContinueButton"; + this.ContinueButton.Size = new System.Drawing.Size(129, 44); + this.ContinueButton.TabIndex = 37; + this.ContinueButton.Text = "Create Application"; + this.ContinueButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.ContinueButton.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage; + this.ContinueButton.UseVisualStyleBackColor = true; + this.ContinueButton.Click += new System.EventHandler(this.ContinueButton_Click); + // + // dotNetLink + // + this.dotNetLink.BackColor = System.Drawing.Color.Transparent; + this.dotNetLink.Cursor = System.Windows.Forms.Cursors.Hand; + this.dotNetLink.Image = global::Moxo_QuickWeb.Properties.Resources.DotLXLogo; + this.dotNetLink.Location = new System.Drawing.Point(305, 110); + this.dotNetLink.Name = "dotNetLink"; + this.dotNetLink.Size = new System.Drawing.Size(83, 28); + this.dotNetLink.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.dotNetLink.TabIndex = 32; + this.dotNetLink.TabStop = false; + this.dotNetLink.Click += new System.EventHandler(this.dotNetLink_Click); + // + // panel1 + // + this.panel1.BackgroundImage = global::Moxo_QuickWeb.Properties.Resources.MoxoBackground_Color; + this.panel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.panel1.Controls.Add(this.pictureBox5); + this.panel1.Controls.Add(this.label10); + this.panel1.Controls.Add(this.label11); + this.panel1.Location = new System.Drawing.Point(-3, -6); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(950, 103); + this.panel1.TabIndex = 35; + // + // pictureBox5 + // + this.pictureBox5.BackColor = System.Drawing.Color.Transparent; + this.pictureBox5.Image = global::Moxo_QuickWeb.Properties.Resources.MoxoQWSWhiteFullLogo; + this.pictureBox5.Location = new System.Drawing.Point(647, 22); + this.pictureBox5.Name = "pictureBox5"; + this.pictureBox5.Size = new System.Drawing.Size(246, 63); + this.pictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.pictureBox5.TabIndex = 32; + this.pictureBox5.TabStop = false; + // + // label10 + // + this.label10.BackColor = System.Drawing.Color.Transparent; + this.label10.Font = new System.Drawing.Font("Segoe UI", 14.25F); + this.label10.ForeColor = System.Drawing.Color.White; + this.label10.Location = new System.Drawing.Point(16, 57); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(456, 28); + this.label10.TabIndex = 28; + this.label10.Text = "Creating a new dotLX Moxo QuickWeb Application"; + // + // label11 + // + this.label11.BackColor = System.Drawing.Color.Transparent; + this.label11.Font = new System.Drawing.Font("Segoe UI Semibold", 19.25F); + this.label11.ForeColor = System.Drawing.Color.White; + this.label11.Location = new System.Drawing.Point(15, 22); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(282, 42); + this.label11.TabIndex = 27; + this.label11.Text = "Create New Web App"; + // // NewdotLX // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -727,22 +728,22 @@ private void InitializeComponent() this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "New Web-App (dotLX) | Moxo QuickWeb"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.NewdotLX_FormClosing); - ((System.ComponentModel.ISupportInitialize)(this.dotNetLink)).EndInit(); - this.panel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); this.Tabs.ResumeLayout(false); this.PreviewVisual.ResumeLayout(false); + this.PreviewCode.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.Preview_Forward)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Preview_Refresh)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Preview_Back)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); - this.PreviewCode.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dotNetLink)).EndInit(); + this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit(); this.ResumeLayout(false); } diff --git a/src/Moxo QuickWeb/NewdotLX.cs b/src/Moxo QuickWeb/NewdotLX.cs index 0875257..727c705 100644 --- a/src/Moxo QuickWeb/NewdotLX.cs +++ b/src/Moxo QuickWeb/NewdotLX.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Data; +using System.Diagnostics; using System.Drawing; using System.IO; using System.IO.Compression; @@ -131,18 +132,7 @@ private void ApplicationWindowHeight_Enter(object sender, EventArgs e) private void CancelButton_Click(object sender, EventArgs e) { - DialogResult dr = MessageBox.Show("Are you sure you want to abandon your progress?", "New dotLX Project | Moxo QuickWeb Studio", MessageBoxButtons.YesNo, MessageBoxIcon.Question); - if (dr == DialogResult.Yes) - { - Dashboard db = new Dashboard(); - db.Show(); - - this.Close(); - } - else - { - // - } + this.Close(); } private void ApplicationWindowHeight_KeyPress(object sender, KeyPressEventArgs e) @@ -177,7 +167,24 @@ private void ApplicationWindowWidth_TextChanged(object sender, EventArgs e) private void NewdotLX_FormClosing(object sender, FormClosingEventArgs e) { - CancelButton.PerformClick(); + string appdatadir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData); + string userdatadir = appdatadir + @"\RWE\Moxo\QuickWeb\"; + string tmpdatafolder = userdatadir + @"tmp\"; + string propertiesdir = tmpdatafolder + @"\Moxo Web UI\Properties\"; + string appconfig = tmpdatafolder + @"\Moxo Web UI\App.config"; + + DialogResult dr = MessageBox.Show("Are you sure you want to abandon your progress?", "New dotLX Project | Moxo QuickWeb Studio", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + if (dr == DialogResult.Yes) + { + Dashboard db = new Dashboard(); + db.Show(); + + this.Close(); + } + else + { + // + } } private void IconBrowse_Click(object sender, EventArgs e) @@ -292,5 +299,10 @@ private void DummyCleanup_Tick(object sender, EventArgs e) Directory.Delete(tmpdatafolder, true); Application.Exit(); } + + private void dotNetLink_Click(object sender, EventArgs e) + { + Process.Start("https://github.com/RyanWalpoleEnterprises/Moxo-QuickWeb/wiki/QuickWeb-dotLX"); + } } } diff --git a/src/Moxo QuickWeb/Properties/Resources.Designer.cs b/src/Moxo QuickWeb/Properties/Resources.Designer.cs index 4dff886..05cbb62 100644 --- a/src/Moxo QuickWeb/Properties/Resources.Designer.cs +++ b/src/Moxo QuickWeb/Properties/Resources.Designer.cs @@ -260,6 +260,36 @@ internal static System.Drawing.Bitmap MoxoLogoFullWhite1 { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap MoxoQWSColorLogo { + get { + object obj = ResourceManager.GetObject("MoxoQWSColorLogo", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap MoxoQWSWhiteFullLogo { + get { + object obj = ResourceManager.GetObject("MoxoQWSWhiteFullLogo", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap MoxoQWSWhiteLogo { + get { + object obj = ResourceManager.GetObject("MoxoQWSWhiteLogo", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/src/Moxo QuickWeb/Properties/Resources.resx b/src/Moxo QuickWeb/Properties/Resources.resx index f79c806..3d97630 100644 --- a/src/Moxo QuickWeb/Properties/Resources.resx +++ b/src/Moxo QuickWeb/Properties/Resources.resx @@ -118,6 +118,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\MoxoQWSColorLogo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\file-cancel (Custom).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -133,6 +136,9 @@ ..\Resources\Invalid.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\check-circle (Custom).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\RWE_logo_White.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -169,6 +175,9 @@ ..\Resources\MoxoLogoFullWhite1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\MoxoQWSWhiteLogo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\MoxoBracketHeight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -181,7 +190,7 @@ ..\Resources\MoxoBlankWindowOutlined.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\check-circle (Custom).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\MoxoQWSWhiteFullLogo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/src/Moxo QuickWeb/Properties/Settings.Designer.cs b/src/Moxo QuickWeb/Properties/Settings.Designer.cs index 86b2b91..7218411 100644 --- a/src/Moxo QuickWeb/Properties/Settings.Designer.cs +++ b/src/Moxo QuickWeb/Properties/Settings.Designer.cs @@ -25,7 +25,7 @@ public static Settings Default { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("230301")] + [global::System.Configuration.DefaultSettingValueAttribute("230302")] public string Version { get { return ((string)(this["Version"])); @@ -49,7 +49,7 @@ public string dotLX_tmpICO { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("10031603A")] + [global::System.Configuration.DefaultSettingValueAttribute("01502103P")] public string BuildVersion { get { return ((string)(this["BuildVersion"])); @@ -58,5 +58,29 @@ public string BuildVersion { this["BuildVersion"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("TRUE")] + public string CheckUpdate { + get { + return ((string)(this["CheckUpdate"])); + } + set { + this["CheckUpdate"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string UpdateReady { + get { + return ((string)(this["UpdateReady"])); + } + set { + this["UpdateReady"] = value; + } + } } } diff --git a/src/Moxo QuickWeb/Properties/Settings.settings b/src/Moxo QuickWeb/Properties/Settings.settings index c6c305d..425253d 100644 --- a/src/Moxo QuickWeb/Properties/Settings.settings +++ b/src/Moxo QuickWeb/Properties/Settings.settings @@ -3,13 +3,19 @@ - 230301 + 230302 - 10031603A + 01502103P + + + TRUE + + + \ No newline at end of file diff --git a/src/Moxo QuickWeb/Resources/MoxoQWSColorLogo.png b/src/Moxo QuickWeb/Resources/MoxoQWSColorLogo.png new file mode 100644 index 0000000..54d7815 Binary files /dev/null and b/src/Moxo QuickWeb/Resources/MoxoQWSColorLogo.png differ diff --git a/src/Moxo QuickWeb/Resources/MoxoQWSWhiteFullLogo.png b/src/Moxo QuickWeb/Resources/MoxoQWSWhiteFullLogo.png new file mode 100644 index 0000000..9d0a549 Binary files /dev/null and b/src/Moxo QuickWeb/Resources/MoxoQWSWhiteFullLogo.png differ diff --git a/src/Moxo QuickWeb/Resources/MoxoQWSWhiteLogo.png b/src/Moxo QuickWeb/Resources/MoxoQWSWhiteLogo.png new file mode 100644 index 0000000..9ebe7b6 Binary files /dev/null and b/src/Moxo QuickWeb/Resources/MoxoQWSWhiteLogo.png differ diff --git a/src/Moxo QuickWeb/Splash.Designer.cs b/src/Moxo QuickWeb/Splash.Designer.cs index 40e43e4..159430a 100644 --- a/src/Moxo QuickWeb/Splash.Designer.cs +++ b/src/Moxo QuickWeb/Splash.Designer.cs @@ -31,45 +31,32 @@ private void InitializeComponent() this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Splash)); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.Status = new System.Windows.Forms.Label(); this.StartApplication = new System.Windows.Forms.Timer(this.components); this.Version = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); this.SuspendLayout(); // // pictureBox1 // this.pictureBox1.BackColor = System.Drawing.Color.Transparent; - this.pictureBox1.Image = global::Moxo_QuickWeb.Properties.Resources.MoxoLogoFullWhite; - this.pictureBox1.Location = new System.Drawing.Point(0, 58); + this.pictureBox1.Image = global::Moxo_QuickWeb.Properties.Resources.MoxoQWSWhiteFullLogo; + this.pictureBox1.Location = new System.Drawing.Point(1, 89); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(559, 93); + this.pictureBox1.Size = new System.Drawing.Size(558, 51); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; // - // pictureBox2 - // - this.pictureBox2.BackColor = System.Drawing.Color.Transparent; - this.pictureBox2.Image = global::Moxo_QuickWeb.Properties.Resources.DotLXLogoWhite; - this.pictureBox2.Location = new System.Drawing.Point(438, 217); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(109, 38); - this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureBox2.TabIndex = 1; - this.pictureBox2.TabStop = false; - // // pictureBox3 // this.pictureBox3.BackColor = System.Drawing.Color.Transparent; this.pictureBox3.Image = global::Moxo_QuickWeb.Properties.Resources.RWE_logo_White; - this.pictureBox3.Location = new System.Drawing.Point(331, 217); + this.pictureBox3.Location = new System.Drawing.Point(453, 218); this.pictureBox3.Name = "pictureBox3"; - this.pictureBox3.Size = new System.Drawing.Size(124, 46); + this.pictureBox3.Size = new System.Drawing.Size(94, 46); this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox3.TabIndex = 2; this.pictureBox3.TabStop = false; @@ -113,7 +100,6 @@ private void InitializeComponent() this.ControlBox = false; this.Controls.Add(this.Version); this.Controls.Add(this.Status); - this.Controls.Add(this.pictureBox2); this.Controls.Add(this.pictureBox1); this.Controls.Add(this.pictureBox3); this.DoubleBuffered = true; @@ -123,7 +109,6 @@ private void InitializeComponent() this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Moxo QuickWeb"; ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); this.ResumeLayout(false); @@ -132,7 +117,6 @@ private void InitializeComponent() #endregion private System.Windows.Forms.PictureBox pictureBox1; - private System.Windows.Forms.PictureBox pictureBox2; private System.Windows.Forms.PictureBox pictureBox3; private System.Windows.Forms.Label Status; private System.Windows.Forms.Timer StartApplication; diff --git a/src/Moxo QuickWeb/Splash.cs b/src/Moxo QuickWeb/Splash.cs index 22c1a3c..8368679 100644 --- a/src/Moxo QuickWeb/Splash.cs +++ b/src/Moxo QuickWeb/Splash.cs @@ -42,7 +42,7 @@ private void CheckDirectories() Directory.Delete(tmpdatafolder, true); } - Status.Text = "Starting QuickWeb..."; + Status.Text = "Starting QuickWeb Studio..."; StartApplication.Start(); } diff --git a/src/Moxo QuickWeb/Update.Designer.cs b/src/Moxo QuickWeb/Update.Designer.cs index 4a1204b..750c776 100644 --- a/src/Moxo QuickWeb/Update.Designer.cs +++ b/src/Moxo QuickWeb/Update.Designer.cs @@ -32,44 +32,34 @@ private void InitializeComponent() System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Update)); this.ProgressBar = new System.Windows.Forms.ProgressBar(); this.DownloadProgress = new System.Windows.Forms.Label(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.StatusText = new System.Windows.Forms.Label(); this.StartExecute = new System.Windows.Forms.Timer(this.components); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // // ProgressBar // - this.ProgressBar.Location = new System.Drawing.Point(12, 140); + this.ProgressBar.Location = new System.Drawing.Point(25, 133); this.ProgressBar.Name = "ProgressBar"; - this.ProgressBar.Size = new System.Drawing.Size(374, 23); + this.ProgressBar.Size = new System.Drawing.Size(361, 23); this.ProgressBar.TabIndex = 0; // // DownloadProgress // this.DownloadProgress.AutoSize = true; this.DownloadProgress.Font = new System.Drawing.Font("Segoe UI", 8.25F); - this.DownloadProgress.Location = new System.Drawing.Point(12, 118); + this.DownloadProgress.Location = new System.Drawing.Point(22, 108); this.DownloadProgress.Name = "DownloadProgress"; this.DownloadProgress.Size = new System.Drawing.Size(74, 13); this.DownloadProgress.TabIndex = 1; this.DownloadProgress.Text = "Calculating..."; // - // pictureBox1 - // - this.pictureBox1.Image = global::Moxo_QuickWeb.Properties.Resources.MoxoLogoFull_1024x433; - this.pictureBox1.Location = new System.Drawing.Point(12, 12); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(176, 75); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureBox1.TabIndex = 2; - this.pictureBox1.TabStop = false; - // // StatusText // this.StatusText.AutoSize = true; this.StatusText.Font = new System.Drawing.Font("Segoe UI Semibold", 11.25F); - this.StatusText.Location = new System.Drawing.Point(11, 95); + this.StatusText.Location = new System.Drawing.Point(21, 85); this.StatusText.Name = "StatusText"; this.StatusText.Size = new System.Drawing.Size(96, 20); this.StatusText.TabIndex = 3; @@ -80,12 +70,22 @@ private void InitializeComponent() this.StartExecute.Interval = 3000; this.StartExecute.Tick += new System.EventHandler(this.StartExecute_Tick); // + // pictureBox1 + // + this.pictureBox1.Image = global::Moxo_QuickWeb.Properties.Resources.MoxoQWSColorLogo; + this.pictureBox1.Location = new System.Drawing.Point(21, 12); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(254, 75); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.pictureBox1.TabIndex = 2; + this.pictureBox1.TabStop = false; + // // Update // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.White; - this.ClientSize = new System.Drawing.Size(408, 187); + this.ClientSize = new System.Drawing.Size(408, 170); this.ControlBox = false; this.Controls.Add(this.StatusText); this.Controls.Add(this.pictureBox1); diff --git a/src/Moxo QuickWeb/bin/Release/Moxo QuickWeb.exe b/src/Moxo QuickWeb/bin/Release/Moxo QuickWeb.exe index a2b4199..dec2ce5 100644 Binary files a/src/Moxo QuickWeb/bin/Release/Moxo QuickWeb.exe and b/src/Moxo QuickWeb/bin/Release/Moxo QuickWeb.exe differ diff --git a/src/Moxo QuickWeb/bin/Release/Moxo QuickWeb.exe.config b/src/Moxo QuickWeb/bin/Release/Moxo QuickWeb.exe.config index 115ad2a..63ac5d6 100644 --- a/src/Moxo QuickWeb/bin/Release/Moxo QuickWeb.exe.config +++ b/src/Moxo QuickWeb/bin/Release/Moxo QuickWeb.exe.config @@ -11,13 +11,19 @@ - 230301 + 230302 - 10031603A + 01502103P + + + TRUE + + + diff --git a/src/Moxo QuickWeb/bin/Release/Moxo QuickWeb.pdb b/src/Moxo QuickWeb/bin/Release/Moxo QuickWeb.pdb index c84818d..3a9d88e 100644 Binary files a/src/Moxo QuickWeb/bin/Release/Moxo QuickWeb.pdb and b/src/Moxo QuickWeb/bin/Release/Moxo QuickWeb.pdb differ diff --git a/src/Moxo QuickWeb/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/src/Moxo QuickWeb/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index a43bdb5..8109baf 100644 Binary files a/src/Moxo QuickWeb/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/src/Moxo QuickWeb/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/src/Moxo QuickWeb/obj/Release/Moxo QuickWeb.csproj.GenerateResource.cache b/src/Moxo QuickWeb/obj/Release/Moxo QuickWeb.csproj.GenerateResource.cache index 4c857c2..df20681 100644 Binary files a/src/Moxo QuickWeb/obj/Release/Moxo QuickWeb.csproj.GenerateResource.cache and b/src/Moxo QuickWeb/obj/Release/Moxo QuickWeb.csproj.GenerateResource.cache differ diff --git a/src/Moxo QuickWeb/obj/Release/Moxo QuickWeb.exe b/src/Moxo QuickWeb/obj/Release/Moxo QuickWeb.exe index 3cc790e..d933b08 100644 Binary files a/src/Moxo QuickWeb/obj/Release/Moxo QuickWeb.exe and b/src/Moxo QuickWeb/obj/Release/Moxo QuickWeb.exe differ diff --git a/src/Moxo QuickWeb/obj/Release/Moxo QuickWeb.pdb b/src/Moxo QuickWeb/obj/Release/Moxo QuickWeb.pdb index c84818d..3a9d88e 100644 Binary files a/src/Moxo QuickWeb/obj/Release/Moxo QuickWeb.pdb and b/src/Moxo QuickWeb/obj/Release/Moxo QuickWeb.pdb differ diff --git a/src/Moxo QuickWeb/obj/Release/Moxo_QuickWeb.Properties.Resources.resources b/src/Moxo QuickWeb/obj/Release/Moxo_QuickWeb.Properties.Resources.resources index 1428034..62a2ae2 100644 Binary files a/src/Moxo QuickWeb/obj/Release/Moxo_QuickWeb.Properties.Resources.resources and b/src/Moxo QuickWeb/obj/Release/Moxo_QuickWeb.Properties.Resources.resources differ diff --git a/src/Moxo QuickWeb/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/src/Moxo QuickWeb/obj/Release/TempPE/Properties.Resources.Designer.cs.dll index 66e9375..384a20e 100644 Binary files a/src/Moxo QuickWeb/obj/Release/TempPE/Properties.Resources.Designer.cs.dll and b/src/Moxo QuickWeb/obj/Release/TempPE/Properties.Resources.Designer.cs.dll differ