Changeset - 46b3b97a9901
Parent rev.
Child rev.
[Not reviewed]
VERSION_T8_RC6 default
0 1 0
Jason Maltzen (jmaltzen) - 6 years ago 2018-05-21 20:05:30
jason.maltzen@unsanctioned.net
Don't allow <=0 screen resolution or pixel scale settings, as that doesn't make sense.
1 file changed with 43 insertions and 40 deletions:
MainWindow.cs
43
40
0 comments (0 inline, 0 general)
MainWindow.cs
➞
Show inline comments
...
 
@@ -30,15 +30,15 @@ using DesertPaintLab;
 
public partial class MainWindow : Gtk.Window
 
{
 
    const string APP_VERSION = "1.7.15";
 

			




	
	
	
		
 
    bool unsavedData = false;


			




	
	
	
		
 
    bool shouldShutDown = false;


			




	
	
	
		
 
    bool unsavedData;


			




	
	
	
		
 
    bool shouldShutDown;


			




	
	
	
		
 
    List<string> profileList = new List<string>();


			




	
	
	
		
 
    PlayerProfile profile = null;


			




	
	
	
		
 
    PlayerProfile profile;


			




	
	
	
		
 

			




	
	
	
		
 
    Gdk.Window rootWindow = null;


			




	
	
	
		
 
    Gdk.Pixbuf screenBuffer = null;


			




	
	
	
		
 
    Gdk.Window rootWindow;


			




	
	
	
		
 
    Gdk.Pixbuf screenBuffer;


			




	
	
	
		
 

			




	
	
	
		
 
    // views


			




	
	
	
		
 
    RecipeGeneratorView generatorView;


			




	
	
	
		
 
    SimulatorView simulatorView;


			




	...
	
		
 
@@ -107,14 +107,14 @@ public partial class MainWindow : Gtk.Wi


			




	
	
	
		
 
        // get the root window


			




	
	
	
		
 
        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;


			




	
	
	
		
 

			




	...
	
		
 
@@ -259,10 +259,11 @@ public partial class MainWindow : Gtk.Wi


			




	
	
	
		
 
        bool profileSelected = false;


			




	
	
	
		
 

			




	
	
	
		
 
        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;


			




	
	
	
		
 
            if ((resp == ResponseType.Ok) && (selectedProfile.Length > 0))


			




	...
	
		
 
@@ -404,10 +405,11 @@ 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.


			




	
	
	
		
 
        {


			




	...
	
		
 
@@ -438,14 +440,14 @@ 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();


			




	
	
	
		
 
    }


			




	...
	
		
 
@@ -722,35 +724,36 @@ public partial class MainWindow : Gtk.Wi


			




	
	
	
		
 
        int screenHeight = detectedScreenHeight;


			




	
	
	
		
 
        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);


			




	
	
	
		
 

			




	
	
	
		
 
        ReactionRecorder.Instance.SetPixelMultiplier(pixelMultiplier);


			




	...
	
		
 
@@ -765,12 +768,12 @@ public partial class MainWindow : Gtk.Wi


			




	
	
	
		
 
        int screenHeight = 1080;


			




	
	
	
		
 
        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;


			




	
	
	
		
 
    }


			




	
	
	
		
 
}


			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







    


    

  


    








    
        Server instance: opal4.opalstack.com-73354
    
    
        This site is powered by
            Kallithea 0.6.2,
        which is
        © 2010–2020 by various authors & licensed under GPLv3.
            – Support