Skycoder42
					
					7 years ago
					
				 
				
			 
		 
		
			
				
					
					No known key found for this signature in database
					
						
							GPG Key ID: 8E01AD9EF0578D2B
						
					
				
			
		
		
		
	
		
			
				 2 changed files with 
3 additions and 
4 deletions
			 
			
		 
		
			
				- 
					
					
					 
					src/mvvmcore/message.cpp
				
 
			
				- 
					
					
					 
					tools/settingsgenerator/qpmx.json
				
 
			
		
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
			
				
					| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -3,8 +3,7 @@ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					#include "coreapp.h" | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					#include "qtmvvm_logging_p.h" | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					#include <cmath> | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					#include <QtCore/QtMath> | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					#include <QtGui/QGuiApplication> | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					using namespace QtMvvm; | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -399,7 +398,7 @@ void ProgressControl::setProgress(int progress) | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					void ProgressControl::setProgress(double progressPercent) | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					{ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						Q_ASSERT_X(progressPercent >= 0.0 && progressPercent <= 1.0, Q_FUNC_INFO, "progressPercent must be in the range [0.0,1.0]"); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						setProgress(static_cast<int>(std::round((d->maximum - d->minimum) * progressPercent + d->minimum))); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
						setProgress(static_cast<int>(qRound((d->maximum - d->minimum) * progressPercent + d->minimum))); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					// ------------- Private Implementation -------------
 | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  | 
				
			
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
			
				
					| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -3,7 +3,7 @@ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            "package": "de.skycoder42.qxmlcodegen", | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            "provider": "qpm", | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            "version": "1.1.2" | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            "version": "1.1.3" | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        } | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    ], | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    "license": { | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  |