github_mirror
/
FluentUI
mirror of https://github.com/zhuzichu520/FluentUI.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bug

This commit is contained in:
ZHUZICHU\zhuzi 2025-05-28 17:35:52 +08:00
parent b4a1eaa860
commit f8b7475261
4 changed files with 55 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
example/example_en_US.ts
View File

@ -612,104 +612,104 @@
<context> <context>
<name>MainWindow</name> <name>MainWindow</name>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="86"/> <location filename="qml/window/MainWindow.qml" line="88"/>
<location filename="qml/window/MainWindow.qml" line="94"/> <location filename="qml/window/MainWindow.qml" line="96"/>
<source>Quit</source> <source>Quit</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="87"/> <location filename="qml/window/MainWindow.qml" line="89"/>
<source>Are you sure you want to exit the program?</source> <source>Are you sure you want to exit the program?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="88"/> <location filename="qml/window/MainWindow.qml" line="90"/>
<source>Minimize</source> <source>Minimize</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="91"/> <location filename="qml/window/MainWindow.qml" line="93"/>
<source>Friendly Reminder</source> <source>Friendly Reminder</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="91"/> <location filename="qml/window/MainWindow.qml" line="93"/>
<source>FluentUI is hidden from the tray, click on the tray to activate the window again</source> <source>FluentUI is hidden from the tray, click on the tray to activate the window again</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="95"/> <location filename="qml/window/MainWindow.qml" line="97"/>
<location filename="qml/window/MainWindow.qml" line="337"/> <location filename="qml/window/MainWindow.qml" line="339"/>
<source>Cancel</source> <source>Cancel</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="106"/> <location filename="qml/window/MainWindow.qml" line="108"/>
<source>Open in Separate Window</source> <source>Open in Separate Window</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="203"/> <location filename="qml/window/MainWindow.qml" line="205"/>
<source>Click Time</source> <source>Click Time</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="213"/> <location filename="qml/window/MainWindow.qml" line="215"/>
<source>Search</source> <source>Search</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="302"/> <location filename="qml/window/MainWindow.qml" line="304"/>
<source>Finish</source> <source>Finish</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="303"/> <location filename="qml/window/MainWindow.qml" line="305"/>
<source>Next</source> <source>Next</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="304"/> <location filename="qml/window/MainWindow.qml" line="306"/>
<source>Previous</source> <source>Previous</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="308"/> <location filename="qml/window/MainWindow.qml" line="310"/>
<source>Dark Mode</source> <source>Dark Mode</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="308"/> <location filename="qml/window/MainWindow.qml" line="310"/>
<source>Here you can switch to night mode.</source> <source>Here you can switch to night mode.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="310"/> <location filename="qml/window/MainWindow.qml" line="312"/>
<source>Hide Easter eggs</source> <source>Hide Easter eggs</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="310"/> <location filename="qml/window/MainWindow.qml" line="312"/>
<source>Try a few more clicks!!</source> <source>Try a few more clicks!!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="334"/> <location filename="qml/window/MainWindow.qml" line="336"/>
<source>Upgrade Tips</source> <source>Upgrade Tips</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="335"/> <location filename="qml/window/MainWindow.qml" line="337"/>
<source>FluentUI is currently up to date </source> <source>FluentUI is currently up to date </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="335"/> <location filename="qml/window/MainWindow.qml" line="337"/>
<source> -- The current app version</source> <source> -- The current app version</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="335"/> <location filename="qml/window/MainWindow.qml" line="337"/>
<source> <source>
Now go and download the new version？ Now go and download the new version？
@ -718,17 +718,17 @@ Updated content:
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="338"/> <location filename="qml/window/MainWindow.qml" line="340"/>
<source>OK</source> <source>OK</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="365"/> <location filename="qml/window/MainWindow.qml" line="367"/>
<source>The current version is already the latest</source> <source>The current version is already the latest</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="372"/> <location filename="qml/window/MainWindow.qml" line="374"/>
<source>The network is abnormal</source> <source>The network is abnormal</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2567,11 +2567,6 @@ Some contents...</source>
<source>window effect</source> <source>window effect</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location filename="qml/page/T_Theme.qml" line="178"/>
<source></source>
<translation></translation>
</message>
</context> </context>
<context> <context>
<name>T_TimePicker</name> <name>T_TimePicker</name>

55
example/example_zh_CN.ts
View File

@ -616,104 +616,104 @@
<context> <context>
<name>MainWindow</name> <name>MainWindow</name>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="308"/> <location filename="qml/window/MainWindow.qml" line="310"/>
<source>Dark Mode</source> <source>Dark Mode</source>
<translation type="unfinished">夜间模式</translation> <translation type="unfinished">夜间模式</translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="86"/> <location filename="qml/window/MainWindow.qml" line="88"/>
<location filename="qml/window/MainWindow.qml" line="94"/> <location filename="qml/window/MainWindow.qml" line="96"/>
<source>Quit</source> <source>Quit</source>
<translation type="unfinished">退出</translation> <translation type="unfinished">退出</translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="87"/> <location filename="qml/window/MainWindow.qml" line="89"/>
<source>Are you sure you want to exit the program?</source> <source>Are you sure you want to exit the program?</source>
<translation type="unfinished">您确定要退出程序吗</translation> <translation type="unfinished">您确定要退出程序吗</translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="88"/> <location filename="qml/window/MainWindow.qml" line="90"/>
<source>Minimize</source> <source>Minimize</source>
<translation type="unfinished">最小化</translation> <translation type="unfinished">最小化</translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="91"/> <location filename="qml/window/MainWindow.qml" line="93"/>
<source>Friendly Reminder</source> <source>Friendly Reminder</source>
<translation type="unfinished">友情提示</translation> <translation type="unfinished">友情提示</translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="91"/> <location filename="qml/window/MainWindow.qml" line="93"/>
<source>FluentUI is hidden from the tray, click on the tray to activate the window again</source> <source>FluentUI is hidden from the tray, click on the tray to activate the window again</source>
<translation type="unfinished">FluentUI 在托盘中处于隐藏状态，单击托盘以再次激活窗口</translation> <translation type="unfinished">FluentUI 在托盘中处于隐藏状态，单击托盘以再次激活窗口</translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="95"/> <location filename="qml/window/MainWindow.qml" line="97"/>
<location filename="qml/window/MainWindow.qml" line="337"/> <location filename="qml/window/MainWindow.qml" line="339"/>
<source>Cancel</source> <source>Cancel</source>
<translation type="unfinished">取消</translation> <translation type="unfinished">取消</translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="106"/> <location filename="qml/window/MainWindow.qml" line="108"/>
<source>Open in Separate Window</source> <source>Open in Separate Window</source>
<translation type="unfinished">在独立窗口中打开</translation> <translation type="unfinished">在独立窗口中打开</translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="203"/> <location filename="qml/window/MainWindow.qml" line="205"/>
<source>Click Time</source> <source>Click Time</source>
<translation type="unfinished">点击次数</translation> <translation type="unfinished">点击次数</translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="213"/> <location filename="qml/window/MainWindow.qml" line="215"/>
<source>Search</source> <source>Search</source>
<translation type="unfinished">搜索</translation> <translation type="unfinished">搜索</translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="302"/> <location filename="qml/window/MainWindow.qml" line="304"/>
<source>Finish</source> <source>Finish</source>
<translation type="unfinished">完成</translation> <translation type="unfinished">完成</translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="303"/> <location filename="qml/window/MainWindow.qml" line="305"/>
<source>Next</source> <source>Next</source>
<translation type="unfinished">下一步</translation> <translation type="unfinished">下一步</translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="304"/> <location filename="qml/window/MainWindow.qml" line="306"/>
<source>Previous</source> <source>Previous</source>
<translation type="unfinished">上一步</translation> <translation type="unfinished">上一步</translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="308"/> <location filename="qml/window/MainWindow.qml" line="310"/>
<source>Here you can switch to night mode.</source> <source>Here you can switch to night mode.</source>
<translation type="unfinished">在这里，您可以切换到夜间模式。</translation> <translation type="unfinished">在这里，您可以切换到夜间模式。</translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="310"/> <location filename="qml/window/MainWindow.qml" line="312"/>
<source>Hide Easter eggs</source> <source>Hide Easter eggs</source>
<translation type="unfinished">隐藏彩蛋</translation> <translation type="unfinished">隐藏彩蛋</translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="310"/> <location filename="qml/window/MainWindow.qml" line="312"/>
<source>Try a few more clicks!!</source> <source>Try a few more clicks!!</source>
<translation type="unfinished">再试几下！！</translation> <translation type="unfinished">再试几下！！</translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="334"/> <location filename="qml/window/MainWindow.qml" line="336"/>
<source>Upgrade Tips</source> <source>Upgrade Tips</source>
<translation type="unfinished">升级提示</translation> <translation type="unfinished">升级提示</translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="335"/> <location filename="qml/window/MainWindow.qml" line="337"/>
<source>FluentUI is currently up to date </source> <source>FluentUI is currently up to date </source>
<translation type="unfinished">FluentUI 目前最新版本 </translation> <translation type="unfinished">FluentUI 目前最新版本 </translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="335"/> <location filename="qml/window/MainWindow.qml" line="337"/>
<source> -- The current app version</source> <source> -- The current app version</source>
<translation type="unfinished"> -- 当前应用版本</translation> <translation type="unfinished"> -- 当前应用版本</translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="335"/> <location filename="qml/window/MainWindow.qml" line="337"/>
<source> <source>
Now go and download the new version？ Now go and download the new version？
@ -726,17 +726,17 @@ Updated content:
</translation> </translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="338"/> <location filename="qml/window/MainWindow.qml" line="340"/>
<source>OK</source> <source>OK</source>
<translation type="unfinished">确定</translation> <translation type="unfinished">确定</translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="365"/> <location filename="qml/window/MainWindow.qml" line="367"/>
<source>The current version is already the latest</source> <source>The current version is already the latest</source>
<translation type="unfinished">当前版本已经是最新版本</translation> <translation type="unfinished">当前版本已经是最新版本</translation>
</message> </message>
<message> <message>
<location filename="qml/window/MainWindow.qml" line="372"/> <location filename="qml/window/MainWindow.qml" line="374"/>
<source>The network is abnormal</source> <source>The network is abnormal</source>
<translation type="unfinished">网络异常</translation> <translation type="unfinished">网络异常</translation>
</message> </message>
@ -2756,11 +2756,6 @@ Some contents...</source>
<source>window effect</source> <source>window effect</source>
<translation>窗口效果</translation> <translation>窗口效果</translation>
</message> </message>
<message>
<location filename="qml/page/T_Theme.qml" line="178"/>
<source></source>
<translation></translation>
</message>
</context> </context>
<context> <context>
<name>T_TimePicker</name> <name>T_TimePicker</name>

2
example/qml/window/MainWindow.qml
View File

@ -69,6 +69,8 @@ FluWindow {
window.show() window.show()
window.raise() window.raise()
window.requestActivate() window.requestActivate()
}else if(reason === SystemTrayIcon.Context){
system_tray.menu.open()
} }
} }
} }

3
src/FluFrameless.cpp
View File

@ -441,6 +441,9 @@ void FluFrameless::componentComplete() {
window()->setFlag(Qt::CustomizeWindowHint, true); window()->setFlag(Qt::CustomizeWindowHint, true);
window()->setFlag(Qt::FramelessWindowHint, true); window()->setFlag(Qt::FramelessWindowHint, true);
window()->setProperty("__borderWidth", 1); window()->setProperty("__borderWidth", 1);
#endif
#ifdef Q_OS_WIN
window()->setFlag(Qt::CustomizeWindowHint, true);
#endif #endif
window()->installEventFilter(this); window()->installEventFilter(this);
QGuiApplication::instance()->installNativeEventFilter(this); QGuiApplication::instance()->installNativeEventFilter(this);