Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion modules/uikit/includes/converters/stylesheetconverter.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#define STYLESHEETCONVERTER_H

#include <editor/assetconverter.h>
#include <resources/stylesheet.h>

class StyleSheetConverterSettings : public AssetConverterSettings {
public:
Expand All @@ -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
2 changes: 2 additions & 0 deletions modules/uikit/includes/converters/uiconverter.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions modules/uikit/src/converters/stylesheetconverter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <QFile>

#include <bson.h>
#include <resources/stylesheet.h>

#define FORMAT_VERSION 1

Expand Down Expand Up @@ -40,3 +41,7 @@ AssetConverter::ReturnCode StyleSheetConverter::convertFile(AssetConverterSettin
AssetConverterSettings *StyleSheetConverter::createSettings() {
return new StyleSheetConverterSettings();
}

QString StyleSheetConverter::templatePath() const {
return ":/templates/StyleSheet.css";
}
4 changes: 4 additions & 0 deletions modules/uikit/src/converters/uiconverter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,7 @@ AssetConverter::ReturnCode UiConverter::convertFile(AssetConverterSettings *sett
AssetConverterSettings *UiConverter::createSettings() {
return new UiConverterSettings();
}

QString UiConverter::templatePath() const {
return ":/templates/UIDocument.ui";
}
3 changes: 3 additions & 0 deletions modules/uikit/src/editor/templates/StyleSheet.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Frame {
border-radius: 10px;
}
4 changes: 4 additions & 0 deletions modules/uikit/src/editor/templates/UIDocument.ui
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0"?>
<ui>
<Frame name="Panel" style="display: block; height: 100px;width: 100px;" />
</ui>
2 changes: 2 additions & 0 deletions modules/uikit/src/editor/uieditor.qrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<RCC>
<qresource prefix="/">
<file>icons/ui.png</file>
<file>templates/UIDocument.ui</file>
<file>templates/StyleSheet.css</file>
</qresource>
</RCC>
2 changes: 1 addition & 1 deletion modules/uikit/src/resources/stylesheet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}
/*!
Expand Down
Loading