Merge branch 'develop' into style_options
This commit is contained in:
		
						commit
						d93a571a51
					
				
							
								
								
									
										17
									
								
								QtPyLoT.py
									
									
									
									
									
								
							
							
						
						
									
										17
									
								
								QtPyLoT.py
									
									
									
									
									
								
							| @ -3173,9 +3173,10 @@ def create_window(): | |||||||
|     if app is None: |     if app is None: | ||||||
|         app = QApplication(sys.argv) |         app = QApplication(sys.argv) | ||||||
|         app_created = True |         app_created = True | ||||||
|     app.setOrganizationName("QtPyLoT"); |     # set aplication/organization name, domain (important to do this BEFORE setupUI is called for correct QSettings) | ||||||
|  |     app.setOrganizationName("Ruhr-University Bochum / BESTEC") | ||||||
|     app.setOrganizationDomain("rub.de"); |     app.setOrganizationDomain("rub.de"); | ||||||
|     app.setApplicationName("RUB"); |     app.setApplicationName("PyLoT"); | ||||||
|     app.references = set() |     app.references = set() | ||||||
|     # app.references.add(window) |     # app.references.add(window) | ||||||
|     # window.show() |     # window.show() | ||||||
| @ -3207,18 +3208,14 @@ def main(args=None): | |||||||
|     pylot_form.setWindowIcon(icon) |     pylot_form.setWindowIcon(icon) | ||||||
|     pylot_form.setIconSize(QSize(60, 60)) |     pylot_form.setIconSize(QSize(60, 60)) | ||||||
| 
 | 
 | ||||||
|     splash.showMessage('Loading. Please wait ...') |     # set other App information | ||||||
|     pylot_app.processEvents() |  | ||||||
| 
 |  | ||||||
|     # set Application Information |  | ||||||
|     pylot_app.setOrganizationName("Ruhr-University Bochum / BESTEC") |  | ||||||
|     pylot_app.setOrganizationDomain("rub.de") |  | ||||||
|     pylot_app.processEvents() |  | ||||||
|     pylot_app.setApplicationName("PyLoT") |  | ||||||
|     pylot_app.setApplicationVersion(pylot_form.__version__) |     pylot_app.setApplicationVersion(pylot_form.__version__) | ||||||
|     pylot_app.setWindowIcon(app_icon) |     pylot_app.setWindowIcon(app_icon) | ||||||
|     pylot_app.processEvents() |     pylot_app.processEvents() | ||||||
| 
 | 
 | ||||||
|  |     splash.showMessage('Loading. Please wait ...') | ||||||
|  |     pylot_app.processEvents() | ||||||
|  | 
 | ||||||
|     # Show main window and run the app |     # Show main window and run the app | ||||||
|     pylot_form.showMaximized() |     pylot_form.showMaximized() | ||||||
|     pylot_app.processEvents() |     pylot_app.processEvents() | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user