Refactored XAML x:Names (#433)
Description of the changes: -Refactored all x:Names to use the generally accepted Pascal-Casing How changes were validated: Unit Tests Manual Tests
This commit is contained in:
		
				
					committed by
					
						 Daniel Belcher
						Daniel Belcher
					
				
			
			
				
	
			
			
			
						parent
						
							de65db6197
						
					
				
				
					commit
					8520d3fc74
				
			| @@ -38,50 +38,50 @@ NumberPad::NumberPad() : | ||||
|  | ||||
|     const auto& localizationSettings = LocalizationSettings::GetInstance(); | ||||
|      | ||||
|     this->decimalSeparatorButton->Content = localizationSettings.GetDecimalSeparator(); | ||||
|     this->num0Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('0'); | ||||
|     this->num1Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('1'); | ||||
|     this->num2Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('2'); | ||||
|     this->num3Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('3'); | ||||
|     this->num4Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('4'); | ||||
|     this->num5Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('5'); | ||||
|     this->num6Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('6'); | ||||
|     this->num7Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('7'); | ||||
|     this->num8Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('8'); | ||||
|     this->num9Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('9'); | ||||
|     this->DecimalSeparatorButton->Content = localizationSettings.GetDecimalSeparator(); | ||||
|     this->Num0Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('0'); | ||||
|     this->Num1Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('1'); | ||||
|     this->Num2Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('2'); | ||||
|     this->Num3Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('3'); | ||||
|     this->Num4Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('4'); | ||||
|     this->Num5Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('5'); | ||||
|     this->Num6Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('6'); | ||||
|     this->Num7Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('7'); | ||||
|     this->Num8Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('8'); | ||||
|     this->Num9Button->Content = localizationSettings.GetDigitSymbolFromEnUsDigit('9'); | ||||
| } | ||||
|  | ||||
| void NumberPad::ProgModeRadixChange() | ||||
| { | ||||
|     num0Button->IsEnabled = true; | ||||
|     num1Button->IsEnabled = true; | ||||
|     num2Button->IsEnabled = true; | ||||
|     num3Button->IsEnabled = true; | ||||
|     num4Button->IsEnabled = true; | ||||
|     num5Button->IsEnabled = true; | ||||
|     num6Button->IsEnabled = true; | ||||
|     num7Button->IsEnabled = true; | ||||
|     num8Button->IsEnabled = true; | ||||
|     num9Button->IsEnabled = true; | ||||
|     Num0Button->IsEnabled = true; | ||||
|     Num1Button->IsEnabled = true; | ||||
|     Num2Button->IsEnabled = true; | ||||
|     Num3Button->IsEnabled = true; | ||||
|     Num4Button->IsEnabled = true; | ||||
|     Num5Button->IsEnabled = true; | ||||
|     Num6Button->IsEnabled = true; | ||||
|     Num7Button->IsEnabled = true; | ||||
|     Num8Button->IsEnabled = true; | ||||
|     Num9Button->IsEnabled = true; | ||||
|  | ||||
|     auto vm = safe_cast<StandardCalculatorViewModel^>(this->DataContext); | ||||
|     RADIX_TYPE radixType = vm->GetCurrentRadixType(); | ||||
|  | ||||
|     if (radixType == RADIX_TYPE::BIN_RADIX) | ||||
|     { | ||||
|         num2Button->IsEnabled = false; | ||||
|         num3Button->IsEnabled = false; | ||||
|         num4Button->IsEnabled = false; | ||||
|         num5Button->IsEnabled = false; | ||||
|         num6Button->IsEnabled = false; | ||||
|         num7Button->IsEnabled = false; | ||||
|         num8Button->IsEnabled = false; | ||||
|         num9Button->IsEnabled = false; | ||||
|         Num2Button->IsEnabled = false; | ||||
|         Num3Button->IsEnabled = false; | ||||
|         Num4Button->IsEnabled = false; | ||||
|         Num5Button->IsEnabled = false; | ||||
|         Num6Button->IsEnabled = false; | ||||
|         Num7Button->IsEnabled = false; | ||||
|         Num8Button->IsEnabled = false; | ||||
|         Num9Button->IsEnabled = false; | ||||
|     } | ||||
|     else if (radixType == RADIX_TYPE::OCT_RADIX) | ||||
|     { | ||||
|         num8Button->IsEnabled = false; | ||||
|         num9Button->IsEnabled = false; | ||||
|         Num8Button->IsEnabled = false; | ||||
|         Num9Button->IsEnabled = false; | ||||
|     } | ||||
| } | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user