diff --git a/MainWindow.cs b/MainWindow.cs --- a/MainWindow.cs +++ b/MainWindow.cs @@ -31,13 +31,13 @@ public partial class MainWindow : Gtk.Wi { const string APP_VERSION = "1.7.15"; - bool unsavedData = false; - bool shouldShutDown = false; + bool unsavedData; + bool shouldShutDown; List profileList = new List(); - PlayerProfile profile = null; + PlayerProfile profile; - Gdk.Window rootWindow = null; - Gdk.Pixbuf screenBuffer = null; + Gdk.Window rootWindow; + Gdk.Pixbuf screenBuffer; // views RecipeGeneratorView generatorView; @@ -108,12 +108,12 @@ public partial class MainWindow : Gtk.Wi rootWindow = Gdk.Global.DefaultRootWindow; // get its width and height - DesertPaintLab.AppSettings.Load(); + AppSettings.Load(); ShowPreferencesDialog(); bool enableDebugMenu; - DesertPaintLab.AppSettings.Get("EnableDebugMenu", out enableDebugMenu); + AppSettings.Get("EnableDebugMenu", out enableDebugMenu); this.DebugAction.Visible = enableDebugMenu; ReactionRecorder.Instance.OnReactionRecorded += OnReactionRecorded; @@ -260,8 +260,9 @@ public partial class MainWindow : Gtk.Wi if (profileList.Count > 0) { - SelectProfileDialog selectProfileDialog = new SelectProfileDialog(); - selectProfileDialog.ProfileList = profileList; + SelectProfileDialog selectProfileDialog = new SelectProfileDialog { + ProfileList = profileList + }; ResponseType resp = (ResponseType)selectProfileDialog.Run(); selectProfileDialog.Destroy(); string selectedProfile = selectProfileDialog.SelectedProfile; @@ -405,8 +406,9 @@ public partial class MainWindow : Gtk.Wi protected virtual void OnOpenProfile(object sender, System.EventArgs e) { bool profileSelected = false; - SelectProfileDialog selectProfileDialog = new SelectProfileDialog(); - selectProfileDialog.ProfileList = profileList; + SelectProfileDialog selectProfileDialog = new SelectProfileDialog { + ProfileList = profileList + }; ResponseType resp = (ResponseType)selectProfileDialog.Run(); selectProfileDialog.Destroy(); if (resp == ResponseType.Ok) // Selected a profile. @@ -439,12 +441,12 @@ public partial class MainWindow : Gtk.Wi protected virtual void OnAbout(object sender, System.EventArgs e) { - AboutDialog aboutDialog = new AboutDialog(); - - aboutDialog.ProgramName = "Desert Paint Lab"; - aboutDialog.Version = APP_VERSION; - aboutDialog.Comments = "Desert Paint Lab paint reaction recorder for A Tale in the Desert"; - aboutDialog.Authors = new string[] { "Tess Snider", "Jason Maltzen" }; + AboutDialog aboutDialog = new AboutDialog { + ProgramName = "Desert Paint Lab", + Version = APP_VERSION, + Comments = "Desert Paint Lab paint reaction recorder for A Tale in the Desert", + Authors = new string [] { "Tess Snider", "Jason Maltzen" } + }; //aboutDialog.Website = "http://www.google.com/"; aboutDialog.Run(); aboutDialog.Destroy(); @@ -723,33 +725,34 @@ public partial class MainWindow : Gtk.Wi int pixelMultiplier = 1; int interfaceSizeIndex = (int)(InterfaceSize.Small); - DesertPaintLab.AppSettings.Get("ScreenWidth", out screenWidth); - DesertPaintLab.AppSettings.Get("ScreenHeight", out screenHeight); - DesertPaintLab.AppSettings.Get("PixelMultiplier", out pixelMultiplier); - DesertPaintLab.AppSettings.Get("InterfaceSize", out interfaceSizeIndex); + AppSettings.Get("ScreenWidth", out screenWidth); + AppSettings.Get("ScreenHeight", out screenHeight); + AppSettings.Get("PixelMultiplier", out pixelMultiplier); + AppSettings.Get("InterfaceSize", out interfaceSizeIndex); InterfaceSize interfaceSize = (InterfaceSize)interfaceSizeIndex; - ScreenCheckDialog screenCheckDialog = new ScreenCheckDialog(); - screenCheckDialog.DetectedScreenWidth = detectedScreenWidth; - screenCheckDialog.DetectedScreenHeight = detectedScreenHeight; - screenCheckDialog.ScreenWidth = screenWidth; - screenCheckDialog.ScreenHeight = screenHeight; - screenCheckDialog.GamePixelWidth = pixelMultiplier; - screenCheckDialog.InterfaceSize = interfaceSize; + ScreenCheckDialog screenCheckDialog = new ScreenCheckDialog { + DetectedScreenWidth = detectedScreenWidth, + DetectedScreenHeight = detectedScreenHeight, + ScreenWidth = screenWidth, + ScreenHeight = screenHeight, + GamePixelWidth = pixelMultiplier, + InterfaceSize = interfaceSize + }; ResponseType resp = (ResponseType)screenCheckDialog.Run(); - screenWidth = screenCheckDialog.ScreenWidth; - screenHeight = screenCheckDialog.ScreenHeight; - pixelMultiplier = screenCheckDialog.GamePixelWidth; + screenWidth = Math.Max(640, screenCheckDialog.ScreenWidth); // don't support screen smaller than 640x480 no matter what the user says + screenHeight = Math.Max(480, screenCheckDialog.ScreenHeight); + pixelMultiplier = Math.Max(1, screenCheckDialog.GamePixelWidth); // Don't allow 0/negative pixel multiplier interfaceSize = screenCheckDialog.InterfaceSize; screenCheckDialog.Destroy(); - DesertPaintLab.AppSettings.Set("ScreenWidth", screenWidth); - DesertPaintLab.AppSettings.Set("ScreenHeight", screenHeight); - DesertPaintLab.AppSettings.Set("PixelMultiplier", pixelMultiplier); - DesertPaintLab.AppSettings.Set("InterfaceSize", (int)interfaceSize); - DesertPaintLab.AppSettings.Save(); + AppSettings.Set("ScreenWidth", screenWidth); + AppSettings.Set("ScreenHeight", screenHeight); + AppSettings.Set("PixelMultiplier", pixelMultiplier); + AppSettings.Set("InterfaceSize", (int)interfaceSize); + AppSettings.Save(); screenBuffer = new Gdk.Pixbuf(Gdk.Colorspace.Rgb, false, 8, screenWidth, screenHeight); @@ -766,10 +769,10 @@ public partial class MainWindow : Gtk.Wi int pixelMultiplier = 1; int interfaceSizeIndex = (int)(InterfaceSize.Small); - DesertPaintLab.AppSettings.Get("ScreenWidth", out screenWidth); - DesertPaintLab.AppSettings.Get("ScreenHeight", out screenHeight); - DesertPaintLab.AppSettings.Get("PixelMultiplier", out pixelMultiplier); - DesertPaintLab.AppSettings.Get("InterfaceSize", out interfaceSizeIndex); + AppSettings.Get("ScreenWidth", out screenWidth); + AppSettings.Get("ScreenHeight", out screenHeight); + AppSettings.Get("PixelMultiplier", out pixelMultiplier); + AppSettings.Get("InterfaceSize", out interfaceSizeIndex); captureView.ScreenBuffer = screenBuffer; }