Compare commits

..

No commits in common. "f8dee135a1dcd0d1d0e3e380a5a7b4e3b6084d7f" and "a184e6b7df1b5e431b0ddaf5fdda932793fda880" have entirely different histories.

7 changed files with 50 additions and 48 deletions

View File

@ -47,39 +47,39 @@
<name>FluentInitalizrWindow</name> <name>FluentInitalizrWindow</name>
<message> <message>
<location filename="qml/window/FluentInitalizrWindow.qml" line="11"/> <location filename="qml/window/FluentInitalizrWindow.qml" line="11"/>
<location filename="qml/window/FluentInitalizrWindow.qml" line="30"/> <location filename="qml/window/FluentInitalizrWindow.qml" line="32"/>
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="11"/> <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="11"/>
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="30"/> <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="32"/>
<source>FluentUI Initalizr</source> <source>FluentUI Initalizr</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/FluentInitalizrWindow.qml" line="51"/> <location filename="qml/window/FluentInitalizrWindow.qml" line="53"/>
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="51"/> <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="53"/>
<source>Name</source> <source>Name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/FluentInitalizrWindow.qml" line="59"/> <location filename="qml/window/FluentInitalizrWindow.qml" line="61"/>
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="59"/> <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="61"/>
<source>Create In</source> <source>Create In</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/FluentInitalizrWindow.qml" line="63"/> <location filename="qml/window/FluentInitalizrWindow.qml" line="65"/>
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="63"/> <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="65"/>
<source>Browse</source> <source>Browse</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/FluentInitalizrWindow.qml" line="93"/> <location filename="qml/window/FluentInitalizrWindow.qml" line="95"/>
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="93"/> <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="95"/>
<source>Cancel</source> <source>Cancel</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/FluentInitalizrWindow.qml" line="101"/> <location filename="qml/window/FluentInitalizrWindow.qml" line="103"/>
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="101"/> <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="103"/>
<source>Create</source> <source>Create</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1594,26 +1594,26 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
<context> <context>
<name>T_Home</name> <name>T_Home</name>
<message> <message>
<location filename="qml/page/T_Home.qml" line="22"/> <location filename="qml/page/T_Home.qml" line="17"/>
<location filename="qml-Qt6/page/T_Home.qml" line="23"/> <location filename="qml-Qt6/page/T_Home.qml" line="17"/>
<source>FluentUI GitHub</source> <source>FluentUI GitHub</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_Home.qml" line="23"/> <location filename="qml/page/T_Home.qml" line="18"/>
<location filename="qml-Qt6/page/T_Home.qml" line="24"/> <location filename="qml-Qt6/page/T_Home.qml" line="18"/>
<source>The latest FluentUI controls and styles for your applications.</source> <source>The latest FluentUI controls and styles for your applications.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_Home.qml" line="31"/> <location filename="qml/page/T_Home.qml" line="26"/>
<location filename="qml-Qt6/page/T_Home.qml" line="32"/> <location filename="qml-Qt6/page/T_Home.qml" line="26"/>
<source>FluentUI Initalizr</source> <source>FluentUI Initalizr</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_Home.qml" line="32"/> <location filename="qml/page/T_Home.qml" line="27"/>
<location filename="qml-Qt6/page/T_Home.qml" line="33"/> <location filename="qml-Qt6/page/T_Home.qml" line="27"/>
<source>FluentUI Initializr is a Tool that helps you create and customize Fluent UI projects with various options.</source> <source>FluentUI Initializr is a Tool that helps you create and customize Fluent UI projects with various options.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -47,39 +47,39 @@
<name>FluentInitalizrWindow</name> <name>FluentInitalizrWindow</name>
<message> <message>
<location filename="qml/window/FluentInitalizrWindow.qml" line="11"/> <location filename="qml/window/FluentInitalizrWindow.qml" line="11"/>
<location filename="qml/window/FluentInitalizrWindow.qml" line="30"/> <location filename="qml/window/FluentInitalizrWindow.qml" line="32"/>
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="11"/> <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="11"/>
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="30"/> <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="32"/>
<source>FluentUI Initalizr</source> <source>FluentUI Initalizr</source>
<translation type="unfinished">FluentUI脚手架</translation> <translation type="unfinished">FluentUI脚手架</translation>
</message> </message>
<message> <message>
<location filename="qml/window/FluentInitalizrWindow.qml" line="51"/> <location filename="qml/window/FluentInitalizrWindow.qml" line="53"/>
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="51"/> <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="53"/>
<source>Name</source> <source>Name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/FluentInitalizrWindow.qml" line="59"/> <location filename="qml/window/FluentInitalizrWindow.qml" line="61"/>
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="59"/> <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="61"/>
<source>Create In</source> <source>Create In</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/FluentInitalizrWindow.qml" line="63"/> <location filename="qml/window/FluentInitalizrWindow.qml" line="65"/>
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="63"/> <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="65"/>
<source>Browse</source> <source>Browse</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/FluentInitalizrWindow.qml" line="93"/> <location filename="qml/window/FluentInitalizrWindow.qml" line="95"/>
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="93"/> <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="95"/>
<source>Cancel</source> <source>Cancel</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/window/FluentInitalizrWindow.qml" line="101"/> <location filename="qml/window/FluentInitalizrWindow.qml" line="103"/>
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="101"/> <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="103"/>
<source>Create</source> <source>Create</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1606,26 +1606,26 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
<context> <context>
<name>T_Home</name> <name>T_Home</name>
<message> <message>
<location filename="qml/page/T_Home.qml" line="22"/> <location filename="qml/page/T_Home.qml" line="17"/>
<location filename="qml-Qt6/page/T_Home.qml" line="23"/> <location filename="qml-Qt6/page/T_Home.qml" line="17"/>
<source>FluentUI GitHub</source> <source>FluentUI GitHub</source>
<translation type="unfinished">FluentUI GitHub</translation> <translation type="unfinished">FluentUI GitHub</translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_Home.qml" line="23"/> <location filename="qml/page/T_Home.qml" line="18"/>
<location filename="qml-Qt6/page/T_Home.qml" line="24"/> <location filename="qml-Qt6/page/T_Home.qml" line="18"/>
<source>The latest FluentUI controls and styles for your applications.</source> <source>The latest FluentUI controls and styles for your applications.</source>
<translation type="unfinished"> FluentUI </translation> <translation type="unfinished"> FluentUI </translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_Home.qml" line="31"/> <location filename="qml/page/T_Home.qml" line="26"/>
<location filename="qml-Qt6/page/T_Home.qml" line="32"/> <location filename="qml-Qt6/page/T_Home.qml" line="26"/>
<source>FluentUI Initalizr</source> <source>FluentUI Initalizr</source>
<translation type="unfinished">FluentUI脚手架</translation> <translation type="unfinished">FluentUI脚手架</translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_Home.qml" line="32"/> <location filename="qml/page/T_Home.qml" line="27"/>
<location filename="qml-Qt6/page/T_Home.qml" line="33"/> <location filename="qml-Qt6/page/T_Home.qml" line="27"/>
<source>FluentUI Initializr is a Tool that helps you create and customize Fluent UI projects with various options.</source> <source>FluentUI Initializr is a Tool that helps you create and customize Fluent UI projects with various options.</source>
<translation type="unfinished">FluentUI Fluent UI </translation> <translation type="unfinished">FluentUI Fluent UI </translation>
</message> </message>

View File

@ -13,7 +13,7 @@ set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
# #
add_definitions(-DFLUENTUI_VERSION=1,7,2,0) add_definitions(-DFLUENTUI_VERSION=1,7,1,0)
if (FLUENTUI_BUILD_STATIC_LIB) if (FLUENTUI_BUILD_STATIC_LIB)
add_definitions(-DFLUENTUI_BUILD_STATIC_LIB) add_definitions(-DFLUENTUI_BUILD_STATIC_LIB)

View File

@ -21,8 +21,7 @@ FluWindow {
} }
} }
closeListener: function(event){ closeListener: function(event){
visible = false event.accepted = true
event.accepted = false
} }
function showDialog(){ function showDialog(){
var x = transientParent.x + (transientParent.width - width)/2 var x = transientParent.x + (transientParent.width - width)/2

View File

@ -21,8 +21,7 @@ FluWindow {
} }
} }
closeListener: function(event){ closeListener: function(event){
visible = false event.accepted = true
event.accepted = false
} }
function showDialog(){ function showDialog(){
var x = transientParent.x + (transientParent.width - width)/2 var x = transientParent.x + (transientParent.width - width)/2

View File

@ -64,7 +64,11 @@
<context> <context>
<name>FluCalendarPicker</name> <name>FluCalendarPicker</name>
<message> <message>
<location filename="Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml" line="12"/> <location filename="Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml" line="11"/>
<source>Please select a date</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml" line="11"/> <location filename="Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml" line="11"/>
<source>Pick a date</source> <source>Pick a date</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

View File

@ -64,11 +64,11 @@
<context> <context>
<name>FluCalendarPicker</name> <name>FluCalendarPicker</name>
<message> <message>
<location filename="Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml" line="11"/>
<source>Please select a date</source> <source>Please select a date</source>
<translation type="obsolete"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml" line="12"/>
<location filename="Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml" line="11"/> <location filename="Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml" line="11"/>
<source>Pick a date</source> <source>Pick a date</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>