ATITD-Tools/Desert-Paint-Lab Changeset

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

MainWindow.cs

105

gtk-gui/DesertPaintLab.FirstRunDialog.cs

gtk-gui/MainWindow.cs

gtk-gui/gui.stetic

0 comments (0 inline, 0 general)

DesertPaintLab.csproj

➞

Show inline comments

@@ ... / @@ -30,53 +30,57 @@ @@
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
     <ConsolePause>false</ConsolePause>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="System" />
     <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="gtk-gui\gui.stetic">
       <LogicalName>gui.stetic</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="gtk-gui\generated.cs" />
     <Compile Include="MainWindow.cs" />
     <Compile Include="Main.cs" />
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="PlayerProfile.cs" />
     <Compile Include="FirstRunDialog.cs" />
     <Compile Include="SelectProfileDialog.cs" />
     <Compile Include="NewProfileDialog.cs" />
     <Compile Include="PaintSwatch.cs" />
     <Compile Include="Palette.cs" />
     <Compile Include="PaintColor.cs" />
     <Compile Include="Reaction.cs" />
     <Compile Include="ReagentManager.cs" />
     <Compile Include="Reagent.cs" />
     <Compile Include="gtk-gui\MainWindow.cs" />
     <Compile Include="gtk-gui\DesertPaintLab.FirstRunDialog.cs" />
     <Compile Include="gtk-gui\DesertPaintLab.SelectProfileDialog.cs" />
     <Compile Include="gtk-gui\DesertPaintLab.NewProfileDialog.cs" />
     <Compile Include="gtk-gui\DesertPaintLab.PaintSwatch.cs" />
     <Compile Include="SimulatorWindow.cs" />
     <Compile Include="gtk-gui\DesertPaintLab.SimulatorWindow.cs" />
     <Compile Include="ScreenCheckDialog.cs" />
     <Compile Include="gtk-gui\DesertPaintLab.ScreenCheckDialog.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <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>
     </MonoDevelop>
   </ProjectExtensions>
 </Project>
@@ ... / \ No newline at end of file @@

MainWindow.cs

➞

Show inline comments

 /*
  * Copyright (c) 2010, Tess Snider
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
 */
 using System;
 using System.IO;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using Gtk;
 using DesertPaintLab;
 public partial class MainWindow : Gtk.Window
+{
 	const int colorTolerance = 2;
 	int swatchHeight = 24;
 	int colorBarWidth = 306;
 	int redBarSpacing = 32;
 	int greenBarSpacing = 42;
 	int blueBarSpacing = 52;
 	bool unsavedData = false;
 	bool shouldShutDown = false;
 	string appDataPath;
 	List<string> profileList = new List<string>();
 	PlayerProfile profile = null;
 	PaintColor expectedColor = new PaintColor();
 	PaintColor reactedColor = new PaintColor();
 	int screenWidth = 0;
 	int screenHeight = 0;
 	int pixelMultiplier = 1;
     bool enableDebugMenu = false;
 	Gdk.Window rootWindow = null;
 	Gdk.Pixbuf screenBuffer = null;
 	Reagent reagent1 = null;
 	Reagent reagent2 = null;
 	Reagent reagent3 = null;
 	public bool ShouldShutDown
+	{
 		get
+		{
 			return shouldShutDown;
+		}
+	}
 	public MainWindow () : base(Gtk.WindowType.Toplevel)
+	{
 		appDataPath = System.IO.Path.Combine(
 			Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
 		    "DesertPaintLab");
 		if (!System.IO.Directory.Exists(appDataPath))
+		{
 			System.IO.Directory.CreateDirectory(appDataPath);
+		}
 		DirectoryInfo di = new DirectoryInfo(appDataPath);
 		DirectoryInfo[] dirs = di.GetDirectories();
 		foreach (DirectoryInfo dir in dirs)
+		{
 			if (dir.Name != "template")
+			{
 				profileList.Add(dir.Name);
+			}
+		}
 		Palette.Load(System.IO.Path.Combine(
 				System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location),
 		    	"colors.txt"));
 		Build();
 		if (unmodifiedSwatch != null)
+		{
 			unmodifiedSwatch.Clear();
+		}
 		if (reactionSwatch != null)
+		{
 			reactionSwatch.Clear();
+		}
 		// get the root window
 		rootWindow = Gdk.Global.DefaultRootWindow;
 		// get its width and height
 		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;
 		screenCheckDialog.ScreenHeight = screenHeight;
 		screenCheckDialog.GamePixelWidth = pixelMultiplier;
 		ResponseType resp = (ResponseType)screenCheckDialog.Run();
 		screenWidth = screenCheckDialog.ScreenWidth;
 		screenHeight = screenCheckDialog.ScreenHeight;
 		pixelMultiplier = screenCheckDialog.GamePixelWidth;
 		screenCheckDialog.Destroy();
         SaveSettings(settingsPath);
 		screenBuffer = new Gdk.Pixbuf(Gdk.Colorspace.Rgb, false, 8, screenWidth, screenHeight);
 		swatchHeight    *= pixelMultiplier;
 		colorBarWidth   *= pixelMultiplier;
 		redBarSpacing   *= pixelMultiplier;
 		greenBarSpacing *= pixelMultiplier;
 		blueBarSpacing  *= pixelMultiplier;
 		if (!OpenProfile())
+		{
 			shouldShutDown = true;
+		}
+	}
     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()
+	{
 		if (unsavedData)
+		{
 			MessageDialog md = new MessageDialog(this,
 	            DialogFlags.DestroyWithParent,
 	            MessageType.Warning, ButtonsType.OkCancel,
 	            "Your last reaction was unsaved." +
 	            "Are you sure you want to quit?");
 			ResponseType resp = (ResponseType)md.Run();
 			md.Destroy();
 			return (resp == ResponseType.Ok);
+		}
 		return true;
+	}
 	void SetProfileName(string name)
+	{
 		profile = new PlayerProfile(name,
 		                System.IO.Path.Combine(appDataPath, name));
 		statusBar.Push(0, name);
+	}
 	bool NewProfile()
+	{
 		bool newProfileCreated = false;
 		bool duplicateName = false;
 		NewProfileDialog newProfileDialog = new NewProfileDialog();
 		ResponseType resp = (ResponseType)newProfileDialog.Run();
 		if (resp == ResponseType.Ok)
+		{
 			// Make sure profile doesn't already exist.
 			foreach (string profileName in profileList)
+			{
 				if (profileName == newProfileDialog.ProfileName)
+				{
 					MessageDialog md = new MessageDialog(this,
 	            		DialogFlags.DestroyWithParent,
 	            		MessageType.Error, ButtonsType.Ok,
 	            		"That profile name already exists.");
 					resp = (ResponseType)md.Run();
 					md.Destroy();
 					duplicateName = true;
 					break;
+				}
+			}
@@ ... / @@ -560,96 +650,111 @@ public partial class MainWindow : Gtk.Wi @@
 								reactedColor.Red = (byte)Math.Round((float)pixelCount * 255f / (float)colorBarWidth);
 								otherPixelStart = pixelStart + (greenBarSpacing * stride);
 								pixelCount = 0;
 								while ((pixBytes[otherPixelStart] < 0x62) &&
 								       (pixBytes[otherPixelStart + 1] > 0x9F) &&
 								       (pixBytes[otherPixelStart + 2] < 0x62))
+								{
 									pixelCount++;
 									// pixBytes[otherPixelStart] = 0x00;
 									// pixBytes[otherPixelStart + 1] = 0xFF;
 									// pixBytes[otherPixelStart + 2] = 0xFF;
 									otherPixelStart += 3;
+								}
 								reactedColor.Green = (byte)Math.Round((float)pixelCount * 255f / (float)colorBarWidth);
 								otherPixelStart = pixelStart + (blueBarSpacing * stride);
 								pixelCount = 0;
 								while ((pixBytes[otherPixelStart] < 0x62) &&
 									(pixBytes[otherPixelStart + 1] < 0x62) &&
 									(pixBytes[otherPixelStart + 2] > 0x9F))
+								{
 									pixelCount++;
 									// pixBytes[otherPixelStart] = 0x00;
 									// pixBytes[otherPixelStart + 1] = 0xFF;
 									// pixBytes[otherPixelStart + 2] = 0xFF;
 									otherPixelStart += 3;
+								}
 								reactedColor.Blue = (byte)Math.Round((float)pixelCount * 255f / (float)colorBarWidth);
 								// write out the screenshot
 								//screenBuffer.Save("screenshot.png", "png");
 								return true;
+							}
+						}
+					}
+				}
+			}
+		}
         //screenBuffer.Save("screenshot.png", "png");
 		return false;
+	}
     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)
+	{
 		if (CaptureReactionColor())
+		{
 			string warning = "";
 			if (reactedColor.Red == 0)
+			{
 				warning = warning + "\nRed is too low.";
+			}
 			if (reactedColor.Green == 0)
+			{
 				warning = warning + "\nGreen is too low.";
+			}
 			if (reactedColor.Blue == 0)
+			{
 				warning = warning + "\nBlue is too low.";
+			}
 			if (reactedColor.Red == 255)
+			{
 				warning = warning + "\nRed is too high.";
+			}
 			if (reactedColor.Green == 255)
+			{
 				warning = warning + "\nGreen is too high.";
+			}
 			if (reactedColor.Blue == 255)
+			{
 				warning = warning + "\nBlue is too high.";
+			}
 			if (warning.Length != 0)
+			{
 				MessageDialog md = new MessageDialog(this,
 	            DialogFlags.DestroyWithParent,
 	            MessageType.Error, ButtonsType.Ok,
 	            "Reaction clipped.  You will need to do a " +
 	            "3-way reaction to test this pair.  Details: " +
 	            warning);
 				md.Run();
 				md.Destroy();
+			}
 			else
+			{
 				this.reactionSwatch.Color = reactedColor;
 				saveButton.Sensitive = true;
+			}
+		}

gtk-gui/DesertPaintLab.FirstRunDialog.cs

➞

Show inline comments

 // This file has been generated by the GUI designer. Do not modify.
 namespace DesertPaintLab
+{
 	public partial class FirstRunDialog
+	{
 		private global::Gtk.Label label2;
 		private global::Gtk.Button buttonCancel;
 		private global::Gtk.Button buttonImport;
 		private global::Gtk.Button buttonNew;
 		protected virtual void Build ()
+		{
 			global::Stetic.Gui.Initialize (this);
 			// Widget DesertPaintLab.FirstRunDialog
 			this.Name = "DesertPaintLab.FirstRunDialog";
 			this.Title = "Set Up Profile";
 			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
 			this.Modal = true;
 			this.AllowShrink = true;
 			// Internal child DesertPaintLab.FirstRunDialog.VBox
 			global::Gtk.VBox w1 = this.VBox;
 			w1.Name = "dialog1_VBox";
 			w1.BorderWidth = ((uint)(2));
 			// Container child dialog1_VBox.Gtk.Box+BoxChild
 			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);
 			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(w1 [this.label2]));
 			w2.Position = 0;
 			w2.Padding = ((uint)(5));
 			// Internal child DesertPaintLab.FirstRunDialog.ActionArea
 			global::Gtk.HButtonBox w3 = this.ActionArea;
 			w3.Name = "dialog1_ActionArea";
 			w3.Spacing = 10;
 			w3.BorderWidth = ((uint)(5));
 			w3.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
 			this.buttonCancel = new global::Gtk.Button ();
 			this.buttonCancel.CanDefault = true;
 			this.buttonCancel.CanFocus = true;
 			this.buttonCancel.Name = "buttonCancel";
 			this.buttonCancel.UseStock = true;
 			this.buttonCancel.UseUnderline = true;
 			this.buttonCancel.Label = "gtk-cancel";
 			this.AddActionWidget (this.buttonCancel, -6);
 			global::Gtk.ButtonBox.ButtonBoxChild w4 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w3 [this.buttonCancel]));
 			w4.Expand = false;
 			w4.Fill = false;
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
 			this.buttonImport = new global::Gtk.Button ();
 			this.buttonImport.CanDefault = true;
 			this.buttonImport.CanFocus = true;
 			this.buttonImport.Name = "buttonImport";
 			this.buttonImport.UseUnderline = true;
 			this.buttonImport.Label = "Import reactions.txt";
 			this.AddActionWidget (this.buttonImport, -3);
 			global::Gtk.ButtonBox.ButtonBoxChild w5 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w3 [this.buttonImport]));
 			w5.Position = 1;
 			w5.Expand = false;
 			w5.Fill = false;
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
 			this.buttonNew = new global::Gtk.Button ();
 			this.buttonNew.CanFocus = true;
 			this.buttonNew.Name = "buttonNew";
 			this.buttonNew.UseUnderline = true;
 			this.buttonNew.Label = "New Profile";
 			this.AddActionWidget (this.buttonNew, -5);
 			global::Gtk.ButtonBox.ButtonBoxChild w6 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w3 [this.buttonNew]));
 			w6.Position = 2;
 			w6.Expand = false;
 			w6.Fill = false;
 			if ((this.Child != null)) {
 				this.Child.ShowAll ();

gtk-gui/MainWindow.cs

➞

Show inline comments

 // This file has been generated by the GUI designer. Do not modify.
 public partial class MainWindow
+{
 	private global::Gtk.UIManager UIManager;
 	private global::Gtk.Action FileAction;
 	private global::Gtk.Action HelpAction;
 	private global::Gtk.Action AboutAction;
 	private global::Gtk.Action NewProfileAction;
 	private global::Gtk.Action OpenProfileAction;
 	private global::Gtk.Action ExitAction;
 	private global::Gtk.Action ExportForPracticalPaintAction;
 	private global::Gtk.Action WindowAction;
 	private global::Gtk.Action RunSimulatorAction;
 	private global::Gtk.Action DebugAction;
 	private global::Gtk.Action ScreenshotAction;
 	private global::Gtk.VBox vbox1;
 	private global::Gtk.MenuBar menubar1;
 	private global::Gtk.HBox hbox1;
 	private global::Gtk.Frame frame2;
 	private global::Gtk.Alignment GtkAlignment;
 	private global::Gtk.VBox vbox3;
 	private global::Gtk.HBox hbox6;
 	private global::Gtk.Label label4;
 	private global::Gtk.ComboBox ingredient1ComboBox;
 	private global::Gtk.HBox hbox7;
 	private global::Gtk.Label label5;
 	private global::Gtk.ComboBox ingredient2ComboBox;
 	private global::Gtk.HBox hbox8;
 	private global::Gtk.Label label6;
 	private global::Gtk.ComboBox ingredient3ComboBox;
 	private global::Gtk.Label GtkLabel2;
 	private global::Gtk.Frame frame3;
 	private global::Gtk.Alignment GtkAlignment1;
 	private global::Gtk.VBox vbox4;
 	private global::DesertPaintLab.PaintSwatch unmodifiedSwatch;
 	private global::Gtk.Button captureButton;
 	private global::Gtk.Label GtkLabel25;
 	private global::Gtk.Frame frame4;
 	private global::Gtk.Alignment GtkAlignment2;
 	private global::Gtk.VBox vbox5;
 	private global::DesertPaintLab.PaintSwatch reactionSwatch;
 	private global::Gtk.Button saveButton;
 	private global::Gtk.Label GtkLabel26;
 	private global::Gtk.Statusbar statusBar;
 	protected virtual void Build ()
+	{
 		global::Stetic.Gui.Initialize (this);
 		// Widget MainWindow
 		this.UIManager = new global::Gtk.UIManager ();
 		global::Gtk.ActionGroup w1 = new global::Gtk.ActionGroup ("Default");
 		this.FileAction = new global::Gtk.Action ("FileAction", "_File", null, null);
 		this.FileAction.ShortLabel = "_File";
 		w1.Add (this.FileAction, "<Alt>f");
 		this.HelpAction = new global::Gtk.Action ("HelpAction", "_Help", null, null);
 		this.HelpAction.ShortLabel = "_Help";
 		w1.Add (this.HelpAction, "<Alt>a");
 		this.AboutAction = new global::Gtk.Action ("AboutAction", "_About...", null, null);
 		this.AboutAction.ShortLabel = "_About...";
 		w1.Add (this.AboutAction, "<Alt>a");
 		this.NewProfileAction = new global::Gtk.Action ("NewProfileAction", "_New Profile...", null, null);
 		this.NewProfileAction.ShortLabel = "_New Profile...";
 		w1.Add (this.NewProfileAction, "<Alt>n");
 		this.OpenProfileAction = new global::Gtk.Action ("OpenProfileAction", "_Open Profile...", null, null);
 		this.OpenProfileAction.ShortLabel = "_Open Profile...";
 		w1.Add (this.OpenProfileAction, "<Alt>o");
 		this.ExitAction = new global::Gtk.Action ("ExitAction", "E_xit", null, null);
 		this.ExitAction.ShortLabel = "E_xit";
 		w1.Add (this.ExitAction, "<Alt>x");
 		this.ExportForPracticalPaintAction = new global::Gtk.Action ("ExportForPracticalPaintAction", "Export for _PracticalPaint...", null, null);
 		this.ExportForPracticalPaintAction.ShortLabel = "Export for _PracticalPaint...";
 		w1.Add (this.ExportForPracticalPaintAction, null);
 		this.WindowAction = new global::Gtk.Action ("WindowAction", "_Window", null, null);
 		this.WindowAction.ShortLabel = "_Window";
 		w1.Add (this.WindowAction, null);
 		this.RunSimulatorAction = new global::Gtk.Action ("RunSimulatorAction", "_Run Simulator", null, null);
 		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);
 		this.Name = "MainWindow";
 		this.Title = "Desert Paint Lab";
 		this.WindowPosition = ((global::Gtk.WindowPosition)(4));
 		// Container child MainWindow.Gtk.Container+ContainerChild
 		this.vbox1 = new global::Gtk.VBox ();
 		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";
 		this.vbox1.Add (this.menubar1);
 		global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.menubar1]));
 		w2.Position = 0;
 		w2.Expand = false;
 		w2.Fill = false;
 		// Container child vbox1.Gtk.Box+BoxChild
 		this.hbox1 = new global::Gtk.HBox ();
 		this.hbox1.Name = "hbox1";
 		this.hbox1.Spacing = 6;
 		this.hbox1.BorderWidth = ((uint)(4));
 		// Container child hbox1.Gtk.Box+BoxChild
 		this.frame2 = new global::Gtk.Frame ();
 		this.frame2.Name = "frame2";
 		this.frame2.BorderWidth = ((uint)(4));
 		// Container child frame2.Gtk.Container+ContainerChild
 		this.GtkAlignment = new global::Gtk.Alignment (0F, 0F, 1F, 1F);
 		this.GtkAlignment.Name = "GtkAlignment";
 		this.GtkAlignment.LeftPadding = ((uint)(6));
 		this.GtkAlignment.RightPadding = ((uint)(6));
 		// Container child GtkAlignment.Gtk.Container+ContainerChild
 		this.vbox3 = new global::Gtk.VBox ();
 		this.vbox3.Name = "vbox3";
 		this.vbox3.Homogeneous = true;
 		this.vbox3.Spacing = 6;
 		// Container child vbox3.Gtk.Box+BoxChild
 		this.hbox6 = new global::Gtk.HBox ();
 		this.hbox6.Name = "hbox6";
 		this.hbox6.Spacing = 6;
 		// Container child hbox6.Gtk.Box+BoxChild
 		this.label4 = new global::Gtk.Label ();
 		this.label4.Name = "label4";
 		this.label4.LabelProp = "Ingredient 1:";
 		this.hbox6.Add (this.label4);
 		global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox6 [this.label4]));
 		w3.Position = 0;
 		w3.Expand = false;
 		w3.Fill = false;
 		// Container child hbox6.Gtk.Box+BoxChild
 		this.ingredient1ComboBox = global::Gtk.ComboBox.NewText ();
 		this.ingredient1ComboBox.Name = "ingredient1ComboBox";
 		this.hbox6.Add (this.ingredient1ComboBox);
 		global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox6 [this.ingredient1ComboBox]));
 		w4.Position = 1;
 		this.vbox3.Add (this.hbox6);
 		global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox6]));
 		w5.Position = 0;
@@ ... / @@ -308,55 +318,56 @@ public partial class MainWindow @@
 		this.saveButton.WidthRequest = 100;
 		this.saveButton.CanFocus = true;
 		this.saveButton.Name = "saveButton";
 		this.saveButton.UseUnderline = true;
 		this.saveButton.Label = "Record";
 		this.vbox5.Add (this.saveButton);
 		global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.saveButton]));
 		w21.Position = 1;
 		w21.Expand = false;
 		w21.Fill = false;
 		this.GtkAlignment2.Add (this.vbox5);
 		this.frame4.Add (this.GtkAlignment2);
 		this.GtkLabel26 = new global::Gtk.Label ();
 		this.GtkLabel26.Name = "GtkLabel26";
 		this.GtkLabel26.LabelProp = "<b>Reaction</b>";
 		this.GtkLabel26.UseMarkup = true;
 		this.frame4.LabelWidget = this.GtkLabel26;
 		this.hbox1.Add (this.frame4);
 		global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.frame4]));
 		w24.Position = 2;
 		w24.Expand = false;
 		w24.Fill = false;
 		this.vbox1.Add (this.hbox1);
 		global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1]));
 		w25.Position = 1;
 		// Container child vbox1.Gtk.Box+BoxChild
 		this.statusBar = new global::Gtk.Statusbar ();
 		this.statusBar.Name = "statusBar";
 		this.statusBar.Spacing = 6;
 		this.vbox1.Add (this.statusBar);
 		global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.statusBar]));
 		w26.Position = 2;
 		w26.Expand = false;
 		w26.Fill = false;
 		this.Add (this.vbox1);
 		if ((this.Child != null)) {
 			this.Child.ShowAll ();
+		}
 		this.DefaultWidth = 629;
 		this.DefaultHeight = 265;
 		this.Show ();
 		this.DeleteEvent += new global::Gtk.DeleteEventHandler (this.OnDeleteEvent);
 		this.AboutAction.Activated += new global::System.EventHandler (this.OnAbout);
 		this.NewProfileAction.Activated += new global::System.EventHandler (this.OnNewProfile);
 		this.OpenProfileAction.Activated += new global::System.EventHandler (this.OnOpenProfile);
 		this.ExitAction.Activated += new global::System.EventHandler (this.OnMenuExit);
 		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);
 		this.ingredient3ComboBox.Changed += new global::System.EventHandler (this.OnChangedIngredient3);
 		this.captureButton.Clicked += new global::System.EventHandler (this.OnCaptureButton);
 		this.saveButton.Clicked += new global::System.EventHandler (this.OnSaveButton);
+	}
+}

gtk-gui/gui.stetic

➞

Show inline comments

@@ ... / @@ -22,121 +22,135 @@ @@
         <property name="Label" translatable="yes">_Help</property>
         <property name="ShortLabel" translatable="yes">_Help</property>
       </action>
       <action id="AboutAction">
         <property name="Type">Action</property>
         <property name="Accelerator">&lt;Alt&gt;a</property>
         <property name="Label" translatable="yes">_About...</property>
         <property name="ShortLabel" translatable="yes">_About...</property>
         <signal name="Activated" handler="OnAbout" />
       </action>
       <action id="NewProfileAction">
         <property name="Type">Action</property>
         <property name="Accelerator">&lt;Alt&gt;n</property>
         <property name="Label" translatable="yes">_New Profile...</property>
         <property name="ShortLabel" translatable="yes">_New Profile...</property>
         <signal name="Activated" handler="OnNewProfile" />
       </action>
       <action id="OpenProfileAction">
         <property name="Type">Action</property>
         <property name="Accelerator">&lt;Alt&gt;o</property>
         <property name="Label" translatable="yes">_Open Profile...</property>
         <property name="ShortLabel" translatable="yes">_Open Profile...</property>
         <signal name="Activated" handler="OnOpenProfile" />
       </action>
       <action id="ExitAction">
         <property name="Type">Action</property>
         <property name="Accelerator">&lt;Alt&gt;x</property>
         <property name="Label" translatable="yes">E_xit</property>
         <property name="ShortLabel" translatable="yes">E_xit</property>
         <signal name="Activated" handler="OnMenuExit" />
       </action>
       <action id="ExportForPracticalPaintAction">
         <property name="Type">Action</property>
         <property name="Label" translatable="yes">Export for _PracticalPaint...</property>
         <property name="ShortLabel" translatable="yes">Export for _PracticalPaint...</property>
         <signal name="Activated" handler="OnExport" />
       </action>
       <action id="WindowAction">
         <property name="Type">Action</property>
         <property name="Label" translatable="yes">_Window</property>
         <property name="ShortLabel" translatable="yes">_Window</property>
       </action>
       <action id="RunSimulatorAction">
         <property name="Type">Action</property>
         <property name="Label" translatable="yes">_Run Simulator</property>
         <property name="ShortLabel" translatable="yes">_Run Simulator</property>
         <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" />
     <property name="Title" translatable="yes">Desert Paint Lab</property>
     <property name="WindowPosition">CenterOnParent</property>
     <signal name="DeleteEvent" handler="OnDeleteEvent" />
     <child>
       <widget class="Gtk.VBox" id="vbox1">
         <property name="MemberName" />
         <child>
           <widget class="Gtk.MenuBar" id="menubar1">
             <property name="MemberName" />
             <node name="menubar1" type="Menubar">
               <node type="Menu" action="FileAction">
                 <node type="Menuitem" action="NewProfileAction" />
                 <node type="Menuitem" action="OpenProfileAction" />
                 <node type="Menuitem" action="ExportForPracticalPaintAction" />
                 <node type="Separator" />
                 <node type="Menuitem" action="ExitAction" />
               </node>
               <node type="Menu" action="WindowAction">
                 <node type="Menuitem" action="RunSimulatorAction" />
               </node>
               <node type="Menu" action="HelpAction">
                 <node type="Menuitem" action="AboutAction" />
               </node>
               <node type="Menu" action="DebugAction">
                 <node type="Menuitem" action="ScreenshotAction" />
               </node>
             </node>
           </widget>
           <packing>
             <property name="Position">0</property>
             <property name="AutoSize">True</property>
             <property name="Expand">False</property>
             <property name="Fill">False</property>
           </packing>
         </child>
         <child>
           <widget class="Gtk.HBox" id="hbox1">
             <property name="MemberName" />
             <property name="Spacing">6</property>
             <property name="BorderWidth">4</property>
             <child>
               <widget class="Gtk.Frame" id="frame2">
                 <property name="MemberName" />
                 <property name="BorderWidth">4</property>
                 <child>
                   <widget class="Gtk.Alignment" id="GtkAlignment">
                     <property name="MemberName" />
                     <property name="Xalign">0</property>
                     <property name="Yalign">0</property>
                     <property name="LeftPadding">6</property>
                     <property name="RightPadding">6</property>
                     <child>
                       <widget class="Gtk.VBox" id="vbox3">
                         <property name="MemberName" />
                         <property name="Homogeneous">True</property>
                         <property name="Spacing">6</property>
                         <child>
                           <widget class="Gtk.HBox" id="hbox6">
                             <property name="MemberName" />
                             <property name="Spacing">6</property>
                             <child>
                               <widget class="Gtk.Label" id="label4">
                                 <property name="MemberName" />
                                 <property name="LabelProp" translatable="yes">Ingredient 1:</property>
                               </widget>
                               <packing>
                                 <property name="Position">0</property>
                                 <property name="AutoSize">True</property>
                                 <property name="Expand">False</property>
                                 <property name="Fill">False</property>
                               </packing>
                             </child>
                             <child>
                               <widget class="Gtk.ComboBox" id="ingredient1ComboBox">

0 comments (0 inline, 0 general)