Skip to content

Commit f8b7475

Browse files
zhuzichu520zhuzichu520
committed
fix bug
1 parent b4a1eaa commit f8b7475

File tree

4 files changed

+55
-60
lines changed

4 files changed

+55
-60
lines changed

‎example/example_en_US.ts‎

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -612,104 +612,104 @@
612612
<context>
613613
<name>MainWindow</name>
614614
<message>
615-
<location filename="qml/window/MainWindow.qml" line="86"/>
616-
<location filename="qml/window/MainWindow.qml" line="94"/>
615+
<location filename="qml/window/MainWindow.qml" line="88"/>
616+
<location filename="qml/window/MainWindow.qml" line="96"/>
617617
<source>Quit</source>
618618
<translation type="unfinished"></translation>
619619
</message>
620620
<message>
621-
<location filename="qml/window/MainWindow.qml" line="87"/>
621+
<location filename="qml/window/MainWindow.qml" line="89"/>
622622
<source>Are you sure you want to exit the program?</source>
623623
<translation type="unfinished"></translation>
624624
</message>
625625
<message>
626-
<location filename="qml/window/MainWindow.qml" line="88"/>
626+
<location filename="qml/window/MainWindow.qml" line="90"/>
627627
<source>Minimize</source>
628628
<translation type="unfinished"></translation>
629629
</message>
630630
<message>
631-
<location filename="qml/window/MainWindow.qml" line="91"/>
631+
<location filename="qml/window/MainWindow.qml" line="93"/>
632632
<source>Friendly Reminder</source>
633633
<translation type="unfinished"></translation>
634634
</message>
635635
<message>
636-
<location filename="qml/window/MainWindow.qml" line="91"/>
636+
<location filename="qml/window/MainWindow.qml" line="93"/>
637637
<source>FluentUI is hidden from the tray, click on the tray to activate the window again</source>
638638
<translation type="unfinished"></translation>
639639
</message>
640640
<message>
641-
<location filename="qml/window/MainWindow.qml" line="95"/>
642-
<location filename="qml/window/MainWindow.qml" line="337"/>
641+
<location filename="qml/window/MainWindow.qml" line="97"/>
642+
<location filename="qml/window/MainWindow.qml" line="339"/>
643643
<source>Cancel</source>
644644
<translation type="unfinished"></translation>
645645
</message>
646646
<message>
647-
<location filename="qml/window/MainWindow.qml" line="106"/>
647+
<location filename="qml/window/MainWindow.qml" line="108"/>
648648
<source>Open in Separate Window</source>
649649
<translation type="unfinished"></translation>
650650
</message>
651651
<message>
652-
<location filename="qml/window/MainWindow.qml" line="203"/>
652+
<location filename="qml/window/MainWindow.qml" line="205"/>
653653
<source>Click Time</source>
654654
<translation type="unfinished"></translation>
655655
</message>
656656
<message>
657-
<location filename="qml/window/MainWindow.qml" line="213"/>
657+
<location filename="qml/window/MainWindow.qml" line="215"/>
658658
<source>Search</source>
659659
<translation type="unfinished"></translation>
660660
</message>
661661
<message>
662-
<location filename="qml/window/MainWindow.qml" line="302"/>
662+
<location filename="qml/window/MainWindow.qml" line="304"/>
663663
<source>Finish</source>
664664
<translation type="unfinished"></translation>
665665
</message>
666666
<message>
667-
<location filename="qml/window/MainWindow.qml" line="303"/>
667+
<location filename="qml/window/MainWindow.qml" line="305"/>
668668
<source>Next</source>
669669
<translation type="unfinished"></translation>
670670
</message>
671671
<message>
672-
<location filename="qml/window/MainWindow.qml" line="304"/>
672+
<location filename="qml/window/MainWindow.qml" line="306"/>
673673
<source>Previous</source>
674674
<translation type="unfinished"></translation>
675675
</message>
676676
<message>
677-
<location filename="qml/window/MainWindow.qml" line="308"/>
677+
<location filename="qml/window/MainWindow.qml" line="310"/>
678678
<source>Dark Mode</source>
679679
<translation type="unfinished"></translation>
680680
</message>
681681
<message>
682-
<location filename="qml/window/MainWindow.qml" line="308"/>
682+
<location filename="qml/window/MainWindow.qml" line="310"/>
683683
<source>Here you can switch to night mode.</source>
684684
<translation type="unfinished"></translation>
685685
</message>
686686
<message>
687-
<location filename="qml/window/MainWindow.qml" line="310"/>
687+
<location filename="qml/window/MainWindow.qml" line="312"/>
688688
<source>Hide Easter eggs</source>
689689
<translation type="unfinished"></translation>
690690
</message>
691691
<message>
692-
<location filename="qml/window/MainWindow.qml" line="310"/>
692+
<location filename="qml/window/MainWindow.qml" line="312"/>
693693
<source>Try a few more clicks!!</source>
694694
<translation type="unfinished"></translation>
695695
</message>
696696
<message>
697-
<location filename="qml/window/MainWindow.qml" line="334"/>
697+
<location filename="qml/window/MainWindow.qml" line="336"/>
698698
<source>Upgrade Tips</source>
699699
<translation type="unfinished"></translation>
700700
</message>
701701
<message>
702-
<location filename="qml/window/MainWindow.qml" line="335"/>
702+
<location filename="qml/window/MainWindow.qml" line="337"/>
703703
<source>FluentUI is currently up to date </source>
704704
<translation type="unfinished"></translation>
705705
</message>
706706
<message>
707-
<location filename="qml/window/MainWindow.qml" line="335"/>
707+
<location filename="qml/window/MainWindow.qml" line="337"/>
708708
<source> -- The current app version</source>
709709
<translation type="unfinished"></translation>
710710
</message>
711711
<message>
712-
<location filename="qml/window/MainWindow.qml" line="335"/>
712+
<location filename="qml/window/MainWindow.qml" line="337"/>
713713
<source>
714714
Now go and download the new version？
715715

@@ -718,17 +718,17 @@ Updated content:
718718
<translation type="unfinished"></translation>
719719
</message>
720720
<message>
721-
<location filename="qml/window/MainWindow.qml" line="338"/>
721+
<location filename="qml/window/MainWindow.qml" line="340"/>
722722
<source>OK</source>
723723
<translation type="unfinished"></translation>
724724
</message>
725725
<message>
726-
<location filename="qml/window/MainWindow.qml" line="365"/>
726+
<location filename="qml/window/MainWindow.qml" line="367"/>
727727
<source>The current version is already the latest</source>
728728
<translation type="unfinished"></translation>
729729
</message>
730730
<message>
731-
<location filename="qml/window/MainWindow.qml" line="372"/>
731+
<location filename="qml/window/MainWindow.qml" line="374"/>
732732
<source>The network is abnormal</source>
733733
<translation type="unfinished"></translation>
734734
</message>
@@ -2567,11 +2567,6 @@ Some contents...</source>
25672567
<source>window effect</source>
25682568
<translation type="unfinished"></translation>
25692569
</message>
2570-
<message>
2571-
<location filename="qml/page/T_Theme.qml" line="178"/>
2572-
<source></source>
2573-
<translation></translation>
2574-
</message>
25752570
</context>
25762571
<context>
25772572
<name>T_TimePicker</name>

‎example/example_zh_CN.ts‎

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -616,104 +616,104 @@
616616
<context>
617617
<name>MainWindow</name>
618618
<message>
619-
<location filename="qml/window/MainWindow.qml" line="308"/>
619+
<location filename="qml/window/MainWindow.qml" line="310"/>
620620
<source>Dark Mode</source>
621621
<translation type="unfinished">夜间模式</translation>
622622
</message>
623623
<message>
624-
<location filename="qml/window/MainWindow.qml" line="86"/>
625-
<location filename="qml/window/MainWindow.qml" line="94"/>
624+
<location filename="qml/window/MainWindow.qml" line="88"/>
625+
<location filename="qml/window/MainWindow.qml" line="96"/>
626626
<source>Quit</source>
627627
<translation type="unfinished">退出</translation>
628628
</message>
629629
<message>
630-
<location filename="qml/window/MainWindow.qml" line="87"/>
630+
<location filename="qml/window/MainWindow.qml" line="89"/>
631631
<source>Are you sure you want to exit the program?</source>
632632
<translation type="unfinished">您确定要退出程序吗</translation>
633633
</message>
634634
<message>
635-
<location filename="qml/window/MainWindow.qml" line="88"/>
635+
<location filename="qml/window/MainWindow.qml" line="90"/>
636636
<source>Minimize</source>
637637
<translation type="unfinished">最小化</translation>
638638
</message>
639639
<message>
640-
<location filename="qml/window/MainWindow.qml" line="91"/>
640+
<location filename="qml/window/MainWindow.qml" line="93"/>
641641
<source>Friendly Reminder</source>
642642
<translation type="unfinished">友情提示</translation>
643643
</message>
644644
<message>
645-
<location filename="qml/window/MainWindow.qml" line="91"/>
645+
<location filename="qml/window/MainWindow.qml" line="93"/>
646646
<source>FluentUI is hidden from the tray, click on the tray to activate the window again</source>
647647
<translation type="unfinished">FluentUI 在托盘中处于隐藏状态，单击托盘以再次激活窗口</translation>
648648
</message>
649649
<message>
650-
<location filename="qml/window/MainWindow.qml" line="95"/>
651-
<location filename="qml/window/MainWindow.qml" line="337"/>
650+
<location filename="qml/window/MainWindow.qml" line="97"/>
651+
<location filename="qml/window/MainWindow.qml" line="339"/>
652652
<source>Cancel</source>
653653
<translation type="unfinished">取消</translation>
654654
</message>
655655
<message>
656-
<location filename="qml/window/MainWindow.qml" line="106"/>
656+
<location filename="qml/window/MainWindow.qml" line="108"/>
657657
<source>Open in Separate Window</source>
658658
<translation type="unfinished">在独立窗口中打开</translation>
659659
</message>
660660
<message>
661-
<location filename="qml/window/MainWindow.qml" line="203"/>
661+
<location filename="qml/window/MainWindow.qml" line="205"/>
662662
<source>Click Time</source>
663663
<translation type="unfinished">点击次数</translation>
664664
</message>
665665
<message>
666-
<location filename="qml/window/MainWindow.qml" line="213"/>
666+
<location filename="qml/window/MainWindow.qml" line="215"/>
667667
<source>Search</source>
668668
<translation type="unfinished">搜索</translation>
669669
</message>
670670
<message>
671-
<location filename="qml/window/MainWindow.qml" line="302"/>
671+
<location filename="qml/window/MainWindow.qml" line="304"/>
672672
<source>Finish</source>
673673
<translation type="unfinished">完成</translation>
674674
</message>
675675
<message>
676-
<location filename="qml/window/MainWindow.qml" line="303"/>
676+
<location filename="qml/window/MainWindow.qml" line="305"/>
677677
<source>Next</source>
678678
<translation type="unfinished">下一步</translation>
679679
</message>
680680
<message>
681-
<location filename="qml/window/MainWindow.qml" line="304"/>
681+
<location filename="qml/window/MainWindow.qml" line="306"/>
682682
<source>Previous</source>
683683
<translation type="unfinished">上一步</translation>
684684
</message>
685685
<message>
686-
<location filename="qml/window/MainWindow.qml" line="308"/>
686+
<location filename="qml/window/MainWindow.qml" line="310"/>
687687
<source>Here you can switch to night mode.</source>
688688
<translation type="unfinished">在这里，您可以切换到夜间模式。</translation>
689689
</message>
690690
<message>
691-
<location filename="qml/window/MainWindow.qml" line="310"/>
691+
<location filename="qml/window/MainWindow.qml" line="312"/>
692692
<source>Hide Easter eggs</source>
693693
<translation type="unfinished">隐藏彩蛋</translation>
694694
</message>
695695
<message>
696-
<location filename="qml/window/MainWindow.qml" line="310"/>
696+
<location filename="qml/window/MainWindow.qml" line="312"/>
697697
<source>Try a few more clicks!!</source>
698698
<translation type="unfinished">再试几下！！</translation>
699699
</message>
700700
<message>
701-
<location filename="qml/window/MainWindow.qml" line="334"/>
701+
<location filename="qml/window/MainWindow.qml" line="336"/>
702702
<source>Upgrade Tips</source>
703703
<translation type="unfinished">升级提示</translation>
704704
</message>
705705
<message>
706-
<location filename="qml/window/MainWindow.qml" line="335"/>
706+
<location filename="qml/window/MainWindow.qml" line="337"/>
707707
<source>FluentUI is currently up to date </source>
708708
<translation type="unfinished">FluentUI 目前最新版本 </translation>
709709
</message>
710710
<message>
711-
<location filename="qml/window/MainWindow.qml" line="335"/>
711+
<location filename="qml/window/MainWindow.qml" line="337"/>
712712
<source> -- The current app version</source>
713713
<translation type="unfinished"> -- 当前应用版本</translation>
714714
</message>
715715
<message>
716-
<location filename="qml/window/MainWindow.qml" line="335"/>
716+
<location filename="qml/window/MainWindow.qml" line="337"/>
717717
<source>
718718
Now go and download the new version？
719719

@@ -726,17 +726,17 @@ Updated content:
726726
</translation>
727727
</message>
728728
<message>
729-
<location filename="qml/window/MainWindow.qml" line="338"/>
729+
<location filename="qml/window/MainWindow.qml" line="340"/>
730730
<source>OK</source>
731731
<translation type="unfinished">确定</translation>
732732
</message>
733733
<message>
734-
<location filename="qml/window/MainWindow.qml" line="365"/>
734+
<location filename="qml/window/MainWindow.qml" line="367"/>
735735
<source>The current version is already the latest</source>
736736
<translation type="unfinished">当前版本已经是最新版本</translation>
737737
</message>
738738
<message>
739-
<location filename="qml/window/MainWindow.qml" line="372"/>
739+
<location filename="qml/window/MainWindow.qml" line="374"/>
740740
<source>The network is abnormal</source>
741741
<translation type="unfinished">网络异常</translation>
742742
</message>
@@ -2756,11 +2756,6 @@ Some contents...</source>
27562756
<source>window effect</source>
27572757
<translation>窗口效果</translation>
27582758
</message>
2759-
<message>
2760-
<location filename="qml/page/T_Theme.qml" line="178"/>
2761-
<source></source>
2762-
<translation></translation>
2763-
</message>
27642759
</context>
27652760
<context>
27662761
<name>T_TimePicker</name>

‎example/qml/window/MainWindow.qml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ FluWindow {
6969
window.show()
7070
window.raise()
7171
window.requestActivate()
72+
}else if(reason === SystemTrayIcon.Context){
73+
system_tray.menu.open()
7274
}
7375
}
7476
}

‎src/FluFrameless.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,9 @@ void FluFrameless::componentComplete() {
441441
window()->setFlag(Qt::CustomizeWindowHint, true);
442442
window()->setFlag(Qt::FramelessWindowHint, true);
443443
window()->setProperty("__borderWidth", 1);
444+
#endif
445+
#ifdef Q_OS_WIN
446+
window()->setFlag(Qt::CustomizeWindowHint, true);
444447
#endif
445448
window()->installEventFilter(this);
446449
QGuiApplication::instance()->installNativeEventFilter(this);

0 commit comments

Comments
 (0)