Changeset - e53fa6e66029
Parent rev.
Child rev.
[Not reviewed]
T9_V7 default
0 2 0
Jason Maltzen - 4 years ago 2019-11-08 22:36:00
jason@hiddenachievement.com
Add a button for marking a reaction as 'no reaction'
2 files changed with 62 insertions and 9 deletions:
UI/CaptureView.cs
41
3
gtk-gui/DesertPaintLab.CaptureView.cs
21
6
0 comments (0 inline, 0 general)
UI/CaptureView.cs
➞
Show inline comments
...
 
@@ -82,2 +82,3 @@ namespace DesertPaintLab
 
            recordButton.Sensitive = false;
 
            recordNoReactionButton.Sensitive = false;
 
        }
...
 
@@ -156,4 +157,7 @@ namespace DesertPaintLab
 
            recordButton.Sensitive = false;
 
            recordNoReactionButton.Sensitive = false;
 
            clearReactionButton.Sensitive = false;
 
            clearReactionButton.Visible = false;
 
            recordNoReactionButton.Sensitive = false;
 
            recordNoReactionButton.Visible = false;
 
...
 
@@ -169,2 +173,4 @@ namespace DesertPaintLab
 
                captureButton.Sensitive = false;
 
                recordNoReactionButton.Sensitive = false;
 
                recordNoReactionButton.Visible = false;
 
                return;
...
 
@@ -178,2 +184,4 @@ namespace DesertPaintLab
 
                recordButton.Sensitive = false;
 
                recordNoReactionButton.Sensitive = false;
 
                recordNoReactionButton.Visible = false;
 
                reactionKnown = false;
...
 
@@ -187,3 +195,4 @@ namespace DesertPaintLab
 
            captureButton.Sensitive = true;
 
 
            recordNoReactionButton.Sensitive = true;
 

			




	
	
	
		
 
            reaction1 = profile.FindReaction(reagents[0], reagents[1]);


			




	...
	
		
 
@@ -196,2 +205,4 @@ namespace DesertPaintLab


			




	
	
	
		
 
                ingredient3ComboBox.Sensitive = true;


			




	
	
	
		
 
                recordNoReactionButton.Sensitive = false;


			




	
	
	
		
 
                recordNoReactionButton.Visible = false;


			




	
	
	
		
 
                if ((reagentName = GetSelectedReagentName(3)) != null)


			




	...
	
		
 
@@ -200,2 +211,4 @@ namespace DesertPaintLab


			




	
	
	
		
 
                    clearReactionButton.Visible = false;


			




	
	
	
		
 
                    recordNoReactionButton.Sensitive = false;


			




	
	
	
		
 
                    recordNoReactionButton.Visible = false;


			




	
	
	
		
 
                    recipe.AddReagent(reagentName);


			




	...
	
		
 
@@ -250,4 +263,6 @@ namespace DesertPaintLab


			




	
	
	
		
 
                ingredient3ComboBox.Sensitive = false;


			




	
	
	
		
 
                recordNoReactionButton.Sensitive = recordEnabled;


			




	
	
	
		
 
                recordNoReactionButton.Visible = true;


			




	
	
	
		
 
            }


			




	
	
	
		
 
        

			




	
	
	
		
 



			




	
	
	
		
 
            expectedColor.Set(recipe.BaseColor);


			




	...
	
		
 
@@ -274,2 +289,3 @@ namespace DesertPaintLab


			




	
	
	
		
 
            clearReactionButton.Sensitive = false;


			




	
	
	
		
 
            recordNoReactionButton.Sensitive = false;


			




	
	
	
		
 

			




	...
	
		
 
@@ -277,2 +293,3 @@ namespace DesertPaintLab


			




	
	
	
		
 
            recordButton.Hide();


			




	
	
	
		
 
            recordNoReactionButton.Hide();


			




	
	
	
		
 

			




	...
	
		
 
@@ -430,2 +447,3 @@ namespace DesertPaintLab


			




	
	
	
		
 
                    recordButton.Sensitive = false;


			




	
	
	
		
 
                    recordNoReactionButton.Sensitive = false;


			




	
	
	
		
 
                }


			




	...
	
		
 
@@ -434,2 +452,3 @@ namespace DesertPaintLab


			




	
	
	
		
 
                    recordButton.Sensitive = recordEnabled;


			




	
	
	
		
 
                    recordNoReactionButton.Sensitive = false;


			




	
	
	
		
 
                }


			




	...
	
		
 
@@ -560,3 +579,16 @@ namespace DesertPaintLab


			




	
	
	
		
 
        }


			




	
	
	
		
 
        

			




	
	
	
		
 

			




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


			




	
	
	
		
 
        {


			




	
	
	
		
 
            if (ReactionRecorder.Instance.RecordReaction(profile, expectedColor, expectedColor, reagents))


			




	
	
	
		
 
            {


			




	
	
	
		
 
                recordNoReactionButton.Sensitive = false;


			




	
	
	
		
 
                recordNoReactionButton.Visible = false;


			




	
	
	
		
 
                clearReactionButton.Sensitive = true;


			




	
	
	
		
 
                clearReactionButton.Visible = true;


			




	
	
	
		
 
                this.reactionSwatch.Color = expectedColor;


			




	
	
	
		
 
                this.reactedColor.Set(expectedColor);


			




	
	
	
		
 
            }


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




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


			




	...
	
		
 
@@ -602,2 +634,8 @@ namespace DesertPaintLab


			




	
	
	
		
 
                        profile.ClearReaction(reagent1, reagent2);


			




	
	
	
		
 
                        reactionSwatch.Clear();


			




	
	
	
		
 
                        reactedColor.Clear();


			




	
	
	
		
 
                        clearReactionButton.Sensitive = false;


			




	
	
	
		
 
                        clearReactionButton.Visible = false;


			




	
	
	
		
 
                        recordNoReactionButton.Sensitive = true;


			




	
	
	
		
 
                        recordNoReactionButton.Visible = true;


			




	
	
	
		
 
                    }


			




        

    


    
    

    

        

                

                    gtk-gui/DesertPaintLab.CaptureView.cs
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -59,2 +59,4 @@ namespace DesertPaintLab


			




	
	
	
		
 
		private global::Gtk.Button recordButton;


			




	
	
	
		
 

			




	
	
	
		
 
        private global::Gtk.Button recordNoReactionButton;


			




	
	
	
		
 
		


			




	...
	
		
 
@@ -159,4 +161,4 @@ namespace DesertPaintLab


			




	
	
	
		
 
			w9.Fill = false;


			




	
	
	
		
 
			// Container child vbox2.Gtk.Box+BoxChild


			




	
	
	
		
 
			this.clearReactionButton = new global::Gtk.Button ();


			




	
	
	
		
 
            // Container child vbox2.Gtk.Box+BoxChild


			




	
	
	
		
 
            this.clearReactionButton = new global::Gtk.Button ();


			




	
	
	
		
 
			this.clearReactionButton.Sensitive = false;


			




	...
	
		
 
@@ -173,3 +175,15 @@ namespace DesertPaintLab


			




	
	
	
		
 
			w10.Padding = ((uint)(6));


			




	
	
	
		
 
			this.GtkAlignment.Add (this.vbox2);


			




	
	
	
		
 
            this.recordNoReactionButton = new global::Gtk.Button();


			




	
	
	
		
 
            this.recordNoReactionButton.CanFocus = true;


			




	
	
	
		
 
            this.recordNoReactionButton.Name = "recordNoReactionButton";


			




	
	
	
		
 
            this.recordNoReactionButton.UseUnderline = true;


			




	
	
	
		
 
            this.recordNoReactionButton.Label = "No Reaction";


			




	
	
	
		
 
            this.vbox2.Add(this.recordNoReactionButton);


			




	
	
	
		
 
            global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.recordNoReactionButton]));


			




	
	
	
		
 
            w21.PackType = ((global::Gtk.PackType)(1));


			




	
	
	
		
 
            w21.Position = 4;


			




	
	
	
		
 
            w21.Expand = false;


			




	
	
	
		
 
            w21.Fill = false;


			




	
	
	
		
 
            w21.Padding = ((uint)(6));


			




	
	
	
		
 
            this.GtkAlignment.Add (this.vbox2);


			




	
	
	
		
 
			this.selectIngredientsFrame.Add (this.GtkAlignment);


			




	...
	
		
 
@@ -290,3 +304,3 @@ namespace DesertPaintLab


			




	
	
	
		
 
			w20.Fill = false;


			




	
	
	
		
 
			this.GtkAlignment2.Add (this.vbox4);


			




	
	
	
		
 
            this.GtkAlignment2.Add (this.vbox4);


			




	
	
	
		
 
			this.reactedColorFrame.Add (this.GtkAlignment2);


			




	...
	
		
 
@@ -317,4 +331,5 @@ namespace DesertPaintLab


			




	
	
	
		
 
            this.recordButton.Clicked += new global::System.EventHandler (this.OnRecord);


			




	
	
	
		
 
		}


			




	
	
	
		
 
	}


			




	
	
	
		
 
            this.recordNoReactionButton.Clicked += new global::System.EventHandler(this.OnRecordNoReaction);


			




	
	
	
		
 
        }


			




	
	
	
		
 
    }


			




	
	
	
		
 
}


			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







    


    

  


    








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