Add autofilling songnames; add cell highlighting; add documentation

Sionkerk-Techniek · Feb 12, 2022 · 05ee89e · 05ee89e
1 parent 32b6472
commit 05ee89e
Show file tree

Hide file tree

Showing 12 changed files with 843 additions and 45 deletions.
diff --git a/Dialogs.cs b/Dialogs.cs
@@ -8,7 +8,7 @@
 
 namespace PPTXcreator
 {
-    static class Dialogs
+    public static class Dialogs
     {
         public static void GenericWarning(string message)
         {
@@ -40,6 +40,10 @@ public static void GenericInformation(string title, string message)
             );
         }
 
+        /// <summary>
+        /// Show a folder selection window and check if the selected folder exists
+        /// </summary>
+        /// <returns>The path to the selected folder, or null if the path is invalid</returns>
         public static string SelectFolder(string description)
         {
             FolderBrowserDialog folderDialog = new FolderBrowserDialog
@@ -62,6 +66,10 @@ public static string SelectFolder(string description)
             return null;
         }
 
+        /// <summary>
+        /// Show a file selection window and check if the selected file exists
+        /// </summary>
+        /// <returns>The path to the selected file, or null if the path is invalid</returns>
         public static string SelectFile(string filter, string title)
         {
             OpenFileDialog fileDialog = new OpenFileDialog
@@ -87,16 +95,6 @@ public static string SelectFile(string filter, string title)
             return null;
         }
 
-        public static DialogResult CreateNewSettingsfile(string path)
-        {
-            return MessageBox.Show(
-                $"Het configuratiebestand is niet gevonden op locatie '{path}'. Wil je een nieuw bestand maken?",
-                "Er is een fout opgetreden",
-                MessageBoxButtons.YesNoCancel,
-                MessageBoxIcon.Warning
-            );
-        }
-
         public static void UpdateAvailable(string newversion)
         {
             DialogResult result = MessageBox.Show(
@@ -108,7 +106,7 @@ public static void UpdateAvailable(string newversion)
 
             if (result == DialogResult.Yes)
             {
-                System.Diagnostics.Process.Start("https://github.com/Sionkerk-Houten/PPTXcreator/releases/latest");
+                System.Diagnostics.Process.Start("https://github.com/Sionkerk-Techniek/PPTXcreator/releases/latest");
             }
         }
     }

diff --git a/PPTXcreator.csproj b/PPTXcreator.csproj
@@ -102,6 +102,7 @@
     <Compile Include="Service.cs" />
     <Compile Include="ServiceElement.cs" />
     <Compile Include="PastorInfo.cs" />
+    <Compile Include="Songnames.cs" />
     <Compile Include="UpdateChecker.cs" />
     <Compile Include="Settings.cs" />
     <Compile Include="Window.cs">
@@ -217,6 +218,7 @@
   </Target>
   <ItemGroup>
     <Content Include="Resources\Icon.ico" />
+    <EmbeddedResource Include="Resources\liednamen" />
     <None Include="Resources\outline_update_black_24dp_mirrored.png" />
     <None Include="Resources\outline_update_black_24dp.png" />
   </ItemGroup>

diff --git a/Program.cs b/Program.cs
@@ -5,7 +5,7 @@
 
 namespace PPTXcreator
 {
-    static class Program
+    public static class Program
     {
         public static Window MainWindow { get; private set; }
 
@@ -20,9 +20,12 @@ public static void Main()
             Application.ThreadException += new System.Threading.ThreadExceptionEventHandler(CrashHandlerUI);
             AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CrashHandlerDomain);
 
+            // Load settings, service information, songnames from disk
             Settings.Load();
             Service.UpdateJsonCache();
+            Songnames.LoadNames();
 
+            // Check for updates
             if (Settings.Instance.EnableUpdateChecker) Task.Run(() => UpdateChecker.CheckReleases());
 
             // start UI
@@ -31,6 +34,7 @@ public static void Main()
             MainWindow = new Window();
             Application.Run(MainWindow);
 
+            // Save settings when closing
             Settings.Save();
         }
 

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
 [assembly: NeutralResourcesLanguage("nl")]
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
@@ -139,4 +139,7 @@
   <data name="outline_update_black_24dp_mirrored" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\outline_update_black_24dp_mirrored.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="liednamen" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\liednamen;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>