mirror of
				https://github.com/SoftFever/OrcaSlicer.git
				synced 2025-10-31 04:31:15 -06:00 
			
		
		
		
	FIX: [STUDIO-3439] show/hide calibration page
Change-Id: I3b083b47609c40e084cf3058eda2a84c03447760
This commit is contained in:
		
							parent
							
								
									ecfffca12d
								
							
						
					
					
						commit
						29b61a1da0
					
				
					 2 changed files with 17 additions and 6 deletions
				
			
		|  | @ -872,12 +872,23 @@ void MainFrame::show_calibration_button(bool show) | |||
| { | ||||
| #ifdef __APPLE__ | ||||
|     bool shown = m_menubar->FindMenu(_L("Calibration")) != wxNOT_FOUND; | ||||
|     if (shown == show) return; | ||||
|     if (show) m_menubar->Insert(3, m_calib_menu, wxString::Format("&%s", _L("Calibration"))); | ||||
|     else m_menubar->Remove(3); | ||||
|     if (shown == show) | ||||
|         ; | ||||
|     else if (show) | ||||
|         m_menubar->Insert(3, m_calib_menu, wxString::Format("&%s", _L("Calibration"))); | ||||
|     else | ||||
|         m_menubar->Remove(3); | ||||
| #else | ||||
|     topbar()->ShowCalibrationButton(show); | ||||
| #endif | ||||
|     show = !show; | ||||
|     auto shown2 = m_tabpanel->FindPage(m_calibration) != wxNOT_FOUND; | ||||
|     if (shown2 == show) | ||||
|         ; | ||||
|     else if (show) | ||||
|         m_tabpanel->InsertPage(tpCalibration, m_calibration, _L("Calibration"), std::string("tab_monitor_active"), std::string("tab_monitor_active")); | ||||
|     else | ||||
|         m_tabpanel->RemovePage(tpCalibration); | ||||
| } | ||||
| 
 | ||||
| void MainFrame::update_title_colour_after_set_title() | ||||
|  |  | |||
|  | @ -223,9 +223,9 @@ public: | |||
|         tpPreview = 2, | ||||
|         tpMonitor = 3, | ||||
|         tpProject = 4, | ||||
|         tpAuxiliary = 5, | ||||
|         tpCalibration = 6, | ||||
|         toDebugTool = 7, | ||||
|         tpCalibration = 5, | ||||
|         toAuxiliary   = 6, | ||||
|         toDebugTool   = 7, | ||||
|     }; | ||||
| 
 | ||||
|     //BBS: add slice&&print status update logic
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 chunmao.guo
						chunmao.guo