ATITD-Tools/Desert-Paint-Lab Changeset

Changeset - dd3cd8c7f2ba

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Jason Maltzen (jmaltzen) - 9 years ago 2015-12-27 11:01:22
jason.maltzen@unsanctioned.net

Fix up toggling of reagents in recipe generator window.

2 files changed with 11 insertions and 7 deletions:

RecipeGeneratorWindow.cs

gtk-gui/gui.stetic

0 comments (0 inline, 0 general)

RecipeGeneratorWindow.cs

➞

Show inline comments

@@ ... / @@ -133,96 +133,103 @@ namespace DesertPaintLab @@
                     maxRecipeSpinButton.Value = Math.Max(generator.MaxQuantity, 14); //
                     fullQuantitySpinButton.Value = generator.FullQuantity; // TODO: read/save profile info
                     fullQuantityDepthSpinButton.Value = generator.FullQuantityDepth; // TODO: read/save profile info
                     maxIngredientsSpinButton.Value = generator.MaxReagents;
+                }
+            }
             //generator.Log = System.IO.Path.Combine(profile.Directory, "dp_log.txt");
             countLabel.Text = String.Format("{0} / {1}", profile.RecipeCount, Palette.Count);
             Destroyed += OnDestroyed;
             notifyFinished = new Gtk.ThreadNotify(new Gtk.ReadyEvent(HandleFinished));
             notifyProgress = new Gtk.ThreadNotify(new Gtk.ReadyEvent(HandleProgress));
             notifyNewRecipe = new Gtk.ThreadNotify(new Gtk.ReadyEvent(HandleNewRecipe));
             // initialize reagent list
             // Add the columns to the TreeView
             Gtk.TreeViewColumn reagentEnabledColumn = new Gtk.TreeViewColumn ();
             reagentEnabledColumn.Title = "Enabled";
             Gtk.CellRendererToggle reagentEnabledCell = new Gtk.CellRendererToggle ();
             reagentEnabledCell.Activatable = true;
             reagentEnabledCell.Sensitive = true;
             reagentEnabledCell.Mode = Gtk.CellRendererMode.Activatable;
             reagentEnabledCell.Visible = true;
             reagentEnabledCell.Toggled += new Gtk.ToggledHandler(OnReagentEnableToggled);
             reagentEnabledColumn.PackStart (reagentEnabledCell, true);
             //reagentEnabledColumn.AddAttribute(reagentEnabledCell, "active", 0);
             Gtk.TreeViewColumn reagentNameColumn = new Gtk.TreeViewColumn ();
             reagentNameColumn.Title = "Ingredient";
             Gtk.CellRendererText reagentNameCell = new Gtk.CellRendererText ();
             reagentNameCell.Mode = Gtk.CellRendererMode.Inert;
             reagentNameColumn.PackStart (reagentNameCell, true);
             reagentNameColumn.AddAttribute(reagentNameCell, "text", 1);
             reagentNameColumn.Expand = true;
             Gtk.TreeViewColumn reagentCostColumn = new Gtk.TreeViewColumn ();
             reagentCostColumn.Title = "Cost";
             Gtk.CellRendererText reagentCostCell = new Gtk.CellRendererText ();
             reagentCostCell.Edited += OnReagentCostChanged;
             reagentCostCell.Editable = true;
             reagentCostCell.Sensitive = true;
             reagentCostCell.Mode = Gtk.CellRendererMode.Editable;
             reagentCostColumn.PackStart (reagentCostCell, true);
             //reagentCostColumn.AddAttribute(reagentCostCell, "text", 0);
             Gtk.TreeViewColumn reagentMaxColumn = new Gtk.TreeViewColumn ();
             reagentMaxColumn.Title = "Max";
             Gtk.CellRendererText reagentMaxCell = new Gtk.CellRendererText ();
             reagentMaxCell.Edited += OnReagentQuantityChanged;
             reagentMaxCell.Editable = true;
             reagentMaxCell.Sensitive = true;
             reagentCostCell.Mode = Gtk.CellRendererMode.Editable;
             reagentMaxColumn.PackStart (reagentMaxCell, true);
             //reagentMaxColumn.AddAttribute(reagentMaxCell, "text", 0);
             reagentListStore = new Gtk.ListStore(typeof(Reagent), typeof(string), typeof(Reagent), typeof(Reagent));
             foreach (string reagentName in ReagentManager.Names)
+            {
                 Reagent reagent = ReagentManager.GetReagent(reagentName);
                 reagentListStore.AppendValues(reagent, reagentName); // , reagent, reagent);
+            }
             reagentEnabledColumn.SetCellDataFunc (reagentEnabledCell, new Gtk.TreeCellDataFunc (RenderReagentToggle));
             reagentCostColumn.SetCellDataFunc (reagentCostCell, new Gtk.TreeCellDataFunc (RenderReagentCost));
             reagentMaxColumn.SetCellDataFunc (reagentMaxCell, new Gtk.TreeCellDataFunc (RenderReagentQuantity));
             // Assign the model to the TreeView
             reagentListView.Model = reagentListStore;
             reagentListView.Sensitive = true;
             reagentListView.AppendColumn(reagentEnabledColumn);
             reagentListView.AppendColumn(reagentNameColumn);
             reagentListView.AppendColumn(reagentCostColumn);
             reagentListView.AppendColumn(reagentMaxColumn);
             reagentListView.
             ShowAll();
+        }
         protected void OnMaxIngredientsChanged(object sender, EventArgs e)
+        {
             // TODO: save profile setting
             // TODO: no longer permit resume
+        }
         protected void OnMaxRecipeChanged(object sender, EventArgs e)
+        {
             // TODO: save profile setting
             // TODO: no longer permit resume
+        }
         protected void OnFullQuantityDepthChanged(object sender, EventArgs e)
+        {
             // TODO: save profile setting
             // TODO: no longer permit resume
+        }
         protected void OnFullQuantityChanged(object sender, EventArgs e)
+        {
             // TODO: save profile setting
@@ ... / @@ -310,49 +317,49 @@ namespace DesertPaintLab @@
+                }
+            }
+        }
         private void HandleFinished()
+        {
             generator.Wait();
             if (pauseForCheckpoint)
+            {
                 pauseForCheckpoint = false;
                 generator.SaveState(System.IO.Path.Combine(profile.Directory, STATE_FILE));
                 generator.ResumeRecipeGeneration();
+            }
             else
+            {
                 running = false;
                 beginButton.Sensitive = true;
                 ExportToWikiAction.Sensitive = true;
                 IngredientsAction.Sensitive = true;
                 stopResumeButton.Sensitive = false;
                 maxIngredientsSpinButton.Sensitive = true;
                 maxRecipeSpinButton.Sensitive = true;
                 fullQuantitySpinButton.Sensitive = true;
                 fullQuantityDepthSpinButton.Sensitive = true;
-                reagentListView.Sensitive = false;
+                reagentListView.Sensitive = true;
                 //generator = null; // don't. Hang on to generator for resume.
                 profile.SaveRecipes();
                 if (canceling)
+                {
                     generator.SaveState(System.IO.Path.Combine(profile.Directory, STATE_FILE));
                     stopResumeButton.Label = "Resume";
                     stopResumeButton.Sensitive = true;
                     beginButton.Label = "Restart";
+                }
                 else
+                {
                     System.IO.File.Delete(System.IO.Path.Combine(profile.Directory, STATE_FILE));
+                }
+            }
+        }
         protected void OnFinished(object sender, EventArgs args)
+        {
             notifyFinished.WakeupMain();
             //Gtk.Application.Invoke(delegate {
             //    HandleFinished();
             //});
+        }
@@ ... / @@ -489,107 +496,104 @@ namespace DesertPaintLab @@
             win.Show();
+        }
         protected void OnDestroyed(object o, EventArgs args)
+        {
             if (running)
+            {
                 // window closed while generator running: stop and save
                 generator.Finished -= OnFinished;
                 generator.Progress -= OnProgress;
                 generator.NewRecipe -= OnNewRecipe;
                 generator.Stop();
                 generator.Wait();
                 generator.SaveState(System.IO.Path.Combine(profile.Directory, STATE_FILE));
+            }
+        }
         // Reagent view handling
         private void RenderReagentToggle (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+        {
             Reagent reagent = (Reagent) model.GetValue (iter, 0);
             Gtk.CellRendererToggle toggle = (cell as Gtk.CellRendererToggle);
             toggle.Active = reagent.Enabled;
             toggle.Activatable = !reagent.IsCatalyst;
             toggle.Mode = reagent.IsCatalyst ? Gtk.CellRendererMode.Inert : Gtk.CellRendererMode.Activatable;
+        }
         private void RenderReagentCost (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+        {
             Reagent reagent = (Reagent) model.GetValue (iter, 0);
             (cell as Gtk.CellRendererText).Text = reagent.Cost.ToString();
+        }
         private void RenderReagentQuantity (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
+        {
             Reagent reagent = (Reagent) model.GetValue (iter, 0);
             (cell as Gtk.CellRendererText).Text = reagent.RecipeMax.ToString();
+        }
         private void OnReagentCostChanged(object o, Gtk.EditedArgs args)
+        {
             uint newCost;
             if (uint.TryParse(args.NewText, out newCost))
+            {
                 Gtk.TreeIter iter;
                 reagentListStore.GetIter (out iter, new Gtk.TreePath (args.Path));
                 Reagent reagent = (Reagent) reagentListStore.GetValue (iter, 0);
                 if (reagent.Cost != newCost)
+                {
                     reagent.Cost = newCost;
                     SaveReagentSettings();
+                }
+            }
+        }
         private void OnReagentQuantityChanged(object o, Gtk.EditedArgs args)
+        {
             uint newMax;
             if (uint.TryParse(args.NewText, out newMax))
+            {
                 Gtk.TreeIter iter;
                 reagentListStore.GetIter (out iter, new Gtk.TreePath (args.Path));
                 Reagent reagent = (Reagent) reagentListStore.GetValue (iter, 0);
                 if (reagent.RecipeMax != newMax)
+                {
                     reagent.RecipeMax = newMax;
                     SaveReagentSettings();
+                }
+            }
+        }
         private void OnReagentEnableToggled(object o, Gtk.ToggledArgs args)
+        {
             Gtk.CellRendererToggle btn = (Gtk.CellRendererToggle)o;
             Gtk.TreeIter iter;
             reagentListStore.GetIter (out iter, new Gtk.TreePath (args.Path));
             Reagent reagent = (Reagent) reagentListStore.GetValue (iter, 0);
             if (btn.Active != reagent.Enabled)
+            {
                 reagent.Enabled = btn.Active;
             reagent.Enabled = !reagent.Enabled;
                 SaveReagentSettings();
+            }
+        }
         private void SaveReagentSettings()
+        {
             // save out state
             ReagentManager.SaveProfileReagents(profile.ReagentFile);
+        }
         protected void OnCopyRecipeToClipboard(object sender, EventArgs e)
+        {
             Gtk.TreeModel model;
             Gtk.TreeIter iter;
             Gtk.Clipboard clipboard = recipeIngredientsView.GetClipboard(Gdk.Selection.Clipboard);
             Gtk.TreeSelection selection = recipeList.Selection;
             if ((selection != null) && selection.GetSelected(out model, out iter))
+            {
                 string colorName = (string)colorStore.GetValue(iter, 0);
                 PaintRecipe recipe;
                 if (profile.Recipes.TryGetValue(colorName, out recipe))
+                {
                     clipboard.Text = recipe.ToString();
+                }
+            }
+        }

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>

0 comments (0 inline, 0 general)