Compare commits

...

4 Commits

Author SHA1 Message Date
zhuzichu
e771293269 update workflows 2024-09-20 13:51:50 +08:00
zhuzichu
4420c6c608 update 2024-09-20 13:46:57 +08:00
zhuzichu
a3b4c6cb28 Merge branch 'main' of https://github.com/zhuzichu520/FluentUI 2024-09-20 13:41:56 +08:00
zhuzichu
29fe40002c update 2024-09-20 13:38:51 +08:00
11 changed files with 22 additions and 26 deletions

View File

@ -60,7 +60,7 @@ jobs:
# 拷贝依赖 # 拷贝依赖
sudo macdeployqt bin/Release/${targetName}.app -qmldir=. -dmg sudo macdeployqt bin/Release/${targetName}.app -qmldir=. -dmg
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v4
with: with:
name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}} name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}
path: bin/release/${{ env.targetName }}.app path: bin/release/${{ env.targetName }}.app

View File

@ -77,7 +77,7 @@ jobs:
linuxdeploy-x86_64.AppImage --plugin=qt --output=appimage --create-desktop-file --icon-file=${targetName}.svg --executable=bin/Release/${targetName} --appdir bin/release/ linuxdeploy-x86_64.AppImage --plugin=qt --output=appimage --create-desktop-file --icon-file=${targetName}.svg --executable=bin/Release/${targetName} --appdir bin/release/
mv ${{ env.targetName }}-*.AppImage ${{ env.targetName }}.AppImage mv ${{ env.targetName }}-*.AppImage ${{ env.targetName }}.AppImage
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v4
with: with:
name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}} name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}
path: ${{ env.targetName }}.AppImage path: ${{ env.targetName }}.AppImage

View File

@ -82,7 +82,7 @@ jobs:
$name = ${env:archiveName} $name = ${env:archiveName}
echo "::set-output name=packageName::$name" echo "::set-output name=packageName::$name"
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v4
with: with:
name: ${{ steps.package.outputs.packageName }} name: ${{ steps.package.outputs.packageName }}
path: dist path: dist

View File

@ -69,7 +69,7 @@ jobs:
$name = ${env:archiveName} $name = ${env:archiveName}
echo "::set-output name=packageName::$name" echo "::set-output name=packageName::$name"
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v4
with: with:
name: ${{ steps.package.outputs.packageName }} name: ${{ steps.package.outputs.packageName }}
path: dist path: dist

View File

@ -76,7 +76,7 @@ jobs:
$name = ${env:archiveName} $name = ${env:archiveName}
echo "::set-output name=packageName::$name" echo "::set-output name=packageName::$name"
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v4
with: with:
name: ${{ steps.package.outputs.packageName }} name: ${{ steps.package.outputs.packageName }}
path: dist path: dist

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

@ -72,11 +72,6 @@ install(TARGETS ${PROJECT_NAME}
BUNDLE DESTINATION . BUNDLE DESTINATION .
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
if(QT_VERSION_MAJOR EQUAL 6)
qt_import_qml_plugins(${PROJECT_NAME})
qt_finalize_executable(${PROJECT_NAME})
endif()
if (CMAKE_BUILD_TYPE MATCHES "Release") if (CMAKE_BUILD_TYPE MATCHES "Release")
if (APPLE) if (APPLE)
find_program(QT_DEPLOY_QT NAMES macdeployqt) find_program(QT_DEPLOY_QT NAMES macdeployqt)

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);