Finished image viewer, added fullscreen support

ijre · Mar 9, 2020 · 832220b · 832220b
1 parent df5b4a6
commit 832220b
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 5 deletions.
diff --git a/src/GUI/ImageOpenForm.Designer.cs b/src/GUI/ImageOpenForm.Designer.cs
diff --git a/src/GUI/ImageOpenForm.cs b/src/GUI/ImageOpenForm.cs
@@ -42,5 +42,44 @@ public ImageOpenForm()
                 };
             }
         }
+
+        static bool ignoreNext = false;
+
+        private void WebBrowser1_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
+        {
+            if (e.KeyCode.ToString() == "F11")
+            {
+                if (FormBorderStyle == FormBorderStyle.Sizable && !ignoreNext)
+                {
+                    FormBorderStyle = FormBorderStyle.None;
+                    WindowState = FormWindowState.Maximized;
+
+                    ignoreNext = true;
+                }
+                else if (!ignoreNext)
+                {
+                    FormBorderStyle = FormBorderStyle.Sizable;
+                    WindowState = FormWindowState.Normal;
+
+                    ignoreNext = true;
+                }
+                else
+                    ignoreNext = false;
+            }
+            else if (e.KeyCode.ToString() == "Escape")
+            {
+                if (FormBorderStyle == FormBorderStyle.None)
+                {
+                    FormBorderStyle = FormBorderStyle.Sizable;
+                    WindowState = FormWindowState.Normal;
+
+                    ignoreNext = true;
+                }
+                else if (!ignoreNext)
+                    this.Hide();
+                else
+                    ignoreNext = false;
+            }
+        }
     }
 }
diff --git a/src/GUI/MainForm.Designer.cs b/src/GUI/MainForm.Designer.cs
diff --git a/src/GUI/MainForm.cs b/src/GUI/MainForm.cs
@@ -247,13 +247,13 @@ private async Task<int> OnMessage(MessageCreateEventArgs message)
             File.WriteAllText(messages + message.Author.Username + " said " + newMessage + ".txt", message.Message.Id.ToString());
 
             if (message.Message.Attachments.Count == 1 && message.Message.Attachments[0].Width != 0)
-                File.WriteAllText(messages + "images/" + message.Author.Username + (String.IsNullOrWhiteSpace(newMessage) ? " at " + message.Message.Timestamp.Hour + " " + message.Message.Timestamp.Minute : " said " + newMessage) + ".txt", message.Message.Attachments[0].Url);
+                File.WriteAllText(messages + "images/" + message.Author.Username + (String.IsNullOrWhiteSpace(newMessage) ? " at " + message.Message.Timestamp.Hour + " " + message.Message.Timestamp.Minute + ", file name = " + message.Message.Attachments[0].FileName : " said " + newMessage) + ".txt", message.Message.Attachments[0].Url);
             else if (message.Message.Attachments.Count > 1)
                 for (int i = 0; i < message.Message.Attachments.Count; i++)
                 {
                     if (message.Message.Attachments[i].Width == 0)
                         continue;
-                    File.WriteAllText(messages + "images/" + message.Author.Username + " at " + message.Message.Timestamp.Hour + " " + message.Message.Timestamp.Minute + ", File name = " + message.Message.Attachments[i].FileName + ".txt", message.Message.Attachments[i].Url);
+                    File.WriteAllText(messages + "images/" + message.Author.Username + " at " + message.Message.Timestamp.Hour + " " + message.Message.Timestamp.Minute + ", file name = " + message.Message.Attachments[i].FileName + ".txt", message.Message.Attachments[i].Url);
                 }
 
             return 0;

diff --git a/src/GUI/Properties/AssemblyInfo.cs b/src/GUI/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.4.2")]
-[assembly: AssemblyFileVersion("2.2.4.2")]
+[assembly: AssemblyVersion("2.2.5.2")]
+[assembly: AssemblyFileVersion("2.2.5.2")]
 [assembly: NeutralResourcesLanguage("en-US")]