Added RawText type for text and barcode objects.

2017-05-06 20:08:17 -04:00
parent 6d764bbf4d
commit 409ca1bf57
8 changed files with 198 additions and 39 deletions
@@ -123,7 +123,7 @@ namespace glabels
 	///
 	QString LabelModelBarcodeObject::bcData() const
 	{
-		return mBcData;
+		return mBcData.toString();
 	}


@@ -132,7 +132,7 @@ namespace glabels
 	///
 	void LabelModelBarcodeObject::setBcData( const QString& value )
 	{
-		if ( mBcData != value )
+		if ( mBcData.toString() != value )
 		{
 			mBcData = value;
 			update();
@@ -348,10 +348,14 @@ namespace glabels
 		{
 			QString text;

-			if ( mEditorBarcode->isEmpty() )
+			if ( mBcData.isEmpty() )
 			{
 				text = tr("No barcode data");
 			}
+			else if ( mBcData.hasPlaceHolders() )
+			{
+				text = mBcData.toString();
+			}
 			else
 			{
 				text = tr("Invalid barcode data");