mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 08:34:38 +03:00
Code

Finish 1.4.129

Browse Source
This commit is contained in:
Arin Alexander 2019-05-19 14:25:31 +03:00
commit 6b7abd4e8e
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -120,7 +120,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 = 128 LIMEREPORT_VERSION_RELEASE = 129
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}\\\"

23
limereport/items/lrbarcodeitem.cpp
View File

@ -48,7 +48,8 @@ namespace LimeReport{
BarcodeItem::BarcodeItem(QObject* owner,QGraphicsItem* parent) BarcodeItem::BarcodeItem(QObject* owner,QGraphicsItem* parent)
: ContentItemDesignIntf(xmlTag,owner,parent),m_designTestValue("1"), m_barcodeType(CODE128), : ContentItemDesignIntf(xmlTag,owner,parent),m_designTestValue("1"), m_barcodeType(CODE128),
m_foregroundColor(Qt::black), m_backgroundColor(Qt::white), m_whitespace(10), m_angle(Angle0), m_foregroundColor(Qt::black), m_backgroundColor(Qt::white), m_whitespace(10), m_angle(Angle0),
m_barcodeWidth(0), m_securityLevel(0), m_pdf417CodeWords(928), m_inputMode(UNICODE_INPUT_MODE) m_barcodeWidth(0), m_securityLevel(0), m_pdf417CodeWords(928), m_inputMode(UNICODE_INPUT_MODE),
m_option3(0)
{} {}
BarcodeItem::~BarcodeItem() BarcodeItem::~BarcodeItem()
@ -74,6 +75,7 @@ void BarcodeItem::paint(QPainter *ppainter, const QStyleOptionGraphicsItem *opti
bc.setSecurityLevel(m_securityLevel); bc.setSecurityLevel(m_securityLevel);
bc.setPdf417CodeWords(m_pdf417CodeWords); bc.setPdf417CodeWords(m_pdf417CodeWords);
bc.setHideText(m_hideText); bc.setHideText(m_hideText);
bc.setOption3(m_option3);
if (isSelected()) ppainter->setOpacity(Const::SELECTION_OPACITY); if (isSelected()) ppainter->setOpacity(Const::SELECTION_OPACITY);
@ -291,7 +293,24 @@ void BarcodeItem::setHideText(bool hideText)
m_hideText = hideText; m_hideText = hideText;
if (!isLoading()){ if (!isLoading()){
update(); update();
notify("hideText",!m_hideText,m_hideText); notify("hideText", !m_hideText, m_hideText);
}
}
}
int BarcodeItem::option3() const
{
return m_option3;
}
void BarcodeItem::setOption3(int option3)
{
if (m_option3 != option3){
int oldValue = m_option3;
m_option3 = option3;
if(!isLoading()){
update();
notify("option3", oldValue, m_option3);
} }
} }
} }

5
limereport/items/lrbarcodeitem.h
View File

@ -52,6 +52,7 @@ class BarcodeItem : public LimeReport::ContentItemDesignIntf {
Q_PROPERTY(int pdf417CodeWords READ pdf417CodeWords WRITE setPdf417CodeWords) Q_PROPERTY(int pdf417CodeWords READ pdf417CodeWords WRITE setPdf417CodeWords)
Q_PROPERTY(InputMode inputMode READ inputMode WRITE setInputMode) Q_PROPERTY(InputMode inputMode READ inputMode WRITE setInputMode)
Q_PROPERTY(bool hideText READ hideText WRITE setHideText) Q_PROPERTY(bool hideText READ hideText WRITE setHideText)
Q_PROPERTY(int option3 READ option3 WRITE setOption3)
public: public:
// enum BarcodeType {QRCODE=58,CODE128=20,DATAMATRIX=71,MAXICODE=57,MICROPDF417=84}; // enum BarcodeType {QRCODE=58,CODE128=20,DATAMATRIX=71,MAXICODE=57,MICROPDF417=84};
// enum BarcodeType {CODE_11=1,C25MATRIX=2,QRCODE=58,CODE128=20,DATAMATRIX=71,MAXICODE=57,MICROPDF417=84, // enum BarcodeType {CODE_11=1,C25MATRIX=2,QRCODE=58,CODE128=20,DATAMATRIX=71,MAXICODE=57,MICROPDF417=84,
@ -192,6 +193,9 @@ public:
bool hideText() const; bool hideText() const;
void setHideText(bool hideText); void setHideText(bool hideText);
int option3() const;
void setOption3(int option3);
private: private:
QString m_content; QString m_content;
QString m_datasource; QString m_datasource;
@ -207,6 +211,7 @@ private:
int m_pdf417CodeWords; int m_pdf417CodeWords;
InputMode m_inputMode; InputMode m_inputMode;
bool m_hideText; bool m_hideText;
int m_option3;
}; };
} }