2.3.4.0 - Welcome message for FirstRun and bringing back Active Windo…

…w to be created by default if screens.xml initially created
gavinkendall · Feb 26, 2021 · c2740c7 · c2740c7
1 parent af53e8c
commit c2740c7
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 3 deletions.
diff --git a/interface/main/FormMain.cs b/interface/main/FormMain.cs
@@ -150,9 +150,19 @@ public FormMain(Config config)
         /// <param name="e"></param>
         private void FormMain_Load(object sender, EventArgs e)
         {
-            HelpMessage("Welcome to " +
-                _config.Settings.Application.GetByKey("Name", _config.Settings.ApplicationName).Value + " " +
-                _config.Settings.Application.GetByKey("Version", _config.Settings.ApplicationVersion).Value);
+            string name = _config.Settings.Application.GetByKey("Name", _config.Settings.ApplicationName).Value.ToString();
+            string version = _config.Settings.Application.GetByKey("Version", _config.Settings.ApplicationVersion).Value.ToString();
+
+            bool firstRun = Convert.ToBoolean(_config.Settings.User.GetByKey("FirstRun", _config.Settings.DefaultSettings.FirstRun).Value);
+
+            string welcome = "Welcome to " + name + " (" + version + ")";
+
+            if (firstRun)
+            {
+                welcome += " - Please click the Help button to learn how to use the application";
+            }
+
+            HelpMessage(welcome);
 
             // Start the scheduled capture timer.
             timerScheduledCapture.Interval = 1000;

diff --git a/modules/screens/ScreenCollection.cs b/modules/screens/ScreenCollection.cs
@@ -299,6 +299,34 @@ public bool LoadXmlFileAndAddScreens(ImageFormatCollection imageFormatCollection
                 {
                     log.WriteDebugMessage("WARNING: Unable to load screens");
 
+                    if (config.Settings.VersionManager.IsOldAppVersion(config.Settings, AppCodename, AppVersion))
+                    {
+                        Version v2182 = config.Settings.VersionManager.Versions.Get(Settings.CODENAME_CLARA, Settings.CODEVERSION_CLARA);
+                        Version configVersion = config.Settings.VersionManager.Versions.Get(AppCodename, AppVersion);
+
+                        if (v2182 != null && configVersion != null && v2182.VersionNumber == configVersion.VersionNumber)
+                        {
+                            Add(new Screen()
+                            {
+                                ViewId = Guid.NewGuid(),
+                                Name = "Active Window",
+                                Folder = fileSystem.ScreenshotsFolder,
+                                Macro = macroParser.DefaultMacro,
+                                Component = 0,
+                                Format = _imageFormatCollection.GetByName(ScreenCapture.DefaultImageFormat),
+                                JpegQuality = 100,
+                                Mouse = true,
+                                Active = true,
+                                X = 0,
+                                Y = 0,
+                                Width = 0,
+                                Height = 0,
+                                Source = 0,
+                                DeviceName = string.Empty
+                            });
+                        }
+                    }
+
                     AddDefaultScreens(screenCapture, macroParser, fileSystem, log);
 
                     SaveToXmlFile(config, fileSystem, log);