From fe40377504161d92c5ed10f0646deb6516d71d2a Mon Sep 17 00:00:00 2001 From: Mrmomo Date: Fri, 3 Jun 2016 15:09:49 -0400 Subject: [PATCH] adding cmake project files for qml-material adding cmake project files for the demo adding icons needed by the demo adding "qrc://" to the demo's import path so it can find qml-material --- CMakeLists.txt | 40 +++++++++++++++++++++++++ demo/CMakeLists.txt | 24 +++++++++++++++ demo/icons/core_icons.qrc | 13 ++++++++ demo/icons/navigation_arrow_back.svg | 1 + demo/icons/navigation_chevron_left.svg | 1 + demo/icons/navigation_chevron_right.svg | 1 + demo/icons/navigation_close.svg | 1 + demo/icons/navigation_menu.svg | 1 + demo/icons/navigation_more_vert.svg | 1 + demo/main.cpp | 5 ++-- icons.yml | 11 +++++++ icons/action_account_circle.svg | 1 + icons/action_info.svg | 1 + icons/action_language.svg | 1 + icons/action_settings.svg | 1 + icons/alert_warning.svg | 1 + icons/content_add.svg | 1 + icons/core_icons.qrc | 26 ++++++++++++++++ icons/editor_mode_edit.svg | 1 + icons/image_color_lens.svg | 1 + icons/navigation_arrow_drop_down.svg | 1 + 21 files changed, 132 insertions(+), 2 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 demo/CMakeLists.txt create mode 100644 demo/icons/core_icons.qrc create mode 100644 demo/icons/navigation_arrow_back.svg create mode 100644 demo/icons/navigation_chevron_left.svg create mode 100644 demo/icons/navigation_chevron_right.svg create mode 100644 demo/icons/navigation_close.svg create mode 100644 demo/icons/navigation_menu.svg create mode 100644 demo/icons/navigation_more_vert.svg create mode 100644 icons/action_account_circle.svg create mode 100644 icons/action_info.svg create mode 100644 icons/action_language.svg create mode 100644 icons/action_settings.svg create mode 100644 icons/alert_warning.svg create mode 100644 icons/content_add.svg create mode 100644 icons/editor_mode_edit.svg create mode 100644 icons/image_color_lens.svg create mode 100644 icons/navigation_arrow_drop_down.svg diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 00000000..b54bcb1b --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,40 @@ +project(Material) +cmake_minimum_required(VERSION 2.8) +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + +set(CMAKE_AUTOMOC on) +set(CMAKE_AUTORCC on) + +find_package(Qt5Quick REQUIRED) + +add_definitions(-DQPM_INIT) + +set( + Headers + ${CMAKE_CURRENT_SOURCE_DIR}/src/plugin.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/core/device.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/core/units.h +) +set( + Src + ${CMAKE_CURRENT_SOURCE_DIR}/src/plugin.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/core/device.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/core/units.cpp +) + +set(MaterialRCC + ${CMAKE_CURRENT_SOURCE_DIR}/src/material.qrc + ${CMAKE_CURRENT_SOURCE_DIR}/src/components/components.qrc + ${CMAKE_CURRENT_SOURCE_DIR}/src/controls/controls.qrc + ${CMAKE_CURRENT_SOURCE_DIR}/src/core/core.qrc + ${CMAKE_CURRENT_SOURCE_DIR}/src/extras/extras.qrc + ${CMAKE_CURRENT_SOURCE_DIR}/src/listitems/listitems.qrc + ${CMAKE_CURRENT_SOURCE_DIR}/src/popups/popups.qrc + ${CMAKE_CURRENT_SOURCE_DIR}/src/styles/styles.qrc + ${CMAKE_CURRENT_SOURCE_DIR}/src/window/window.qrc + ${CMAKE_CURRENT_SOURCE_DIR}/icons/core_icons.qrc +) + +add_library(${PROJECT_NAME} SHARED ${Src} ${Headers} ${MaterialRCC}) + +qt5_use_modules(${PROJECT_NAME} Quick ) diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt new file mode 100644 index 00000000..bdc49f3c --- /dev/null +++ b/demo/CMakeLists.txt @@ -0,0 +1,24 @@ +project(Demo) +cmake_minimum_required(VERSION 2.8) +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + +set(CMAKE_AUTOMOC on) +set(CMAKE_AUTORCC on) + +add_subdirectory(../ ${CMAKE_CURRENT_BINARY_DIR}/Material) + +find_package(Qt5Quick REQUIRED) +set( + DemoSrc + main.cpp +) + +set( + DemoRcc + demo.qrc +) + +add_executable(${PROJECT_NAME} ${DemoRcc} ${DemoSrc}) +target_link_libraries(${PROJECT_NAME} Material) + +qt5_use_modules(${PROJECT_NAME} Quick ) diff --git a/demo/icons/core_icons.qrc b/demo/icons/core_icons.qrc new file mode 100644 index 00000000..25aaa6f9 --- /dev/null +++ b/demo/icons/core_icons.qrc @@ -0,0 +1,13 @@ + + + + + navigation_arrow_back.svg + navigation_chevron_left.svg + navigation_chevron_right.svg + navigation_close.svg + navigation_menu.svg + navigation_more_vert.svg + + + \ No newline at end of file diff --git a/demo/icons/navigation_arrow_back.svg b/demo/icons/navigation_arrow_back.svg new file mode 100644 index 00000000..0b26387a --- /dev/null +++ b/demo/icons/navigation_arrow_back.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/demo/icons/navigation_chevron_left.svg b/demo/icons/navigation_chevron_left.svg new file mode 100644 index 00000000..4449fbd7 --- /dev/null +++ b/demo/icons/navigation_chevron_left.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/demo/icons/navigation_chevron_right.svg b/demo/icons/navigation_chevron_right.svg new file mode 100644 index 00000000..ab7c4c52 --- /dev/null +++ b/demo/icons/navigation_chevron_right.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/demo/icons/navigation_close.svg b/demo/icons/navigation_close.svg new file mode 100644 index 00000000..40b5e39d --- /dev/null +++ b/demo/icons/navigation_close.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/demo/icons/navigation_menu.svg b/demo/icons/navigation_menu.svg new file mode 100644 index 00000000..6c9b6bf9 --- /dev/null +++ b/demo/icons/navigation_menu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/demo/icons/navigation_more_vert.svg b/demo/icons/navigation_more_vert.svg new file mode 100644 index 00000000..e0750c57 --- /dev/null +++ b/demo/icons/navigation_more_vert.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/demo/main.cpp b/demo/main.cpp index d1e6dc06..fd1e2404 100644 --- a/demo/main.cpp +++ b/demo/main.cpp @@ -5,7 +5,8 @@ int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); - QQmlApplicationEngine engine(QUrl(QStringLiteral("qrc:/main.qml"))); - + QQmlApplicationEngine engine; + engine.addImportPath("qrc://"); + engine.load(QUrl("qrc:/main.qml")); return app.exec(); } diff --git a/icons.yml b/icons.yml index e76ae0bf..8bc19b84 100644 --- a/icons.yml +++ b/icons.yml @@ -6,3 +6,14 @@ icons: - navigation/close - navigation/menu - navigation/more_vert + - editor/mode_edit + - navigation/arrow_drop_down + - action/settings + - action/info + - content/add + - alert/warning + - image/color_lens + - action/language + - action/account_circle + - alert/warning + - image/color_lens diff --git a/icons/action_account_circle.svg b/icons/action_account_circle.svg new file mode 100644 index 00000000..3cfbe0c8 --- /dev/null +++ b/icons/action_account_circle.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/action_info.svg b/icons/action_info.svg new file mode 100644 index 00000000..22f40f9d --- /dev/null +++ b/icons/action_info.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/action_language.svg b/icons/action_language.svg new file mode 100644 index 00000000..8eba04ca --- /dev/null +++ b/icons/action_language.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/action_settings.svg b/icons/action_settings.svg new file mode 100644 index 00000000..7a01c33e --- /dev/null +++ b/icons/action_settings.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/alert_warning.svg b/icons/alert_warning.svg new file mode 100644 index 00000000..31ef9ab9 --- /dev/null +++ b/icons/alert_warning.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/content_add.svg b/icons/content_add.svg new file mode 100644 index 00000000..2b3a7960 --- /dev/null +++ b/icons/content_add.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/core_icons.qrc b/icons/core_icons.qrc index 25aaa6f9..c23a51f7 100644 --- a/icons/core_icons.qrc +++ b/icons/core_icons.qrc @@ -1,6 +1,31 @@ + + image_color_lens.svg + image_color_lens.svg + + + + alert_warning.svg + alert_warning.svg + + + + content_add.svg + + + + editor_mode_edit.svg + + + + action_settings.svg + action_info.svg + action_language.svg + action_account_circle.svg + + navigation_arrow_back.svg navigation_chevron_left.svg @@ -8,6 +33,7 @@ navigation_close.svg navigation_menu.svg navigation_more_vert.svg + navigation_arrow_drop_down.svg \ No newline at end of file diff --git a/icons/editor_mode_edit.svg b/icons/editor_mode_edit.svg new file mode 100644 index 00000000..7bc29694 --- /dev/null +++ b/icons/editor_mode_edit.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/image_color_lens.svg b/icons/image_color_lens.svg new file mode 100644 index 00000000..d1b14e98 --- /dev/null +++ b/icons/image_color_lens.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/navigation_arrow_drop_down.svg b/icons/navigation_arrow_drop_down.svg new file mode 100644 index 00000000..16f54224 --- /dev/null +++ b/icons/navigation_arrow_drop_down.svg @@ -0,0 +1 @@ + \ No newline at end of file