Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/aga/qubes-manager
This commit is contained in:
		
						commit
						461cd522df
					
				
							
								
								
									
										
											BIN
										
									
								
								icons/log.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								icons/log.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 15 KiB | 
| @ -102,7 +102,7 @@ class VmTypeWidget(VmIconWidget): | |||||||
| 
 | 
 | ||||||
|     def __init__(self, vm, parent=None): |     def __init__(self, vm, parent=None): | ||||||
|         (icon_path, tooltip) = self.get_vm_icon(vm) |         (icon_path, tooltip) = self.get_vm_icon(vm) | ||||||
|         super (VmTypeWidget, self).__init__(icon_path, True, 0.9, tooltip, parent) |         super (VmTypeWidget, self).__init__(icon_path, True, 0.8, tooltip, parent) | ||||||
|         self.vm = vm |         self.vm = vm | ||||||
|         self.tableItem = self.VmTypeItem(self.value) |         self.tableItem = self.VmTypeItem(self.value) | ||||||
| 
 | 
 | ||||||
| @ -127,7 +127,7 @@ class VmTypeWidget(VmIconWidget): | |||||||
|             return (":/hvm.png", "HVM") |             return (":/hvm.png", "HVM") | ||||||
|         elif vm.is_appvm() or vm.is_disposablevm(): |         elif vm.is_appvm() or vm.is_disposablevm(): | ||||||
|             self.value = 5 + vm.label.index |             self.value = 5 + vm.label.index | ||||||
|             return (":/off.png", "AppVM") |             return (":/appvm.png", "AppVM") | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| class VmLabelWidget(VmIconWidget): | class VmLabelWidget(VmIconWidget): | ||||||
|  | |||||||
| @ -8,7 +8,7 @@ | |||||||
|     <file alias="global-settings.png">icons/global-settings.png</file> |     <file alias="global-settings.png">icons/global-settings.png</file> | ||||||
|     <file alias="off.png">icons/on-icon/off.png</file> |     <file alias="off.png">icons/on-icon/off.png</file> | ||||||
|     <file alias="on-old.png">icons/on-icon/on.png</file> |     <file alias="on-old.png">icons/on-icon/on.png</file> | ||||||
|     <file alias="show-all-running.png">icons/on-icon/show-all-running.png</file> |     <file alias="show-all-running.png">icons/show-all-running.png</file> | ||||||
|     <file alias="mount.png">icons/mount.png</file> |     <file alias="mount.png">icons/mount.png</file> | ||||||
|     <file alias="log.png">icons/log.png</file> |     <file alias="log.png">icons/log.png</file> | ||||||
|     <file alias="kbd-layout.png">icons/kbd-layout.png</file> |     <file alias="kbd-layout.png">icons/kbd-layout.png</file> | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Joanna Rutkowska
						Joanna Rutkowska