Merge branch 'release/0.5.2'

sithis993 · Jul 20, 2020 · f483d93 · f483d93
2 parents 577d836 + b824181
commit f483d93
Show file tree

Hide file tree

Showing 5 changed files with 169 additions and 253 deletions.
diff --git a/MealCalculator/AbsGui.cpp b/MealCalculator/AbsGui.cpp
@@ -98,22 +98,6 @@ MealCalculatorFrame::MealCalculatorFrame( wxWindow* parent, wxWindowID id, const
 
 	IngredientDetailsSizer->Add( bSizer81, 1, wxEXPAND, 5 );
 
-	wxBoxSizer* bSizer8;
-	bSizer8 = new wxBoxSizer( wxHORIZONTAL );
-
-	m_staticText3 = new wxStaticText( IngredientDetailsSizer->GetStaticBox(), wxID_ANY, wxT("Grams"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText3->Wrap( -1 );
-	bSizer8->Add( m_staticText3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-
-	bSizer8->Add( 0, 0, 1, wxEXPAND, 5 );
-
-	IngredientGramsTextCtrl = new wxTextCtrl( IngredientDetailsSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer8->Add( IngredientGramsTextCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-
-	IngredientDetailsSizer->Add( bSizer8, 1, wxEXPAND, 5 );
-
 
 	bSizer6->Add( IngredientDetailsSizer, 0, wxEXPAND, 5 );
 
@@ -193,11 +177,17 @@ MealCalculatorFrame::MealCalculatorFrame( wxWindow* parent, wxWindowID id, const
 
 	bSizer6->Add( IngredientNutritionSizer, 0, wxEXPAND, 5 );
 
+	wxStaticBoxSizer* IngredientGramsSizer;
+	IngredientGramsSizer = new wxStaticBoxSizer( new wxStaticBox( IngredientDetailsPanel, wxID_ANY, wxT("Grams") ), wxVERTICAL );
+
+	IngredientGramsTextCtrl = new wxTextCtrl( IngredientGramsSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CENTER|wxTE_PROCESS_ENTER );
+	IngredientGramsSizer->Add( IngredientGramsTextCtrl, 0, wxALL|wxEXPAND, 5 );
+
+	IngredientButton = new wxButton( IngredientGramsSizer->GetStaticBox(), wxID_ANY, wxT("Add to Meal"), wxDefaultPosition, wxDefaultSize, 0 );
+	IngredientGramsSizer->Add( IngredientButton, 0, wxALL|wxEXPAND, 5 );
 
-	bSizer6->Add( 0, 0, 1, wxEXPAND, 5 );
 
-	IngredientButton = new wxButton( IngredientDetailsPanel, wxID_ANY, wxT("Add to Meal"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer6->Add( IngredientButton, 0, wxALL|wxEXPAND, 5 );
+	bSizer6->Add( IngredientGramsSizer, 1, wxEXPAND, 5 );
 
 
 	IngredientDetailsPanel->SetSizer( bSizer6 );

diff --git a/MealCalculator/AbsGui.h b/MealCalculator/AbsGui.h
@@ -51,8 +51,6 @@ class MealCalculatorFrame : public wxFrame
 		wxTextCtrl* IngredientNameTextCtrl;
 		wxStaticText* m_staticText31;
 		wxTextCtrl* IngredientBrandTextCtrl1;
-		wxStaticText* m_staticText3;
-		wxTextCtrl* IngredientGramsTextCtrl;
 		wxStaticText* m_staticText13;
 		wxTextCtrl* IngredientCaloriesTextCtrl;
 		wxStaticText* m_staticText14;
@@ -61,6 +59,7 @@ class MealCalculatorFrame : public wxFrame
 		wxTextCtrl* IngredientCarbohydratesTextCtrl;
 		wxStaticText* m_staticText15;
 		wxTextCtrl* IngredientProteinTextCtrl;
+		wxTextCtrl* IngredientGramsTextCtrl;
 		wxButton* IngredientButton;
 		wxPanel* MealActionsPanel;
 		wxButton* NewIngredientButton;
@@ -75,7 +74,7 @@ class MealCalculatorFrame : public wxFrame
 
 	public:
 
-		MealCalculatorFrame( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Meal Calculator - v0.0.0"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 556,354 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
+		MealCalculatorFrame( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Meal Calculator - v0.0.0"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 556,380 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
 
 		~MealCalculatorFrame();
 

diff --git a/MealCalculator/CMealCalculatorFrame.cpp b/MealCalculator/CMealCalculatorFrame.cpp
@@ -23,6 +23,7 @@ void CMealCalculatorFrame::setEvents()
 {
 
 	IngredientButton->Bind(wxEVT_BUTTON, &CMealCalculatorFrame::addIngredient, this);
+	IngredientGramsTextCtrl->Bind(wxEVT_TEXT_ENTER, &CMealCalculatorFrame::addIngredient, this);
 	RemoveIngredientButton->Bind(wxEVT_BUTTON, &CMealCalculatorFrame::removeIngredient, this);
 	MealIngredientsListBox->Bind(wxEVT_LISTBOX, &CMealCalculatorFrame::selectIngredient, this);
 	IngredientNameTextCtrl->Bind(wxEVT_TEXT, &CMealCalculatorFrame::updateIngredientButton, this);
@@ -91,6 +92,10 @@ void CMealCalculatorFrame::addIngredient(wxEvent & event)
 		oldIngredient->setProteinPer100g(newIngredient->getProteinPer100g());
 	}
 
+	clearIngredientTextCtrls();
+	IngredientNameTextCtrl->SetFocus();
+	MealIngredientsListBox->DeselectAll();
+
 }
 
 

diff --git a/MealCalculator/Version.h b/MealCalculator/Version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_STRING "0.5.1"
+#define VERSION_STRING "0.5.2"