This commit is contained in:
zhuzichu 2024-09-20 13:38:51 +08:00
parent 86f347edad
commit 29fe40002c
5 changed files with 17 additions and 16 deletions

View File

@ -1494,27 +1494,27 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="64"/> <location filename="qml/page/T_InfoBar.qml" line="64"/>
<location filename="qml/page/T_InfoBar.qml" line="74"/> <location filename="qml/page/T_InfoBar.qml" line="75"/>
<location filename="qml/page/T_InfoBar.qml" line="84"/> <location filename="qml/page/T_InfoBar.qml" line="85"/>
<source>close &apos;%1&apos;</source> <source>close &apos;%1&apos;</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="64"/> <location filename="qml/page/T_InfoBar.qml" line="64"/>
<location filename="qml/page/T_InfoBar.qml" line="74"/> <location filename="qml/page/T_InfoBar.qml" line="75"/>
<location filename="qml/page/T_InfoBar.qml" line="84"/> <location filename="qml/page/T_InfoBar.qml" line="85"/>
<source>show &apos;%1</source> <source>show &apos;%1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="70"/> <location filename="qml/page/T_InfoBar.qml" line="70"/>
<location filename="qml/page/T_InfoBar.qml" line="80"/> <location filename="qml/page/T_InfoBar.qml" line="81"/>
<location filename="qml/page/T_InfoBar.qml" line="90"/> <location filename="qml/page/T_InfoBar.qml" line="91"/>
<source>This is an &apos;%1&apos;</source> <source>This is an &apos;%1&apos;</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="94"/> <location filename="qml/page/T_InfoBar.qml" line="95"/>
<source>clear all info</source> <source>clear all info</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -1620,27 +1620,27 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="64"/> <location filename="qml/page/T_InfoBar.qml" line="64"/>
<location filename="qml/page/T_InfoBar.qml" line="74"/> <location filename="qml/page/T_InfoBar.qml" line="75"/>
<location filename="qml/page/T_InfoBar.qml" line="84"/> <location filename="qml/page/T_InfoBar.qml" line="85"/>
<source>close &apos;%1&apos;</source> <source>close &apos;%1&apos;</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="64"/> <location filename="qml/page/T_InfoBar.qml" line="64"/>
<location filename="qml/page/T_InfoBar.qml" line="74"/> <location filename="qml/page/T_InfoBar.qml" line="75"/>
<location filename="qml/page/T_InfoBar.qml" line="84"/> <location filename="qml/page/T_InfoBar.qml" line="85"/>
<source>show &apos;%1</source> <source>show &apos;%1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="70"/> <location filename="qml/page/T_InfoBar.qml" line="70"/>
<location filename="qml/page/T_InfoBar.qml" line="80"/> <location filename="qml/page/T_InfoBar.qml" line="81"/>
<location filename="qml/page/T_InfoBar.qml" line="90"/> <location filename="qml/page/T_InfoBar.qml" line="91"/>
<source>This is an &apos;%1&apos;</source> <source>This is an &apos;%1&apos;</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="94"/> <location filename="qml/page/T_InfoBar.qml" line="95"/>
<source>clear all info</source> <source>clear all info</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -68,6 +68,7 @@ FluScrollablePage{
return return
} }
info1 = showInfo(qsTr("This is an '%1'").arg("info1"), 0) info1 = showInfo(qsTr("This is an '%1'").arg("info1"), 0)
info1.close()
} }
} }
FluButton{ FluButton{

View File

@ -335,7 +335,7 @@ FluButton {
if (hours === "12") { if (hours === "12") {
hours24 = (period === control.amText) ? 0 : 12; hours24 = (period === control.amText) ? 0 : 12;
} else { } else {
hours24 = (period === control.pmText) ? hours24 : hours24 + 12; hours24 = (period === control.pmText) ? hours24 + 12 : hours24;
} }
} }
date.setHours(hours24); date.setHours(hours24);

View File

@ -335,7 +335,7 @@ FluButton {
if (hours === "12") { if (hours === "12") {
hours24 = (period === control.amText) ? 0 : 12; hours24 = (period === control.amText) ? 0 : 12;
} else { } else {
hours24 = (period === control.pmText) ? hours24 : hours24 + 12; hours24 = (period === control.pmText) ? hours24 + 12 : hours24;
} }
} }
date.setHours(hours24); date.setHours(hours24);