mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 00:54:39 +03:00
Code

Finish 1.4.87

Browse Source
This commit is contained in:
Arin Alexander 2018-07-11 12:39:50 +03:00
commit 7863c62736
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -62,7 +62,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 4 LIMEREPORT_VERSION_MINOR = 4
LIMEREPORT_VERSION_RELEASE = 86 LIMEREPORT_VERSION_RELEASE = 87
LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"' LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\" DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"

1
limereport/lrpreviewreportwidget.cpp
View File

@ -228,6 +228,7 @@ void PreviewReportWidget::setScalePercent(int percent)
m_scaleType = OneToOne; m_scaleType = OneToOne;
} else { } else {
m_scaleType = Percents; m_scaleType = Percents;
m_scalePercent = percent;
} }
} }

12
limereport/serializators/lrxmlbasetypesserializators.cpp
View File

@ -179,9 +179,9 @@ void XmlFontSerializator::save(const QVariant &value, QString name)
_node.setAttribute("Type","QFont"); _node.setAttribute("Type","QFont");
_node.setAttribute("family",font.family()); _node.setAttribute("family",font.family());
_node.setAttribute("pointSize",font.pointSize()); _node.setAttribute("pointSize",font.pointSize());
#if QT_VERSION>0x040800 //#if QT_VERSION>0x040800
_node.setAttribute("stylename",font.styleName()); // _node.setAttribute("stylename",font.styleName());
#endif //#endif
_node.setAttribute("weight",font.weight()); _node.setAttribute("weight",font.weight());
//saveBool(_node,"bold",font.bold()); //saveBool(_node,"bold",font.bold());
saveBool(_node,"italic",font.italic()); saveBool(_node,"italic",font.italic());
@ -194,9 +194,9 @@ QVariant XmlFontSerializator::loadValue()
QFont font; QFont font;
font.setFamily(node()->attribute("family")); font.setFamily(node()->attribute("family"));
font.setPointSize(node()->attribute("pointSize").toInt()); font.setPointSize(node()->attribute("pointSize").toInt());
#if QT_VERSION>0x040800 //#if QT_VERSION>0x040800
font.setStyleName(node()->attribute("stylename")); // font.setStyleName(node()->attribute("stylename"));
#endif //#endif
font.setWeight(node()->attribute("weight").toInt()); font.setWeight(node()->attribute("weight").toInt());
if (!node()->attribute("bold").isEmpty()) if (!node()->attribute("bold").isEmpty())
font.setBold(node()->attribute("bold").toInt()); font.setBold(node()->attribute("bold").toInt());