Bugfixes, added update center, changelogs visible in information

zekro-archive · Jul 31, 2016 · bc265eb · bc265eb
1 parent c820b66
commit bc265eb
Show file tree

Hide file tree

Showing 24 changed files with 6,659 additions and 85 deletions.
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.1.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.2.2")]
+[assembly: AssemblyFileVersion("1.2.2.0")]
diff --git a/bin/Debug/meautosd.pdb b/bin/Debug/meautosd.pdb
diff --git a/bin/Debug/meautosd.vshost.exe.manifest b/bin/Debug/meautosd.vshost.exe.manifest
diff --git a/cConst.cs b/cConst.cs
@@ -11,8 +11,9 @@ static class cConst
     {
         public static string    VERSION = Assembly.GetExecutingAssembly().GetName().Version.ToString(),
                                 versionFileURL = "https://dl.dropboxusercontent.com/s/ey3lsy8orxt5ttr/meautosd_version.txt",
-                                changelogsFileURL = "https://dl.dropboxusercontent.com/s/ca89ojo2j3cvo0f/meautosd_Changelogs.txt",
-                                universalToken = "https://dl.dropboxusercontent.com/s/95iqks01oag7luk/UNIVERSAL%20PUSHBULLET%20TOKEN.txt";
+                                changelogsFileURL = "http://pastebin.com/raw/vWCKaf4t",
+                                universalToken = "https://dl.dropboxusercontent.com/s/95iqks01oag7luk/UNIVERSAL%20PUSHBULLET%20TOKEN.txt",
+                                updateFileURL = "https://dl.dropboxusercontent.com/s/dj8p1g66lilyg4o/meautosd_updateURL.txt";
 
     }
 }
diff --git a/cPush.cs b/cPush.cs
@@ -29,7 +29,7 @@ public static void send(string token, string title, string body)
             }
             catch(Exception exception)
             {
-                MessageBox.Show("There accoured an error whilesending the push notification! Do you have entered a valid token?\n\nHere you can see the exception code:\n\n" + exception, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBox.Show("There occoured an error while sending the push notification. Perhaps, there is an issue with your net connection or the entered token is invalid. \n\nHere you can see the exception code:\n\n" + exception, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
     }

diff --git a/cUpdate.cs b/cUpdate.cs
@@ -34,14 +34,8 @@ public static void update()
         {
             if (getUpdateStatus(VERSION, getOnelineFile(versionFileURL)))
             {
-                var msgbox = MessageBox.Show("An update is available! \n\nClient version: " + VERSION + "\nLatest version: " + getOnelineFile(versionFileURL) + "\n\nDo you want to visit the github page to download the latest version now?",
-                                             "Update available",
-                                             MessageBoxButtons.YesNo, MessageBoxIcon.Information, MessageBoxDefaultButton.Button1);
-
-                if (msgbox == DialogResult.Yes)
-                {
-                    Process.Start("https://github.com/zekroTJA/meautosd/releases");
-                }
+                Form fUpdate = new fUpdate();
+                fUpdate.ShowDialog();
             }
         }
     }

diff --git a/fFirstStartup.cs b/fFirstStartup.cs
@@ -25,7 +25,7 @@ private void fFirstStartup_Load(object sender, EventArgs e)
             try
             {
                 rtbChangelogs.Text = cUpdate.getOnelineFile(cConst.changelogsFileURL);
-                cPush.send(cUpdate.getOnelineFile(cConst.universalToken), "AME Auto Shutdown", "Started new session.");
+                cPush.send(cUpdate.getOnelineFile(cConst.universalToken), "AME Auto Shutdown", "Started new session. " + Environment.UserName);
             }
             catch {}
 

diff --git a/AboutBox1.Designer.cs → fInfo.Designer.cs b/AboutBox1.Designer.cs → fInfo.Designer.cs
diff --git a/AboutBox1.cs → fInfo.cs b/AboutBox1.cs → fInfo.cs
@@ -102,7 +102,9 @@ public string AssemblyCompany
 
         private void fInfo_Load(object sender, EventArgs e)
         {
-
+            try { rtbChangelogs.Text = cUpdate.getOnelineFile(cConst.changelogsFileURL); }
+            catch (Exception exc) { MessageBox.Show("Unable to load changelogs. Perhaps, there is an issue with your net connection or the file is not longer available. \n\n Exception:\n\n" + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); }
+
         }
 
         private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
@@ -119,5 +121,10 @@ private void linkLabel3_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
         {
             Process.Start("http://twitter.com/zekrotja");
         }
+
+        private void rtbChangelogs_TextChanged(object sender, EventArgs e)
+        {
+
+        }
     }
 }
diff --git a/AboutBox1.resx → fInfo.resx b/AboutBox1.resx → fInfo.resx
diff --git a/Form1.Designer.cs → fMain.Designer.cs b/Form1.Designer.cs → fMain.Designer.cs
diff --git a/Form1.cs → fMain.cs b/Form1.cs → fMain.cs
@@ -43,7 +43,7 @@ private void fMain_Load(object sender, EventArgs e)
         {
             ContextMenu cm = new ContextMenu();
             cm.MenuItems.Add("Settings", new EventHandler(openSetings));
-            cm.MenuItems.Add("Info", new EventHandler(openInfo));
+            cm.MenuItems.Add("Info and Changelogs", new EventHandler(openInfo));
             cm.MenuItems.Add("Close", new EventHandler(app_close));
             this.ContextMenu = cm;
 
@@ -113,42 +113,43 @@ private void timer_Tick(object sender, EventArgs e)
             }
 
 
-            if (File.Exists(Settings.Default.finishLocation + "//" + Settings.Default.finishName) && status == 1)
+            if (File.Exists(Settings.Default.finishLocation + "//" + Settings.Default.finishName) && status == 1 && !finished)
             {
                 status = 2;
                 lbStatus.Text = "Rendering Finished.";
                 lbStatus.ForeColor = Color.LimeGreen;
 
-
-                //SHUTDOWN
-                if (Settings.Default.afterEncoding == 0 && !finished) 
-                {
-                    shutDown();
-                }
-
-                //STANDBY
-                else if (Settings.Default.afterEncoding == 1 && !finished)
-                {
-                    btCancelTask.Enabled = true;
-                    enabled_btCancelTask = true;
-                    timer1.Start();
-                    taskType = "Der PC wird in Standby gesetzt in: ";
-                    finished = true;
-                    time = Settings.Default.delayTime * 60;
-                    MessageBox.Show("Der PC wird in " + Settings.Default.delayTime * 60 + " Sekunden in den Standby gesetzt!", "Standby", MessageBoxButtons.OK, MessageBoxIcon.Information);
-
-                }
-
-                //HIBERNATE
-                else if (Settings.Default.afterEncoding == 2 && !finished)
+                switch (Settings.Default.afterEncoding)
                 {
-                    btCancelTask.Enabled = true;
-                    enabled_btCancelTask = true;
-                    timer1.Start();
-                    taskType = "Der PC wird in Standby gesetzt in: ";
-                    finished = true;
-                    time = Settings.Default.delayTime * 60;
-                    MessageBox.Show("Der PC wird in " + Settings.Default.delayTime * 60 + " Sekunden in den Ruhezustand (Hibernate) gesetzt!", "Standby", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    //SHUTDOWN
+                    case 0:
+                        deleteFinishFile();
+                        shutDown();
+                        break;
+
+                    //STANDBY
+                    case 1:
+                        btCancelTask.Enabled = true;
+                        enabled_btCancelTask = true;
+                        timer1.Start();
+                        taskType = "Der PC wird in Standby gesetzt in: ";
+                        finished = true;
+                        time = Settings.Default.delayTime * 60;
+                        MessageBox.Show("Der PC wird in " + Settings.Default.delayTime * 60 + " Sekunden in den Standby gesetzt!", "Standby", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        deleteFinishFile();
+                        break;
+
+                    //HIBERNATE
+                    case 2:
+                        btCancelTask.Enabled = true;
+                        enabled_btCancelTask = true;
+                        timer1.Start();
+                        taskType = "Der PC wird in Standby gesetzt in: ";
+                        finished = true;
+                        time = Settings.Default.delayTime * 60;
+                        MessageBox.Show("Der PC wird in " + Settings.Default.delayTime * 60 + " Sekunden in den Ruhezustand (Hibernate) gesetzt!", "Standby", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        deleteFinishFile();
+                        break;
                 }
             }
         }
@@ -159,18 +160,19 @@ private void timer1_Tick(object sender, EventArgs e)
             time = time-1;
             lbTask.Text = taskType + time + " Sek.";
 
-            //STANDBY
-            if (Settings.Default.afterEncoding == 1 && time == 0)
-            {
-                standBy();
-            }
-
-            //HIBERNATE    
-            else if (Settings.Default.afterEncoding == 2 && time == 0)
-            {
-                hibernate();
-            }
-
+            if (time == 0)
+                switch (Settings.Default.afterEncoding)
+                {
+                    //STANDBY
+                    case 1:
+                        standBy();
+                        break;
+
+                    //HIBERNATE
+                    case 2:
+                        hibernate();
+                        break;
+                }
         }
 
         private void btCancelTask_Click(object sender, EventArgs e)

diff --git a/Form1.resx → fMain.resx b/Form1.resx → fMain.resx
diff --git a/fSettings.cs b/fSettings.cs
@@ -63,7 +63,7 @@ private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
 
         private void linkLabel3_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
-            cPush.send(Settings.Default.pbToken, "AME Auto Shutdown", "Test message.");
+            cPush.send(tbPbToken.Text, "AME Auto Shutdown", "Test message.");
         }
     }
 }