amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2024-10-06 20:23:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #195 from mentalfl0w/main

Browse Source 
Fix the bug of static resources didn't imported by engine.
This commit is contained in:
zhuzichu 2023-07-10 21:37:40 +08:00 committed by GitHub
commit 6275c161fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 90 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
example/CMakeLists.txt
View File

@ -8,6 +8,11 @@ if(APPLE)
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE) set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
endif() endif()
#判断FluentUI库类型
if(FLUENTUI_BUILD_STATIC_LIB)
add_definitions(-DFLUENTUI_BUILD_STATIC_LIB)
endif()
#设置可执行文件输出目录 #设置可执行文件输出目录
if(CMAKE_BUILD_TYPE STREQUAL "Debug") if(CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/debug) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/debug)

3
example/src/main.cpp
View File

@ -38,6 +38,9 @@ int main(int argc, char *argv[])
app.setQuitOnLastWindowClosed(false); app.setQuitOnLastWindowClosed(false);
QQmlApplicationEngine engine; QQmlApplicationEngine engine;
FramelessHelper::Quick::registerTypes(&engine); FramelessHelper::Quick::registerTypes(&engine);
#ifdef FLUENTUI_BUILD_STATIC_LIB
engine.addImportPath("qrc:/"); // 让静态资源可以被QML引擎搜索到
#endif
qmlRegisterType<CircularReveal>("example", 1, 0, "CircularReveal"); qmlRegisterType<CircularReveal>("example", 1, 0, "CircularReveal");
appInfo->init(&engine); appInfo->init(&engine);
const QUrl url(QStringLiteral("qrc:/example/qml/App.qml")); const QUrl url(QStringLiteral("qrc:/example/qml/App.qml"));

2
src/CMakeLists.txt
View File

@ -42,7 +42,7 @@ foreach(filepath ${QML_PATHS})
endforeach(filepath) endforeach(filepath)
#遍历所有资源文件 #遍历所有资源文件
file(GLOB_RECURSE RES_PATHS *.png *.jpg *.svg *.ico *.ttf *.webp) file(GLOB_RECURSE RES_PATHS *.png *.jpg *.svg *.ico *.ttf *.webp qmldir)
foreach(filepath ${RES_PATHS}) foreach(filepath ${RES_PATHS})
string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath}) string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath})
list(APPEND resource_files ${filename}) list(APPEND resource_files ${filename})

147
src/imports/FluentUI/qmldir
View File

@ -1,68 +1,83 @@
module FluentUI module FluentUI
FluAppBar 1.0 FluAppBar.qml classname FluentUIPlugin
FluArea 1.0 FluArea.qml designersupported
FluAutoSuggestBox 1.0 FluAutoSuggestBox.qml typeinfo plugins.qmltypes
FluBadge 1.0 FluBadge.qml
FluBreadcrumbBar 1.0 FluBreadcrumbBar.qml FluAppBar 1.0 Controls/FluAppBar.qml
FluButton 1.0 FluButton.qml FluArea 1.0 Controls/FluArea.qml
FluCalendarPicker 1.0 FluCalendarPicker.qml FluAcrylic 1.0 Controls/FluAcrylic.qml
FluCalendarView 1.0 FluCalendarView.qml FluAutoSuggestBox 1.0 Controls/FluAutoSuggestBox.qml
FluCarousel 1.0 FluCarousel.qml FluBadge 1.0 Controls/FluBadge.qml
FluCheckBox 1.0 FluCheckBox.qml FluBreadcrumbBar 1.0 Controls/FluBreadcrumbBar.qml
FluColorPicker 1.0 FluColorPicker.qml FluButton 1.0 Controls/FluButton.qml
FluColorView 1.0 FluColorView.qml FluCalendarPicker 1.0 Controls/FluCalendarPicker.qml
FluComboBox 1.0 FluComboBox.qml FluCalendarView 1.0 Controls/FluCalendarView.qml
FluContentDialog 1.0 FluContentDialog.qml FluCarousel 1.0 Controls/FluCarousel.qml
FluContentPage 1.0 FluContentPage.qml FluCheckBox 1.0 Controls/FluCheckBox.qml
FluDatePicker 1.0 FluDatePicker.qml FluColorPicker 1.0 Controls/FluColorPicker.qml
FluDivider 1.0 FluDivider.qml FluColorView 1.0 Controls/FluColorView.qml
FluDropDownButton 1.0 FluDropDownButton.qml FluComboBox 1.0 Controls/FluComboBox.qml
FluExpander 1.0 FluExpander.qml FluControl 1.0 Controls/FluControl.qml
FluFilledButton 1.0 FluFilledButton.qml FluContentDialog 1.0 Controls/FluContentDialog.qml
FluFlipView 1.0 FluFlipView.qml FluContentPage 1.0 Controls/FluContentPage.qml
FluFocusRectangle 1.0 FluFocusRectangle.qml FluCopyableText 1.0 Controls/FluCopyableText.qml
FluIcon 1.0 FluIcon.qml FluDatePicker 1.0 Controls/FluDatePicker.qml
FluIconButton 1.0 FluIconButton.qml FluDivider 1.0 Controls/FluDivider.qml
FluInfoBar 1.0 FluInfoBar.qml FluDropDownButton 1.0 Controls/FluDropDownButton.qml
FluItem 1.0 FluItem.qml FluExpander 1.0 Controls/FluExpander.qml
FluMediaPlayer 1.0 FluMediaPlayer.qml FluFilledButton 1.0 Controls/FluFilledButton.qml
FluMenu 1.0 FluMenu.qml FluFlipView 1.0 Controls/FluFlipView.qml
FluMenuItem 1.0 FluMenuItem.qml FluFocusRectangle 1.0 Controls/FluFocusRectangle.qml
FluMultilineTextBox 1.0 FluMultilineTextBox.qml FluIcon 1.0 Controls/FluIcon.qml
FluNavigationView 1.0 FluNavigationView.qml FluIconButton 1.0 Controls/FluIconButton.qml
FluObject 1.0 FluObject.qml FluInfoBar 1.0 Controls/FluInfoBar.qml
FluPagination 1.0 FluPagination.qml FluItem 1.0 Controls/FluItem.qml
FluPaneItem 1.0 FluPaneItem.qml FluImage 1.0 Controls/FluImage.qml
FluPaneItemEmpty 1.0 FluPaneItemEmpty.qml FluMediaPlayer 1.0 Controls/FluMediaPlayer.qml
FluPaneItemExpander 1.0 FluPaneItemExpander.qml FluMenu 1.0 Controls/FluMenu.qml
FluPaneItemHeader 1.0 FluPaneItemHeader.qml FluMenuItem 1.0 Controls/FluMenuItem.qml
FluPaneItemSeparator 1.0 FluPaneItemSeparator.qml FluMenuSeparator 1.0 Controls/FluMenuSeparator.qml
FluPasswordBox 1.0 FluPasswordBox.qml FluMenuBar 1.0 Controls/FluMenuBar.qml
FluPivot 1.0 FluPivot.qml FluMenuBarItem 1.0 Controls/FluMenuBarItem.qml
FluPivotItem 1.0 FluPivotItem.qml FluMultilineTextBox 1.0 Controls/FluMultilineTextBox.qml
FluProgressBar 1.0 FluProgressBar.qml FluNavigationView 1.0 Controls/FluNavigationView.qml
FluProgressRing 1.0 FluProgressRing.qml FluObject 1.0 Controls/FluObject.qml
FluRadioButton 1.0 FluRadioButton.qml FluPage 1.0 Controls/FluPage.qml
FluRatingControl 1.0 FluRatingControl.qml FluPagination 1.0 Controls/FluPagination.qml
FluRectangle 1.0 FluRectangle.qml FluPaneItem 1.0 Controls/FluPaneItem.qml
FluScrollablePage 1.0 FluScrollablePage.qml FluPaneItemEmpty 1.0 Controls/FluPaneItemEmpty.qml
FluScrollBar 1.0 FluScrollBar.qml FluPaneItemExpander 1.0 Controls/FluPaneItemExpander.qml
FluShadow 1.0 FluShadow.qml FluPaneItemHeader 1.0 Controls/FluPaneItemHeader.qml
FluSlider 1.0 FluSlider.qml FluPaneItemSeparator 1.0 Controls/FluPaneItemSeparator.qml
FluStatusView 1.0 FluStatusView.qml FluPasswordBox 1.0 Controls/FluPasswordBox.qml
FluTableView 1.0 FluTableView.qml FluPivot 1.0 Controls/FluPivot.qml
FluTabView 1.0 FluTabView.qml FluPivotItem 1.0 Controls/FluPivotItem.qml
FluText 1.0 FluText.qml FluPopup 1.0 Controls/FluPopup.qml
FluTextBox 1.0 FluTextBox.qml FluProgressBar 1.0 Controls/FluProgressBar.qml
FluTextBoxBackground 1.0 FluTextBoxBackground.qml FluProgressRing 1.0 Controls/FluProgressRing.qml
FluTextBoxMenu 1.0 FluTextBoxMenu.qml FluRadioButton 1.0 Controls/FluRadioButton.qml
FluTextButton 1.0 FluTextButton.qml FluRadioButtons 1.0 Controls/FluRadioButtons.qml
FluTimePicker 1.0 FluTimePicker.qml FluRatingControl 1.0 Controls/FluRatingControl.qml
FluToggleButton 1.0 FluToggleButton.qml FluRectangle 1.0 Controls/FluRectangle.qml
FluToggleSwitch 1.0 FluToggleSwitch.qml FluRemoteLoader 1.0 Controls/FluRemoteLoader.qml
FluTooltip 1.0 FluTooltip.qml FluScrollablePage 1.0 Controls/FluScrollablePage.qml
FluTreeView 1.0 FluTreeView.qml FluScrollBar 1.0 Controls/FluScrollBar.qml
FluWindow 1.0 FluWindow.qml FluShadow 1.0 Controls/FluShadow.qml
FluWindowResize 1.0 FluWindowResize.qml FluSlider 1.0 Controls/FluSlider.qml
FluSingleton 1.0 FluSingleton.qml FluSpinBox 1.0 Controls/FluSpinBox.qml
FluStatusView 1.0 Controls/FluStatusView.qml
FluTableView 1.0 Controls/FluTableView.qml
FluTabView 1.0 Controls/FluTabView.qml
FluText 1.0 Controls/FluText.qml
FluTextBox 1.0 Controls/FluTextBox.qml
FluTextBoxBackground 1.0 Controls/FluTextBoxBackground.qml
FluTextBoxMenu 1.0 Controls/FluTextBoxMenu.qml
FluTextButton 1.0 Controls/FluTextButton.qml
FluTimePicker 1.0 Controls/FluTimePicker.qml
FluToggleButton 1.0 Controls/FluToggleButton.qml
FluToggleSwitch 1.0 Controls/FluToggleSwitch.qml
FluTooltip 1.0 Controls/FluTooltip.qml
FluTreeView 1.0 Controls/FluTreeView.qml
FluWindow 1.0 Controls/FluWindow.qml
FluSingleton 1.0 Controls/FluSingleton.qml
plugin fluentuiplugin plugin fluentuiplugin