| 
						
						
							
								
							
						
						
					 | 
					 | 
					@ -74,9 +74,11 @@ void Sidebar::updateState(const UIState &s) { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					  auto &sm = *(s.sm); | 
					 | 
					 | 
					 | 
					  auto &sm = *(s.sm); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					  networking = networking ? networking : window()->findChild<Networking *>(""); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					  bool tethering_on = networking && networking->wifi->tethering_on; | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					  auto deviceState = sm["deviceState"].getDeviceState(); | 
					 | 
					 | 
					 | 
					  auto deviceState = sm["deviceState"].getDeviceState(); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					  setProperty("netType", network_type[deviceState.getNetworkType()]); | 
					 | 
					 | 
					 | 
					  setProperty("netType", tethering_on ? "Hotspot": network_type[deviceState.getNetworkType()]); | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					  int strength = (int)deviceState.getNetworkStrength(); | 
					 | 
					 | 
					 | 
					  int strength = tethering_on ? 4 : (int)deviceState.getNetworkStrength(); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					  setProperty("netStrength", strength > 0 ? strength + 1 : 0); | 
					 | 
					 | 
					 | 
					  setProperty("netStrength", strength > 0 ? strength + 1 : 0); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					  ItemStatus connectStatus; | 
					 | 
					 | 
					 | 
					  ItemStatus connectStatus; | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					 | 
					@ -131,8 +133,8 @@ void Sidebar::paintEvent(QPaintEvent *event) { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					  p.setFont(InterFont(35)); | 
					 | 
					 | 
					 | 
					  p.setFont(InterFont(35)); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					  p.setPen(QColor(0xff, 0xff, 0xff)); | 
					 | 
					 | 
					 | 
					  p.setPen(QColor(0xff, 0xff, 0xff)); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					  const QRect r = QRect(50, 247, 100, 50); | 
					 | 
					 | 
					 | 
					  const QRect r = QRect(58, 247, width() - 100, 50); | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					  p.drawText(r, Qt::AlignCenter, net_type); | 
					 | 
					 | 
					 | 
					  p.drawText(r, Qt::AlignLeft | Qt::AlignVCenter, net_type); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					  // metrics
 | 
					 | 
					 | 
					 | 
					  // metrics
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					  drawMetric(p, temp_status.first, temp_status.second, 338); | 
					 | 
					 | 
					 | 
					  drawMetric(p, temp_status.first, temp_status.second, 338); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					 | 
					
  |