sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Fix confirm dialog when message has "\n".

Browse Source
This commit is contained in:
sunwen
2024-09-23 15:38:17 +08:00
parent e8f3e7aaed
commit 6766f46aa6
2 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/log/UserOperationLog.cpp
View File

@@ -68,7 +68,8 @@ void UserOperationLog::log(const QString& aOperationText)
QDateTime now = QDateTime::currentDateTime(); QDateTime now = QDateTime::currentDateTime();
AppGlobalValues::setLastOperationTime(now); AppGlobalValues::setLastOperationTime(now);
QString UserName = (!User::Current() || User::Current()->getUserCode().isEmpty())?"anonymous":User::Current()->getUserCode(); QString UserName = (!User::Current() || User::Current()->getUserCode().isEmpty())?"anonymous":User::Current()->getUserCode();
out << now.toString(Qt::DateFormat::ISODateWithMs).replace("T","\t")<<"\t"<<UserName<<"\t"<<aOperationText<<endl; QString operationText = aOperationText;
out << now.toString(Qt::DateFormat::ISODateWithMs).replace("T","\t")<<"\t"<<UserName<<"\t"<<operationText.replace("\n","\\n")<<endl;
} }
void UserOperationLog::reloadFile() { void UserOperationLog::reloadFile() {

73
src/translations/zh_CN.ts
View File

@@ -468,149 +468,148 @@
<context> <context>
<name>DeviceManager</name> <name>DeviceManager</name>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="169"/> <location filename="../device/DeviceManager.cpp" line="170"/>
<location filename="../device/DeviceManager.cpp" line="837"/> <location filename="../device/DeviceManager.cpp" line="835"/>
<location filename="../device/DeviceManager.cpp" line="845"/> <location filename="../device/DeviceManager.cpp" line="843"/>
<location filename="../device/DeviceManager.cpp" line="1464"/> <location filename="../device/DeviceManager.cpp" line="1463"/>
<source>DMS connection error</source> <source>DMS connection error</source>
<translation type="unfinished">DMS失去连接</translation> <translation type="unfinished">DMS失去连接</translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="368"/> <location filename="../device/DeviceManager.cpp" line="366"/>
<location filename="../device/DeviceManager.cpp" line="377"/> <location filename="../device/DeviceManager.cpp" line="375"/>
<source>progress:%1%</source> <source>progress:%1%</source>
<translation type="unfinished">进度:%1%</translation> <translation type="unfinished">进度:%1%</translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="382"/> <location filename="../device/DeviceManager.cpp" line="380"/>
<source>Patient can leave. <source>Patient can leave.
progress:%1%</source> progress:%1%</source>
<translation type="unfinished">检查对象可以起身 <translation type="unfinished">检查对象可以起身
进度:%1%</translation> 进度:%1%</translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="389"/> <location filename="../device/DeviceManager.cpp" line="387"/>
<source>Data quality assessment in progress <source>Data quality assessment in progress
progress:99%</source> progress:99%</source>
<translation type="unfinished">数据质量判断中 <translation type="unfinished">数据质量判断中
进度:99%</translation> 进度:99%</translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="258"/> <location filename="../device/DeviceManager.cpp" line="259"/>
<location filename="../device/DeviceManager.cpp" line="898"/> <location filename="../device/DeviceManager.cpp" line="896"/>
<location filename="../device/DeviceManager.cpp" line="906"/> <location filename="../device/DeviceManager.cpp" line="904"/>
<source>Initialize Failed.</source> <source>Initialize Failed.</source>
<translation type="unfinished">初始化失败</translation> <translation type="unfinished">初始化失败</translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="229"/> <location filename="../device/DeviceManager.cpp" line="230"/>
<source>Fail to connect to DB!Reboot device to try!</source> <source>Fail to connect to DB!Reboot device to try!</source>
<translation type="unfinished">数据库连接失败，请重启设备后再试!</translation> <translation type="unfinished">数据库连接失败，请重启设备后再试!</translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="324"/> <location filename="../device/DeviceManager.cpp" line="325"/>
<source>Device is not ready, start scan operation failed!</source> <source>Device is not ready, start scan operation failed!</source>
<translation type="unfinished">设备状态错误，无法开始检查流程</translation> <translation type="unfinished">设备状态错误，无法开始检查流程</translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="324"/> <location filename="../device/DeviceManager.cpp" line="325"/>
<source>Device is not ready, start empty scan operation failed!</source> <source>Device is not ready, start empty scan operation failed!</source>
<translation type="unfinished">设备状态错误，无法开始空水扫查</translation> <translation type="unfinished">设备状态错误，无法开始空水扫查</translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="443"/> <location filename="../device/DeviceManager.cpp" line="441"/>
<source>Scan completed! Please prepare for the next scan. <source>Scan completed! Please prepare for the next scan.
After lying down, click the confirm buttonto start scanning on the next side.</source> After lying down, click the confirm buttonto start scanning on the next side.</source>
<translation type="unfinished">扫查结束，请准备下一侧扫查。 <translation type="unfinished">扫查结束，请准备下一侧扫查。
请在趴好后再点击确认按钮!</translation> 请在趴好后再点击确认按钮!</translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="444"/> <location filename="../device/DeviceManager.cpp" line="442"/>
<source>Scan completed!</source> <source>Scan completed!</source>
<translation type="unfinished">扫查结束</translation> <translation type="unfinished">扫查结束</translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="788"/> <location filename="../device/DeviceManager.cpp" line="786"/>
<source>Error: </source> <source>Error: </source>
<translation type="unfinished">错误: </translation> <translation type="unfinished">错误: </translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="872"/> <location filename="../device/DeviceManager.cpp" line="870"/>
<source>Start scan failed. Reason:time out.</source> <source>Start scan failed. Reason:time out.</source>
<translation type="unfinished">扫查启动失败，原因：超时</translation> <translation type="unfinished">扫查启动失败，原因：超时</translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="883"/> <location filename="../device/DeviceManager.cpp" line="881"/>
<source>Start scan failed. Reason:%1</source> <source>Start scan failed. Reason:%1</source>
<translation type="unfinished">扫查启动失败，原因：%1</translation> <translation type="unfinished">扫查启动失败，原因：%1</translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="908"/> <location filename="../device/DeviceManager.cpp" line="906"/>
<source>Start CE Scan Failed.</source> <source>Start CE Scan Failed.</source>
<translation type="unfinished">CE扫查启动失败</translation> <translation type="unfinished">CE扫查启动失败</translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="940"/> <location filename="../device/DeviceManager.cpp" line="938"/>
<source>Data is currently being transmitted, please shut down later.</source> <source>Data is currently being transmitted, please shut down later.</source>
<translation type="unfinished">数据传输中，请稍后再执行关机。</translation> <translation type="unfinished">数据传输中，请稍后再执行关机。</translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="947"/> <location filename="../device/DeviceManager.cpp" line="945"/>
<source>Shut down failed, please push emergency button to shutdown.</source> <source>Shut down failed, please push emergency button to shutdown.</source>
<translation type="unfinished">关机失败，请按紧急按钮进行关机。</translation> <translation type="unfinished">关机失败，请按紧急按钮进行关机。</translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="1038"/> <location filename="../device/DeviceManager.cpp" line="1037"/>
<location filename="../device/DeviceManager.cpp" line="1048"/> <location filename="../device/DeviceManager.cpp" line="1047"/>
<location filename="../device/DeviceManager.cpp" line="1124"/> <location filename="../device/DeviceManager.cpp" line="1123"/>
<source>Scan data transfer failed.</source> <source>Scan data transfer failed.</source>
<translation type="unfinished">扫查数据上传失败</translation> <translation type="unfinished">扫查数据上传失败</translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="1102"/> <location filename="../device/DeviceManager.cpp" line="1101"/>
<source>Scan data transfer Succeeded!</source> <source>Scan data transfer Succeeded!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="1146"/> <location filename="../device/DeviceManager.cpp" line="1145"/>
<source>Create empty scan data failed</source> <source>Create empty scan data failed</source>
<translation type="unfinished">空水数据新增失败</translation> <translation type="unfinished">空水数据新增失败</translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="1169"/> <location filename="../device/DeviceManager.cpp" line="1168"/>
<source>Create scan data failed</source> <source>Create scan data failed</source>
<translation type="unfinished">扫查数据新增失败</translation> <translation type="unfinished">扫查数据新增失败</translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="1236"/> <location filename="../device/DeviceManager.cpp" line="1235"/>
<source>Recon disconnected.</source> <source>Recon disconnected.</source>
<translation type="unfinished">重建服务器已断开连接</translation> <translation type="unfinished">重建服务器已断开连接</translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="1313"/> <location filename="../device/DeviceManager.cpp" line="1312"/>
<location filename="../device/DeviceManager.cpp" line="1328"/> <location filename="../device/DeviceManager.cpp" line="1327"/>
<source>Open pump failed.</source> <source>Open pump failed.</source>
<translation type="unfinished">排水阀打开失败</translation> <translation type="unfinished">排水阀打开失败</translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="1345"/> <location filename="../device/DeviceManager.cpp" line="1344"/>
<source>Recon error, can&apos;t start scan process</source> <source>Recon error, can&apos;t start scan process</source>
<translation type="unfinished">重建服务器错误，无法开始检查流程</translation> <translation type="unfinished">重建服务器错误，无法开始检查流程</translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="1386"/> <location filename="../device/DeviceManager.cpp" line="1385"/>
<location filename="../device/DeviceManager.cpp" line="1438"/> <location filename="../device/DeviceManager.cpp" line="1437"/>
<source>Start auto locate failed</source> <source>Start auto locate failed</source>
<translation type="unfinished">自动化定位启动失败</translation> <translation type="unfinished">自动化定位启动失败</translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="1458"/> <location filename="../device/DeviceManager.cpp" line="1457"/>
<source>The data quality is low, please restart the data scan.</source> <source>The data quality is low, please restart the data scan.</source>
<translation type="unfinished">扫查数据质量较低，请重新开始检查流程</translation> <translation type="unfinished">扫查数据质量较低，请重新开始检查流程</translation>
</message> </message>
<message> <message>
<location filename="../device/DeviceManager.cpp" line="1486"/> <location filename="../device/DeviceManager.cpp" line="1485"/>
<source>Device reset failed, please contact maintenance person</source> <source>Device reset failed, please contact maintenance person</source>
<translation type="unfinished">设备复位失败，请联系维修人员</translation> <translation type="unfinished">设备复位失败，请联系维修人员</translation>
</message> </message>