Skip to content

Commit 7d938c6

Browse files
authored
Merge pull request #145 from runhey/master
Merge master to def-flutter branch
2 parents 84fdbac + 75bbb89 commit 7d938c6

28 files changed

+123
-83
lines changed

module/gui/qml.qrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,6 @@
3535
<file>qml/Component/RuleFile2.qml</file>
3636
<file>qml/Content/NotifyTest.qml</file>
3737
<file>qml/Content/TaskList.qml</file>
38+
<file>qml/Component/Notity.qml</file>
3839
</qresource>
3940
</RCC>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import QtQuick
2+
import QtQuick.Layouts
3+
import QtQuick.Window
4+
import QtQuick.Controls
5+
import FluentUI
6+
7+
FluContentDialog{
8+
title:"全新GUI"
9+
message:"我们打算在2024.1.1全面切换新到GUI: OASX"
10+
negativeText:"了解"
11+
positiveText:"详情"
12+
onPositiveClicked:{
13+
Qt.openUrlExternally('https://github.com/runhey/OASX')
14+
}
15+
}

module/gui/qml/MainWindow.qml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ FluWindow {
6868
// process_manager.create_all()
6969
}
7070
}
71+
Notity{
72+
id: notity
73+
}
7174

7275
FluNavigationView{
7376
id:nav_view
@@ -83,6 +86,8 @@ FluWindow {
8386
footerItems.navigationView = nav_view
8487
nav_view.setCurrentIndex(0)
8588
items.addFluPaneItems()
89+
90+
notity.open()
8691
}
8792
}
8893
Component.onCompleted:{
1.34 KB
Loading
96 Bytes
Loading
-869 Bytes
Loading
-282 Bytes
Loading
-22.9 KB
Loading
-291 Bytes
Loading
-231 Bytes
Loading

0 commit comments

Comments
 (0)