| 
					
				 | 
			
			
				@@ -916,6 +916,24 @@ BOOL CPropertiesWnd::PreTranslateMessage(MSG* pMsg) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			MessageBox(Global::g_bLearn ? _T("开启学习红外") : _T("关闭红外学习"), _T("提示"), MB_OK); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			return TRUE; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		else if ( pMsg->wParam == VK_F2 ) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			// 查找目录文件; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			filehelper fh; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			std::vector<std::string> vtSignals; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			fh.getfiles_findout_subfolder(Global::g_Config.twOldSignaldir.c_str(), _T("*.xml"), &vtSignals); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			// 逐个文件转换; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			for ( std::vector<std::string>::iterator it = vtSignals.begin(); it != vtSignals.end(); it++ ) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				std::string newfile = Global::g_Config.twSignaldir + _T("\\") + filehelper::getfilename(it->c_str()) + _T(".xml"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				ConvertOldSignalsToNew(*it, newfile); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			MessageBox(_T("Convert old signals ok!"), _T("Convert"), MB_OK); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			LoadSignals(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			return TRUE; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	} 
			 |