Changeset - 4ef58379d19a
Parent rev.
Child rev.
[Not reviewed]
default
0 10 0
Jason Maltzen (jmaltzen) - 9 years ago 2015-11-19 23:50:55
jason.maltzen@unsanctioned.net
Add a debug menu to help in tracking down problems. Save screen height/width settings entered by the user and load on next run.
5 files changed with 136 insertions and 4 deletions:
DesertPaintLab.csproj
4
MainWindow.cs
105
gtk-gui/DesertPaintLab.FirstRunDialog.cs
1
3
gtk-gui/MainWindow.cs
12
1
gtk-gui/gui.stetic
14
0 comments (0 inline, 0 general)
DesertPaintLab.csproj
➞
Show inline comments
...
 
@@ -76,4 +76,8 @@
 
    <MonoDevelop>
 
      <Properties>
 
        <Policies>
 
          <TextStylePolicy inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/x-csharp" />
 
          <CSharpFormattingPolicy IndentSwitchBody="True" IndentBlocksInsideExpressions="True" AnonymousMethodBraceStyle="NextLine" PropertyBraceStyle="NextLine" PropertyGetBraceStyle="NextLine" PropertySetBraceStyle="NextLine" EventBraceStyle="NextLine" EventAddBraceStyle="NextLine" EventRemoveBraceStyle="NextLine" StatementBraceStyle="NextLine" ElseNewLinePlacement="NewLine" CatchNewLinePlacement="NewLine" FinallyNewLinePlacement="NewLine" WhileNewLinePlacement="DoNotCare" ArrayInitializerWrapping="DoNotChange" ArrayInitializerBraceStyle="NextLine" BeforeMethodDeclarationParentheses="False" BeforeMethodCallParentheses="False" BeforeConstructorDeclarationParentheses="False" NewLineBeforeConstructorInitializerColon="NewLine" NewLineAfterConstructorInitializerColon="SameLine" BeforeDelegateDeclarationParentheses="False" NewParentheses="False" SpacesBeforeBrackets="False" inheritsSet="Mono" inheritsScope="text/x-csharp" scope="text/x-csharp" />
 
        </Policies>
 
        <GtkDesignInfo generateGettext="False" />
 
      </Properties>
MainWindow.cs
➞
Show inline comments
...
 
@@ -24,4 +24,5 @@ using System;
 
using System.IO;
 
using System.Collections.Generic;
 
using System.Text.RegularExpressions;
 
using Gtk;
 
using DesertPaintLab;
...
 
@@ -50,4 +51,6 @@ public partial class MainWindow : Gtk.Wi
 
	int pixelMultiplier = 1;
 

			




	
	
	
		
 
    bool enableDebugMenu = false;


			




	
	
	
		
 

			




	
	
	
		
 
	Gdk.Window rootWindow = null;


			




	
	
	
		
 
	Gdk.Pixbuf screenBuffer = null;


			




	...
	
		
 
@@ -109,4 +112,12 @@ public partial class MainWindow : Gtk.Wi


			




	
	
	
		
 
		rootWindow.GetSize(out screenWidth, out screenHeight);


			




	
	
	
		
 

			




	
	
	
		
 
        string settingsPath = System.IO.Path.Combine(appDataPath, "settings");


			




	
	
	
		
 
        if (System.IO.File.Exists(settingsPath))


			




	
	
	
		
 
        {


			




	
	
	
		
 
            LoadSettings(settingsPath);


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        this.DebugAction.Visible = enableDebugMenu;


			




	
	
	
		
 

			




	
	
	
		
 
		ScreenCheckDialog screenCheckDialog = new ScreenCheckDialog();


			




	
	
	
		
 
		screenCheckDialog.ScreenWidth = screenWidth;


			




	...
	
		
 
@@ -119,4 +130,6 @@ public partial class MainWindow : Gtk.Wi


			




	
	
	
		
 
		screenCheckDialog.Destroy();


			




	
	
	
		
 

			




	
	
	
		
 
        SaveSettings(settingsPath);


			




	
	
	
		
 

			




	
	
	
		
 
		screenBuffer = new Gdk.Pixbuf(Gdk.Colorspace.Rgb, false, 8, screenWidth, screenHeight);


			




	
	
	
		
 
	


			




	...
	
		
 
@@ -133,4 +146,81 @@ public partial class MainWindow : Gtk.Wi


			




	
	
	
		
 
	}


			




	
	
	
		
 

			




	
	
	
		
 
    static Regex optionEntry = new Regex(@"(?<opt>[^#=][^=]*)=(?<optval>.*)$");


			




	
	
	
		
 
    void LoadSettings(string file)


			




	
	
	
		
 
    {


			




	
	
	
		
 
        string line;


			




	
	
	
		
 
        Match match;


			




	
	
	
		
 
        using (StreamReader reader = new StreamReader(file))


			




	
	
	
		
 
        {


			




	
	
	
		
 
            while ((line = reader.ReadLine()) != null) 

			




	
	
	
		
 
            {


			




	
	
	
		
 
                match = optionEntry.Match(line);


			




	
	
	
		
 
                if (match.Success)


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    String optName = match.Groups["opt"].Value.ToLower();


			




	
	
	
		
 
                    String optVal = match.Groups["optval"].Value.Trim();


			




	
	
	
		
 
                    switch (optName)


			




	
	
	
		
 
                    {


			




	
	
	
		
 
                        case "screenwidth":


			




	
	
	
		
 
                            try {


			




	
	
	
		
 
                                int val = Int32.Parse(optVal);


			




	
	
	
		
 
                                if (val > 0)


			




	
	
	
		
 
                                {


			




	
	
	
		
 
                                    screenWidth = val;


			




	
	
	
		
 
                                }


			




	
	
	
		
 
                            } catch (FormatException) {


			




	
	
	
		
 
                                // ignore


			




	
	
	
		
 
                            }


			




	
	
	
		
 
                            break;


			




	
	
	
		
 
                        case "screenheight":


			




	
	
	
		
 
                            try {


			




	
	
	
		
 
                                int val = Int32.Parse(optVal);


			




	
	
	
		
 
                                if (val > 0)


			




	
	
	
		
 
                                {


			




	
	
	
		
 
                                    screenHeight = val;


			




	
	
	
		
 
                                }


			




	
	
	
		
 
                            } catch (FormatException) {


			




	
	
	
		
 
                                // ignore


			




	
	
	
		
 
                            }


			




	
	
	
		
 
                            break;


			




	
	
	
		
 
                        case "pixelmultiplier":


			




	
	
	
		
 
                            try {


			




	
	
	
		
 
                                int val = Int32.Parse(optVal);


			




	
	
	
		
 
                                if (val > 0)


			




	
	
	
		
 
                                {


			




	
	
	
		
 
                                    pixelMultiplier = val;


			




	
	
	
		
 
                                }


			




	
	
	
		
 
                            } catch (FormatException) {


			




	
	
	
		
 
                                // ignore


			




	
	
	
		
 
                            }


			




	
	
	
		
 
                            break;


			




	
	
	
		
 
                        case "debug":


			




	
	
	
		
 
                            try {


			




	
	
	
		
 
                                bool val = Boolean.Parse(optVal.ToLower());


			




	
	
	
		
 
                                enableDebugMenu = val;


			




	
	
	
		
 
                            } catch (FormatException) {


			




	
	
	
		
 
                                // ignore


			




	
	
	
		
 
                            }


			




	
	
	
		
 
                            break;


			




	
	
	
		
 
                        default:


			




	
	
	
		
 
                            // ignore


			




	
	
	
		
 
                            break;


			




	
	
	
		
 
                    }


			




	
	
	
		
 
                }


			




	
	
	
		
 
            }


			




	
	
	
		
 
        }


			




	
	
	
		
 
    }


			




	
	
	
		
 

			




	
	
	
		
 
    void SaveSettings(string file)


			




	
	
	
		
 
    {


			




	
	
	
		
 
        using (StreamWriter writer = new StreamWriter(file))


			




	
	
	
		
 
        {


			




	
	
	
		
 
            writer.WriteLine("screenwidth={0}", screenWidth);


			




	
	
	
		
 
            writer.WriteLine("screenheight={0}", screenHeight);


			




	
	
	
		
 
            writer.WriteLine("pixelmultiplier={0}", pixelMultiplier);


			




	
	
	
		
 
            writer.WriteLine("debug={0}", enableDebugMenu);


			




	
	
	
		
 
        }


			




	
	
	
		
 
    }


			




	
	
	
		
 

			




	
	
	
		
 
	bool ConfirmedExit()


			




	
	
	
		
 
	{


			




	...
	
		
 
@@ -606,4 +696,19 @@ public partial class MainWindow : Gtk.Wi


			




	
	
	
		
 
	}


			




	
	
	
		
 
	


			




	
	
	
		
 
    protected virtual void OnDebugScreenshot(object sender, System.EventArgs e)


			




	
	
	
		
 
    {


			




	
	
	
		
 
        Gdk.Image rootImage = rootWindow.GetImage(0, 0, screenWidth, screenHeight);


			




	
	
	
		
 
        screenBuffer.GetFromImage(rootImage, rootImage.Colormap, 0, 0, 0, 0, screenWidth, screenHeight);


			




	
	
	
		
 
        string screenshotDir = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);


			




	
	
	
		
 
        string filename;


			




	
	
	
		
 
        int i = 0;


			




	
	
	
		
 
        do


			




	
	
	
		
 
        {


			




	
	
	
		
 
            ++i;


			




	
	
	
		
 
            filename = System.IO.Path.Combine(screenshotDir, String.Format("DesertPaintLab_{0}.png", i));


			




	
	
	
		
 
        } while (System.IO.File.Exists(filename));


			




	
	
	
		
 
        screenBuffer.Save(filename, "png");


			




	
	
	
		
 
    }


			




	
	
	
		
 

			




	
	
	
		
 
	protected virtual void OnCaptureButton(object sender, System.EventArgs e)


			




	
	
	
		
 
	{


			




        

    


    
    

    

        

                

                    gtk-gui/DesertPaintLab.FirstRunDialog.cs
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -29,7 +29,5 @@ namespace DesertPaintLab


			




	
	
	
		
 
			this.label2 = new global::Gtk.Label ();


			




	
	
	
		
 
			this.label2.Name = "label2";


			




	
	
	
		
 
			this.label2.LabelProp = "Since this is your first time using this program, you need a new profile.\n\nYou ca" +


			




	
	
	
		
 
			"n either import an existing PracticalPaint reactions.txt file, or you can start " +


			




	
	
	
		
 
			"a new profile from scratch.";


			




	
	
	
		
 
			this.label2.LabelProp = "Since this is your first time using this program, you need a new profile.\n\nYou can either import an existing PracticalPaint reactions.txt file, or you can start a new profile from scratch.";


			




	
	
	
		
 
			this.label2.Wrap = true;


			




	
	
	
		
 
			w1.Add (this.label2);


			




        

    


    
    

    

        

                

                    gtk-gui/MainWindow.cs
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -24,4 +24,8 @@ public partial class MainWindow


			




	
	
	
		
 
	private global::Gtk.Action RunSimulatorAction;


			




	
	
	
		
 
	


			




	
	
	
		
 
	private global::Gtk.Action DebugAction;


			




	
	
	
		
 
	


			




	
	
	
		
 
	private global::Gtk.Action ScreenshotAction;


			




	
	
	
		
 
	


			




	
	
	
		
 
	private global::Gtk.VBox vbox1;


			




	
	
	
		
 
	


			




	...
	
		
 
@@ -115,4 +119,10 @@ public partial class MainWindow


			




	
	
	
		
 
		this.RunSimulatorAction.ShortLabel = "_Run Simulator";


			




	
	
	
		
 
		w1.Add (this.RunSimulatorAction, null);


			




	
	
	
		
 
		this.DebugAction = new global::Gtk.Action ("DebugAction", "Debug", null, null);


			




	
	
	
		
 
		this.DebugAction.ShortLabel = "Debug";


			




	
	
	
		
 
		w1.Add (this.DebugAction, null);


			




	
	
	
		
 
		this.ScreenshotAction = new global::Gtk.Action ("ScreenshotAction", "Screenshot", null, null);


			




	
	
	
		
 
		this.ScreenshotAction.ShortLabel = "Screenshot";


			




	
	
	
		
 
		w1.Add (this.ScreenshotAction, null);


			




	
	
	
		
 
		this.UIManager.InsertActionGroup (w1, 0);


			




	
	
	
		
 
		this.AddAccelGroup (this.UIManager.AccelGroup);


			




	...
	
		
 
@@ -124,5 +134,5 @@ public partial class MainWindow


			




	
	
	
		
 
		this.vbox1.Name = "vbox1";


			




	
	
	
		
 
		// Container child vbox1.Gtk.Box+BoxChild


			




	
	
	
		
 
		this.UIManager.AddUiFromString (@"<ui><menubar name='menubar1'><menu name='FileAction' action='FileAction'><menuitem name='NewProfileAction' action='NewProfileAction'/><menuitem name='OpenProfileAction' action='OpenProfileAction'/><menuitem name='ExportForPracticalPaintAction' action='ExportForPracticalPaintAction'/><separator/><menuitem name='ExitAction' action='ExitAction'/></menu><menu name='WindowAction' action='WindowAction'><menuitem name='RunSimulatorAction' action='RunSimulatorAction'/></menu><menu name='HelpAction' action='HelpAction'><menuitem name='AboutAction' action='AboutAction'/></menu></menubar></ui>");


			




	
	
	
		
 
		this.UIManager.AddUiFromString ("<ui><menubar name='menubar1'><menu name='FileAction' action='FileAction'><menuitem name='NewProfileAction' action='NewProfileAction'/><menuitem name='OpenProfileAction' action='OpenProfileAction'/><menuitem name='ExportForPracticalPaintAction' action='ExportForPracticalPaintAction'/><separator/><menuitem name='ExitAction' action='ExitAction'/></menu><menu name='WindowAction' action='WindowAction'><menuitem name='RunSimulatorAction' action='RunSimulatorAction'/></menu><menu name='HelpAction' action='HelpAction'><menuitem name='AboutAction' action='AboutAction'/></menu><menu name='DebugAction' action='DebugAction'><menuitem name='ScreenshotAction' action='ScreenshotAction'/></menu></menubar></ui>");


			




	
	
	
		
 
		this.menubar1 = ((global::Gtk.MenuBar)(this.UIManager.GetWidget ("/menubar1")));


			




	
	
	
		
 
		this.menubar1.Name = "menubar1";


			




	...
	
		
 
@@ -354,4 +364,5 @@ public partial class MainWindow


			




	
	
	
		
 
		this.ExportForPracticalPaintAction.Activated += new global::System.EventHandler (this.OnExport);


			




	
	
	
		
 
		this.RunSimulatorAction.Activated += new global::System.EventHandler (this.RunSimulator);


			




	
	
	
		
 
		this.ScreenshotAction.Activated += new global::System.EventHandler (this.OnDebugScreenshot);


			




	
	
	
		
 
		this.ingredient1ComboBox.Changed += new global::System.EventHandler (this.OnChangedIngredient1);


			




	
	
	
		
 
		this.ingredient2ComboBox.Changed += new global::System.EventHandler (this.OnChangedIngredient2);


			




        

    


    
    

    

        

                

                    gtk-gui/gui.stetic
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -68,4 +68,15 @@


			




	
	
	
		
 
        <signal name="Activated" handler="RunSimulator" />


			




	
	
	
		
 
      </action>


			




	
	
	
		
 
      <action id="DebugAction">


			




	
	
	
		
 
        <property name="Type">Action</property>


			




	
	
	
		
 
        <property name="Label" translatable="yes">Debug</property>


			




	
	
	
		
 
        <property name="ShortLabel" translatable="yes">Debug</property>


			




	
	
	
		
 
      </action>


			




	
	
	
		
 
      <action id="ScreenshotAction">


			




	
	
	
		
 
        <property name="Type">Action</property>


			




	
	
	
		
 
        <property name="Label" translatable="yes">Screenshot</property>


			




	
	
	
		
 
        <property name="ShortLabel" translatable="yes">Screenshot</property>


			




	
	
	
		
 
        <signal name="Activated" handler="OnDebugScreenshot" />


			




	
	
	
		
 
      </action>


			




	
	
	
		
 
    </action-group>


			




	
	
	
		
 
    <property name="MemberName" />


			




	...
	
		
 
@@ -93,4 +104,7 @@


			




	
	
	
		
 
                <node type="Menuitem" action="AboutAction" />


			




	
	
	
		
 
              </node>


			




	
	
	
		
 
              <node type="Menu" action="DebugAction">


			




	
	
	
		
 
                <node type="Menuitem" action="ScreenshotAction" />


			




	
	
	
		
 
              </node>


			




	
	
	
		
 
            </node>


			




	
	
	
		
 
          </widget>


			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







    


    

  


    








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