Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Bugfix] Bugfixed the generator #20

Merged
merged 1 commit into from Jan 16, 2014
Merged

[Bugfix] Bugfixed the generator #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
90 changes: 67 additions & 23 deletions src/styles/autogenerated/nemotheme.cpp
View file
Open in desktop
Expand Up @@ -193,7 +193,7 @@ static inline int jsonToInt(const QJsonValue &value,
trueValue = defines.value(valueString);
}
}

double doubleValue = trueValue.toDouble();
return (int) doubleValue;
}
Expand Down Expand Up @@ -280,26 +280,38 @@ void NemoTheme::loadFromFile(const QString &fileName)
// Setting properties for font
QJsonObject stylesButtonTextFont = stylesButtonText.value("font").toObject();
if (stylesButtonTextFont.contains("pointSize")) {
m_button->text()->font()->setPointSize(jsonToInt(stylesButtonText.value("font"), defines));
m_button->text()->font()->setPointSize(jsonToInt(stylesButtonTextFont.value("pointSize"), defines));
} else {
m_button->text()->font()->setPointSizeDefault();
}
if (stylesButtonTextFont.contains("weight")) {
m_button->text()->font()->setWeight(jsonToInt(stylesButtonText.value("font"), defines));
m_button->text()->font()->setWeight(jsonToInt(stylesButtonTextFont.value("weight"), defines));
} else {
m_button->text()->font()->setWeightDefault();
}
// Setting properties for pressedGradient
QJsonObject stylesButtonPressedGradient = stylesButton.value("pressedGradient").toObject();
m_button->pressedGradient()->setCenterColor(jsonToColor(jsonValue(stylesButtonPressedGradient, "centerColor", "pressedGradient"), defines));
m_button->pressedGradient()->setEdgeColor(jsonToColor(jsonValue(stylesButtonPressedGradient, "edgeColor", "pressedGradient"), defines));
if (stylesButtonPressedGradient.contains("width")) {
m_button->pressedGradient()->setWidth(jsonToInt(stylesButton.value("pressedGradient"), defines));
m_button->pressedGradient()->setWidth(jsonToInt(stylesButtonPressedGradient.value("width"), defines));
} else {
m_button->pressedGradient()->setWidthDefault();
}
if (stylesButtonPressedGradient.contains("height")) {
m_button->pressedGradient()->setHeight(jsonToInt(stylesButton.value("pressedGradient"), defines));
m_button->pressedGradient()->setHeight(jsonToInt(stylesButtonPressedGradient.value("height"), defines));
} else {
m_button->pressedGradient()->setHeightDefault();
}
if (stylesButtonPressedGradient.contains("center")) {
m_button->pressedGradient()->setCenter(jsonToDouble(stylesButton.value("pressedGradient"), defines));
m_button->pressedGradient()->setCenter(jsonToDouble(stylesButtonPressedGradient.value("center"), defines));
} else {
m_button->pressedGradient()->setCenterDefault();
}
if (stylesButtonPressedGradient.contains("edge")) {
m_button->pressedGradient()->setEdge(jsonToDouble(stylesButton.value("pressedGradient"), defines));
m_button->pressedGradient()->setEdge(jsonToDouble(stylesButtonPressedGradient.value("edge"), defines));
} else {
m_button->pressedGradient()->setEdgeDefault();
}
// Setting properties for primaryButton
QJsonObject stylesPrimaryButton = styles.value("primaryButton").toObject();
Expand All @@ -310,26 +322,38 @@ void NemoTheme::loadFromFile(const QString &fileName)
// Setting properties for font
QJsonObject stylesPrimaryButtonTextFont = stylesPrimaryButtonText.value("font").toObject();
if (stylesPrimaryButtonTextFont.contains("pointSize")) {
m_primaryButton->text()->font()->setPointSize(jsonToInt(stylesPrimaryButtonText.value("font"), defines));
m_primaryButton->text()->font()->setPointSize(jsonToInt(stylesPrimaryButtonTextFont.value("pointSize"), defines));
} else {
m_primaryButton->text()->font()->setPointSizeDefault();
}
if (stylesPrimaryButtonTextFont.contains("weight")) {
m_primaryButton->text()->font()->setWeight(jsonToInt(stylesPrimaryButtonText.value("font"), defines));
m_primaryButton->text()->font()->setWeight(jsonToInt(stylesPrimaryButtonTextFont.value("weight"), defines));
} else {
m_primaryButton->text()->font()->setWeightDefault();
}
// Setting properties for pressedGradient
QJsonObject stylesPrimaryButtonPressedGradient = stylesPrimaryButton.value("pressedGradient").toObject();
m_primaryButton->pressedGradient()->setCenterColor(jsonToColor(jsonValue(stylesPrimaryButtonPressedGradient, "centerColor", "pressedGradient"), defines));
m_primaryButton->pressedGradient()->setEdgeColor(jsonToColor(jsonValue(stylesPrimaryButtonPressedGradient, "edgeColor", "pressedGradient"), defines));
if (stylesPrimaryButtonPressedGradient.contains("width")) {
m_primaryButton->pressedGradient()->setWidth(jsonToInt(stylesPrimaryButton.value("pressedGradient"), defines));
m_primaryButton->pressedGradient()->setWidth(jsonToInt(stylesPrimaryButtonPressedGradient.value("width"), defines));
} else {
m_primaryButton->pressedGradient()->setWidthDefault();
}
if (stylesPrimaryButtonPressedGradient.contains("height")) {
m_primaryButton->pressedGradient()->setHeight(jsonToInt(stylesPrimaryButton.value("pressedGradient"), defines));
m_primaryButton->pressedGradient()->setHeight(jsonToInt(stylesPrimaryButtonPressedGradient.value("height"), defines));
} else {
m_primaryButton->pressedGradient()->setHeightDefault();
}
if (stylesPrimaryButtonPressedGradient.contains("center")) {
m_primaryButton->pressedGradient()->setCenter(jsonToDouble(stylesPrimaryButton.value("pressedGradient"), defines));
m_primaryButton->pressedGradient()->setCenter(jsonToDouble(stylesPrimaryButtonPressedGradient.value("center"), defines));
} else {
m_primaryButton->pressedGradient()->setCenterDefault();
}
if (stylesPrimaryButtonPressedGradient.contains("edge")) {
m_primaryButton->pressedGradient()->setEdge(jsonToDouble(stylesPrimaryButton.value("pressedGradient"), defines));
m_primaryButton->pressedGradient()->setEdge(jsonToDouble(stylesPrimaryButtonPressedGradient.value("edge"), defines));
} else {
m_primaryButton->pressedGradient()->setEdgeDefault();
}
// Setting properties for groove
QJsonObject stylesGroove = styles.value("groove").toObject();
Expand All @@ -340,7 +364,9 @@ void NemoTheme::loadFromFile(const QString &fileName)
m_textField->setSelectedTextColor(jsonToColor(jsonValue(stylesTextField, "selectedTextColor", "textField"), defines));
m_textField->setSelectionColor(jsonToColor(jsonValue(stylesTextField, "selectionColor", "textField"), defines));
if (stylesTextField.contains("pointSize")) {
m_textField->setPointSize(jsonToInt(styles.value("textField"), defines));
m_textField->setPointSize(jsonToInt(stylesTextField.value("pointSize"), defines));
} else {
m_textField->setPointSizeDefault();
}
// Setting properties for toolBar
QJsonObject stylesToolBar = styles.value("toolBar").toObject();
Expand All @@ -356,38 +382,56 @@ void NemoTheme::loadFromFile(const QString &fileName)
m_page->dimmer()->setStartColor(jsonToColor(jsonValue(stylesPageDimmer, "startColor", "dimmer"), defines));
m_page->dimmer()->setEndColor(jsonToColor(jsonValue(stylesPageDimmer, "endColor", "dimmer"), defines));
if (stylesPageDimmer.contains("height")) {
m_page->dimmer()->setHeight(jsonToInt(stylesPage.value("dimmer"), defines));
m_page->dimmer()->setHeight(jsonToInt(stylesPageDimmer.value("height"), defines));
} else {
m_page->dimmer()->setHeightDefault();
}
if (stylesPageDimmer.contains("startPosition")) {
m_page->dimmer()->setStartPosition(jsonToDouble(stylesPage.value("dimmer"), defines));
m_page->dimmer()->setStartPosition(jsonToDouble(stylesPageDimmer.value("startPosition"), defines));
} else {
m_page->dimmer()->setStartPositionDefault();
}
if (stylesPageDimmer.contains("endPosition")) {
m_page->dimmer()->setEndPosition(jsonToDouble(stylesPage.value("dimmer"), defines));
m_page->dimmer()->setEndPosition(jsonToDouble(stylesPageDimmer.value("endPosition"), defines));
} else {
m_page->dimmer()->setEndPositionDefault();
}
// Setting properties for spinner
QJsonObject stylesSpinner = styles.value("spinner").toObject();
if (stylesSpinner.contains("radius")) {
m_spinner->setRadius(jsonToInt(styles.value("spinner"), defines));
m_spinner->setRadius(jsonToInt(stylesSpinner.value("radius"), defines));
} else {
m_spinner->setRadiusDefault();
}
m_spinner->setPrimaryColor(jsonToColor(jsonValue(stylesSpinner, "primaryColor", "spinner"), defines));
m_spinner->setSecondaryColor(jsonToColor(jsonValue(stylesSpinner, "secondaryColor", "spinner"), defines));
if (stylesSpinner.contains("horizontalSpacing")) {
m_spinner->setHorizontalSpacing(jsonToInt(styles.value("spinner"), defines));
m_spinner->setHorizontalSpacing(jsonToInt(stylesSpinner.value("horizontalSpacing"), defines));
} else {
m_spinner->setHorizontalSpacingDefault();
}
if (stylesSpinner.contains("verticalSpacing")) {
m_spinner->setVerticalSpacing(jsonToInt(styles.value("spinner"), defines));
m_spinner->setVerticalSpacing(jsonToInt(stylesSpinner.value("verticalSpacing"), defines));
} else {
m_spinner->setVerticalSpacingDefault();
}
if (stylesSpinner.contains("initialStateDuration")) {
m_spinner->setInitialStateDuration(jsonToInt(styles.value("spinner"), defines));
m_spinner->setInitialStateDuration(jsonToInt(stylesSpinner.value("initialStateDuration"), defines));
} else {
m_spinner->setInitialStateDurationDefault();
}
if (stylesSpinner.contains("transitionDuration")) {
m_spinner->setTransitionDuration(jsonToInt(styles.value("spinner"), defines));
m_spinner->setTransitionDuration(jsonToInt(stylesSpinner.value("transitionDuration"), defines));
} else {
m_spinner->setTransitionDurationDefault();
}
// Setting properties for label
QJsonObject stylesLabel = styles.value("label").toObject();
m_label->setColor(jsonToColor(jsonValue(stylesLabel, "color", "label"), defines));
if (stylesLabel.contains("pointSize")) {
m_label->setPointSize(jsonToInt(styles.value("label"), defines));
m_label->setPointSize(jsonToInt(stylesLabel.value("pointSize"), defines));
} else {
m_label->setPointSizeDefault();
}
// Setting properties for checkbox
QJsonObject stylesCheckbox = styles.value("checkbox").toObject();
Expand Down
32 changes: 32 additions & 0 deletions src/styles/autogenerated/nemothemebuttonpressedgradient.cpp
View file
Open in desktop
Expand Up @@ -70,6 +70,14 @@ void NemoThemeButtonPressedGradient::setWidth(int width)
}
}

void NemoThemeButtonPressedGradient::setWidthDefault()
{
if (m_width != 240) {
m_width = 240;
emit widthChanged();
}
}

int NemoThemeButtonPressedGradient::height() const
{
return m_height;
Expand All @@ -83,6 +91,14 @@ void NemoThemeButtonPressedGradient::setHeight(int height)
}
}

void NemoThemeButtonPressedGradient::setHeightDefault()
{
if (m_height != 240) {
m_height = 240;
emit heightChanged();
}
}

double NemoThemeButtonPressedGradient::center() const
{
return m_center;
Expand All @@ -96,6 +112,14 @@ void NemoThemeButtonPressedGradient::setCenter(double center)
}
}

void NemoThemeButtonPressedGradient::setCenterDefault()
{
if (m_center != 0.29) {
m_center = 0.29;
emit centerChanged();
}
}

double NemoThemeButtonPressedGradient::edge() const
{
return m_edge;
Expand All @@ -108,3 +132,11 @@ void NemoThemeButtonPressedGradient::setEdge(double edge)
emit edgeChanged();
}
}

void NemoThemeButtonPressedGradient::setEdgeDefault()
{
if (m_edge != 0.5) {
m_edge = 0.5;
emit edgeChanged();
}
}
4 changes: 4 additions & 0 deletions src/styles/autogenerated/nemothemebuttonpressedgradient.h
View file
Open in desktop
Expand Up @@ -43,12 +43,16 @@ class NemoThemeButtonPressedGradient: public QObject
void setEdgeColor(const QColor &edgeColor);
int width() const;
void setWidth(int width);
void setWidthDefault();
int height() const;
void setHeight(int height);
void setHeightDefault();
double center() const;
void setCenter(double center);
void setCenterDefault();
double edge() const;
void setEdge(double edge);
void setEdgeDefault();
Q_SIGNALS:
void centerColorChanged();
void edgeColorChanged();
Expand Down
16 changes: 16 additions & 0 deletions src/styles/autogenerated/nemothemefont.cpp
View file
Open in desktop
Expand Up @@ -42,6 +42,14 @@ void NemoThemeFont::setPointSize(int pointSize)
}
}

void NemoThemeFont::setPointSizeDefault()
{
if (m_pointSize != 24) {
m_pointSize = 24;
emit pointSizeChanged();
}
}

int NemoThemeFont::weight() const
{
return m_weight;
Expand All @@ -54,3 +62,11 @@ void NemoThemeFont::setWeight(int weight)
emit weightChanged();
}
}

void NemoThemeFont::setWeightDefault()
{
if (m_weight != 25) {
m_weight = 25;
emit weightChanged();
}
}
2 changes: 2 additions & 0 deletions src/styles/autogenerated/nemothemefont.h
View file
Open in desktop
Expand Up @@ -34,8 +34,10 @@ class NemoThemeFont: public QObject
explicit NemoThemeFont(QObject *parent = 0);
int pointSize() const;
void setPointSize(int pointSize);
void setPointSizeDefault();
int weight() const;
void setWeight(int weight);
void setWeightDefault();
Q_SIGNALS:
void pointSizeChanged();
void weightChanged();
Expand Down
8 changes: 8 additions & 0 deletions src/styles/autogenerated/nemothemelabel.cpp
View file
Open in desktop
Expand Up @@ -53,3 +53,11 @@ void NemoThemeLabel::setPointSize(int pointSize)
emit pointSizeChanged();
}
}

void NemoThemeLabel::setPointSizeDefault()
{
if (m_pointSize != 24) {
m_pointSize = 24;
emit pointSizeChanged();
}
}
1 change: 1 addition & 0 deletions src/styles/autogenerated/nemothemelabel.h
View file
Open in desktop
Expand Up @@ -37,6 +37,7 @@ class NemoThemeLabel: public QObject
void setColor(const QColor &color);
int pointSize() const;
void setPointSize(int pointSize);
void setPointSizeDefault();
Q_SIGNALS:
void colorChanged();
void pointSizeChanged();
Expand Down
24 changes: 24 additions & 0 deletions src/styles/autogenerated/nemothemepagedimmer.cpp
View file
Open in desktop
Expand Up @@ -69,6 +69,14 @@ void NemoThemePageDimmer::setHeight(int height)
}
}

void NemoThemePageDimmer::setHeightDefault()
{
if (m_height != 15) {
m_height = 15;
emit heightChanged();
}
}

double NemoThemePageDimmer::startPosition() const
{
return m_startPosition;
Expand All @@ -82,6 +90,14 @@ void NemoThemePageDimmer::setStartPosition(double startPosition)
}
}

void NemoThemePageDimmer::setStartPositionDefault()
{
if (m_startPosition != 0) {
m_startPosition = 0;
emit startPositionChanged();
}
}

double NemoThemePageDimmer::endPosition() const
{
return m_endPosition;
Expand All @@ -94,3 +110,11 @@ void NemoThemePageDimmer::setEndPosition(double endPosition)
emit endPositionChanged();
}
}

void NemoThemePageDimmer::setEndPositionDefault()
{
if (m_endPosition != 1.0) {
m_endPosition = 1.0;
emit endPositionChanged();
}
}
3 changes: 3 additions & 0 deletions src/styles/autogenerated/nemothemepagedimmer.h
View file
Open in desktop
Expand Up @@ -42,10 +42,13 @@ class NemoThemePageDimmer: public QObject
void setEndColor(const QColor &endColor);
int height() const;
void setHeight(int height);
void setHeightDefault();
double startPosition() const;
void setStartPosition(double startPosition);
void setStartPositionDefault();
double endPosition() const;
void setEndPosition(double endPosition);
void setEndPositionDefault();
Q_SIGNALS:
void startColorChanged();
void endColorChanged();
Expand Down