diff --git a/modules/uikit/includes/converters/stylesheetconverter.h b/modules/uikit/includes/converters/stylesheetconverter.h index 163643aab..c76344d07 100644 --- a/modules/uikit/includes/converters/stylesheetconverter.h +++ b/modules/uikit/includes/converters/stylesheetconverter.h @@ -2,7 +2,6 @@ #define STYLESHEETCONVERTER_H #include -#include class StyleSheetConverterSettings : public AssetConverterSettings { public: @@ -17,6 +16,8 @@ class StyleSheetConverter : public AssetConverter { QStringList suffixes() const override { return {"css"}; } ReturnCode convertFile(AssetConverterSettings *s) override; AssetConverterSettings *createSettings() override; + + QString templatePath() const override; }; #endif // STYLESHEETCONVERTER_H diff --git a/modules/uikit/includes/converters/uiconverter.h b/modules/uikit/includes/converters/uiconverter.h index b219854bf..e61bddf51 100644 --- a/modules/uikit/includes/converters/uiconverter.h +++ b/modules/uikit/includes/converters/uiconverter.h @@ -16,6 +16,8 @@ class UiConverter : public AssetConverter { QStringList suffixes() const override { return {"ui"}; } ReturnCode convertFile(AssetConverterSettings *s) override; AssetConverterSettings *createSettings() override; + + QString templatePath() const override; }; #endif // UICONVERTER_H diff --git a/modules/uikit/src/converters/stylesheetconverter.cpp b/modules/uikit/src/converters/stylesheetconverter.cpp index 84fc7f217..c2416d05b 100644 --- a/modules/uikit/src/converters/stylesheetconverter.cpp +++ b/modules/uikit/src/converters/stylesheetconverter.cpp @@ -3,6 +3,7 @@ #include #include +#include #define FORMAT_VERSION 1 @@ -40,3 +41,7 @@ AssetConverter::ReturnCode StyleSheetConverter::convertFile(AssetConverterSettin AssetConverterSettings *StyleSheetConverter::createSettings() { return new StyleSheetConverterSettings(); } + +QString StyleSheetConverter::templatePath() const { + return ":/templates/StyleSheet.css"; +} diff --git a/modules/uikit/src/converters/uiconverter.cpp b/modules/uikit/src/converters/uiconverter.cpp index 9c3ebeeda..ff0ef9e4b 100644 --- a/modules/uikit/src/converters/uiconverter.cpp +++ b/modules/uikit/src/converters/uiconverter.cpp @@ -41,3 +41,7 @@ AssetConverter::ReturnCode UiConverter::convertFile(AssetConverterSettings *sett AssetConverterSettings *UiConverter::createSettings() { return new UiConverterSettings(); } + +QString UiConverter::templatePath() const { + return ":/templates/UIDocument.ui"; +} diff --git a/modules/uikit/src/editor/templates/StyleSheet.css b/modules/uikit/src/editor/templates/StyleSheet.css new file mode 100644 index 000000000..832871b8b --- /dev/null +++ b/modules/uikit/src/editor/templates/StyleSheet.css @@ -0,0 +1,3 @@ +Frame { + border-radius: 10px; +} diff --git a/modules/uikit/src/editor/templates/UIDocument.ui b/modules/uikit/src/editor/templates/UIDocument.ui new file mode 100644 index 000000000..aca0fc219 --- /dev/null +++ b/modules/uikit/src/editor/templates/UIDocument.ui @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/modules/uikit/src/editor/uieditor.qrc b/modules/uikit/src/editor/uieditor.qrc index f3621aaf4..9ef13d96f 100644 --- a/modules/uikit/src/editor/uieditor.qrc +++ b/modules/uikit/src/editor/uieditor.qrc @@ -1,5 +1,7 @@ icons/ui.png + templates/UIDocument.ui + templates/StyleSheet.css diff --git a/modules/uikit/src/resources/stylesheet.cpp b/modules/uikit/src/resources/stylesheet.cpp index 970ff5a73..53c8f9560 100644 --- a/modules/uikit/src/resources/stylesheet.cpp +++ b/modules/uikit/src/resources/stylesheet.cpp @@ -52,7 +52,7 @@ bool StyleSheet::addRawData(const std::string &data) { void StyleSheet::loadUserData(const VariantMap &data) { auto it = data.find(gData); if(it != data.end()) { - m_data = (*it).second.toString(); + setData((*it).second.toString()); } } /*!