ATITD-Tools/Desert-Paint-Lab Changeset

Changeset - 38bffbeef7d8

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Jason Maltzen (jmaltzen) - 9 years ago 2015-12-25 07:59:52
jason.maltzen@unsanctioned.net

Fix warning on overwrite from import to warn about the right location

2 files changed with 2 insertions and 2 deletions:

MainWindow.cs

gtk-gui/gui.stetic

0 comments (0 inline, 0 general)

MainWindow.cs

➞

Show inline comments

@@ ... / @@ -664,214 +664,214 @@ public partial class MainWindow : Gtk.Wi @@
 	protected virtual void OnChangedIngredient2(object sender, System.EventArgs e)
+	{
 		UpdateIngredients();
+	}
 	protected virtual void OnChangedIngredient3(object sender, System.EventArgs e)
+	{
 		UpdateIngredients();
+	}
 	protected virtual void OnNewProfile(object sender, System.EventArgs e)
+	{
 		if (unsavedData)
+		{
 			MessageDialog md = new MessageDialog(this,
 	            DialogFlags.DestroyWithParent,
 	            MessageType.Warning, ButtonsType.OkCancel,
 	            "Your last reaction was unsaved." +
 	            "Are you sure you want to lose your changes?");
 			ResponseType resp = (ResponseType)md.Run();
 			md.Destroy();
 			if (resp != ResponseType.Ok)
+			{
 				return;
+			}
+		}
 		if (NewProfile())
+		{
 			profile.Load();
 			PopulateDropDowns();
             recipe.Reactions = profile.Reactions;
+		}
+	}
 	protected virtual void OnOpenProfile(object sender, System.EventArgs e)
+	{
 		bool profileSelected = false;
 		SelectProfileDialog selectProfileDialog = new SelectProfileDialog();
 		selectProfileDialog.ProfileList = profileList;
 		ResponseType resp = (ResponseType)selectProfileDialog.Run();
 		selectProfileDialog.Destroy();
 		if (resp == ResponseType.Ok) // Selected a profile.
+		{
 			SetProfileName(selectProfileDialog.SelectedProfile);
 			profileSelected = true;
+		}
 		else if (resp == ResponseType.Accept) // New profile.
+		{
 			profileSelected = NewProfile();
+		}
 		if (profileSelected)
+		{
 			profile.Load();
 			PopulateDropDowns();
+		}
+	}
 	protected virtual void OnAbout(object sender, System.EventArgs e)
+	{
 		AboutDialog aboutDialog = new AboutDialog();
         aboutDialog.ProgramName = "Desert Paint Lab";
         aboutDialog.Version = "0.0.1";
         aboutDialog.Comments = "Desert Paint Lab paint reaction recorder for A Tale in the Desert";
         aboutDialog.Authors = new string [] {"Tess Snider", "Jason Maltzen"};
         //aboutDialog.Website = "http://www.google.com/";
 		aboutDialog.Run();
 		aboutDialog.Destroy();
+	}
 	protected virtual void OnMenuExit (object sender, System.EventArgs e)
+	{
 		if (ConfirmedExit())
+		{
 			Application.Quit();
+		}
+	}
 	protected virtual void OnExport(object sender, System.EventArgs e)
+	{
 		FileChooserDialog fileDialog =
 			new FileChooserDialog("Select destination file.",
 				    this, FileChooserAction.Save,
 			        Gtk.Stock.Cancel, ResponseType.Cancel,
 		            Gtk.Stock.Save, ResponseType.Accept);
 		ResponseType resp = (ResponseType)fileDialog.Run();
 		if (resp == ResponseType.Accept)
+		{
 			string fileName = fileDialog.Filename;
 			string directory = fileDialog.CurrentFolder;
 			profile.SaveToPP(System.IO.Path.Combine(directory, fileName));
+		}
 		fileDialog.Destroy();
+	}
 	protected virtual void RunSimulator(object sender, System.EventArgs e)
+	{
 		SimulatorWindow win = new SimulatorWindow(profile);
 		win.Show();
+	}
     protected void OnOpenRecipeGenerator(object sender, EventArgs e)
+    {
         RecipeGeneratorWindow win = new RecipeGeneratorWindow(profile);
         win.Show();
         //RecipeGenerator gen = new RecipeGenerator();
         //gen.BeginRecipeGeneration(profile.Reactions, 15, 7);
         //MessageDialog md = new MessageDialog(this,
         //    DialogFlags.DestroyWithParent,
         //    MessageType.Info, ButtonsType.Close,
         //    "Coming Soon!");
         //md.Run();
         //md.Destroy();
+    }
     protected void OnShowReactionStatus(object sender, EventArgs e)
+    {
         ReactionStatusWindow win = new ReactionStatusWindow(profile);
         win.Show();
+    }
     protected void OnShowIngredients(object sender, EventArgs e)
+    {
         ReagentWindow win = new ReagentWindow(profile);
         win.Show();
+    }
     protected void OnExportProfile(object sender, EventArgs e)
+    {
         FileChooserDialog fileDialog =
             new FileChooserDialog("Select destination file.",
                     this, FileChooserAction.Save,
                     Gtk.Stock.Cancel, ResponseType.Cancel,
                     Gtk.Stock.Save, ResponseType.Accept);
         ResponseType resp = (ResponseType)fileDialog.Run();
         if (resp == ResponseType.Accept)
+        {
             string fileName = fileDialog.Filename;
             string directory = fileDialog.CurrentFolder;
             string targetFile = System.IO.Path.Combine(directory, fileName);
             if (File.Exists(targetFile))
+            {
                 // prompt to overwrite
                 MessageDialog md = new MessageDialog(this,
                     DialogFlags.DestroyWithParent,
                     MessageType.Warning, ButtonsType.OkCancel,
                     "Overwrite profile at" +
                     targetFile + "?");
                 resp = (ResponseType)md.Run();
                 md.Destroy();
                 if (resp == ResponseType.Ok)
+                {
                     File.Delete(targetFile);
                     profile.Export(targetFile);
+                }
+            }
             else
+            {
                 profile.Export(targetFile);
+            }
+        }
         fileDialog.Destroy();
+    }
     protected void OnImportProfile(object sender, EventArgs e)
+    {
         FileChooserDialog fileDialog =
             new FileChooserDialog("Select file to import.",
                     this, FileChooserAction.Open,
                     Gtk.Stock.Cancel, ResponseType.Cancel,
                     Gtk.Stock.Open, ResponseType.Accept);
         ResponseType resp = (ResponseType)fileDialog.Run();
         if (resp == ResponseType.Accept)
+        {
             string fileName = fileDialog.Filename;
             string directory = fileDialog.CurrentFolder;
             string targetFile = fileName;
             if (directory != null)
+            {
                 targetFile = System.IO.Path.Combine(directory, fileName);
+            }
             if (Directory.Exists(profile.Directory))
+            {
                 // prompt to overwrite
                 MessageDialog md = new MessageDialog(this,
                     DialogFlags.DestroyWithParent,
                     MessageType.Warning, ButtonsType.OkCancel,
                     "Overwrite profile at" +
-                    targetFile + "?");
+                    directory + "?");
                 resp = (ResponseType)md.Run();
                 md.Destroy();
                 if (resp == ResponseType.Ok)
+                {
                     Directory.Delete(profile.Directory, true);
                     profile.Import(targetFile);
+                }
+            }
             else
+            {
                 profile.Import(targetFile);
+            }
             profile.Load();
             PopulateDropDowns();
             recipe.Reactions = profile.Reactions;
+        }
         fileDialog.Destroy();
+    }
+}

gtk-gui/gui.stetic

➞

Show inline comments

 <?xml version="1.0" encoding="utf-8"?>
 <stetic-interface>
   <configuration>
     <images-root-path>..</images-root-path>
     <target-gtk-version>2.12</target-gtk-version>
   </configuration>
   <import>
     <widget-library name="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <widget-library name="../bin/Debug/DesertPaintLab.exe" internal="true" />
+    <widget-library name="../bin/Release/DesertPaintLab.exe" internal="true" />
   </import>
   <widget class="Gtk.Window" id="MainWindow" design-size="629 265">
     <action-group name="Default">
       <action id="FileAction">
         <property name="Type">Action</property>
         <property name="Accelerator">&lt;Alt&gt;f</property>
         <property name="Label" translatable="yes">_File</property>
         <property name="ShortLabel" translatable="yes">_File</property>
       </action>
       <action id="HelpAction">
         <property name="Type">Action</property>
         <property name="Accelerator">&lt;Alt&gt;a</property>
         <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 id="RecipesAction">
         <property name="Type">Action</property>
         <property name="Label" translatable="yes">Recipes</property>
         <property name="ShortLabel" translatable="yes">Recipe Generator</property>
         <signal name="Activated" handler="OnOpenRecipeGenerator" />
       </action>
       <action id="ReactionStatusAction">
         <property name="Type">Action</property>
         <property name="Label" translatable="yes">Reaction Status</property>
         <property name="ShortLabel" translatable="yes">Reaction Status</property>
         <signal name="Activated" handler="OnShowReactionStatus" />
       </action>
       <action id="IngredientsAction">
         <property name="Type">Action</property>
         <property name="Label" translatable="yes">Ingredients</property>
         <property name="ShortLabel" translatable="yes">Ingredients</property>
         <signal name="Activated" handler="OnShowIngredients" />
       </action>
       <action id="ExportProfileAction">
         <property name="Type">Action</property>
         <property name="Label" translatable="yes">Export Profile</property>
         <property name="ShortLabel" translatable="yes">Export Profile</property>
         <signal name="Activated" handler="OnExportProfile" />
       </action>
       <action id="ImportProfileAction">
         <property name="Type">Action</property>
         <property name="Label" translatable="yes">Import Profile</property>
         <property name="ShortLabel" translatable="yes">Import Profile</property>
         <signal name="Activated" handler="OnImportProfile" />
       </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="Menuitem" action="ExportProfileAction" />
                 <node type="Menuitem" action="ImportProfileAction" />
                 <node type="Separator" />
                 <node type="Menuitem" action="ExitAction" />
               </node>
               <node type="Menu" action="WindowAction">
                 <node type="Menuitem" action="RunSimulatorAction" />
                 <node type="Menuitem" action="RecipesAction" />
                 <node type="Menuitem" action="IngredientsAction" />
               </node>
               <node type="Menu" action="HelpAction">
                 <node type="Menuitem" action="AboutAction" />
                 <node type="Menuitem" action="ReactionStatusAction" />
               </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">
                                 <property name="MemberName" />
                                 <property name="IsTextCombo">True</property>
                                 <property name="Items" translatable="yes" />
                                 <signal name="Changed" handler="OnChangedIngredient1" />
                               </widget>
                               <packing>
                                 <property name="Position">1</property>
                                 <property name="AutoSize">False</property>
                               </packing>
                             </child>

0 comments (0 inline, 0 general)