Started hooking up barcode to object editor.

This commit is contained in:
Jim Evins
2017-04-30 22:56:34 -04:00
parent fdce71b042
commit 0b9609493a
4 changed files with 279 additions and 219 deletions
+49
View File
@@ -22,6 +22,7 @@
#include "LabelModel.h"
#include "LabelModelObject.h"
#include "LabelModelBarcodeObject.h"
#include "LabelModelBoxObject.h"
#include "LabelModelEllipseObject.h"
#include "LabelModelImageObject.h"
@@ -62,6 +63,7 @@ namespace glabels
lineColorButton->init( "No line", QColor(0,0,0,0), QColor(0,0,0,255) );
fillColorButton->init( "No fill", QColor(0,0,0,0), QColor(0,0,0,255) );
textColorButton->init( "Default", QColor(0,0,0,255), QColor(0,0,0,255) );
barcodeColorButton->init( "Default", QColor(0,0,0,255), QColor(0,0,0,255) );
shadowColorButton->init( "Default", QColor(0,0,0,255), QColor(0,0,0,255) );
textInsertFieldCombo->setName( "Insert Field" );
@@ -240,6 +242,21 @@ namespace glabels
}
void ObjectEditor::loadBarcodePage()
{
if ( mObject )
{
mBlocked = true;
barcodeShowTextCheck->setChecked( mObject->bcTextFlag() );
barcodeChecksumCheck->setChecked( mObject->bcChecksumFlag() );
barcodeColorButton->setColorNode( mObject->bcColorNode() );
mBlocked = false;
}
}
void ObjectEditor::loadShadowPage()
{
if ( mObject )
@@ -412,6 +429,23 @@ namespace glabels
setEnabled( true );
}
else if ( dynamic_cast<LabelModelBarcodeObject*>(mObject) )
{
titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-barcode.svg") );
titleLabel->setText( tr("Barcode object properties") );
notebook->addTab( barcodePage, "barcode" );
notebook->addTab( posSizePage, "position/size" );
sizeRectFrame->setVisible( true );
sizeOriginalSizeGroup->setVisible( false );
sizeLineFrame->setVisible( false );
loadBarcodePage();
loadPositionPage();
setEnabled( true );
}
else
{
Q_ASSERT_X( false, "ObjectEditor::onSelectionChanged", "Invalid object" );
@@ -659,6 +693,21 @@ namespace glabels
}
void ObjectEditor::onBarcodeControlsChanged()
{
if ( !mBlocked )
{
mBlocked = true;
mObject->setBcTextFlag( barcodeShowTextCheck->isChecked() );
mObject->setBcChecksumFlag( barcodeChecksumCheck->isChecked() );
mObject->setBcColorNode( barcodeColorButton->colorNode() );
mBlocked = false;
}
}
void ObjectEditor::onResetImageSize()
{
mObject->setSize( mObject->naturalSize() );