Fix minor typos (#37)
This commit is contained in:
committed by
Jim Evins
parent
9ff59a2cb5
commit
76c370bf52
@@ -24,7 +24,7 @@ gLabels-qt is the development version of the next major version of gLabels (4.0)
|
|||||||
gLabels-qt has been under off-and-on development for several years.
|
gLabels-qt has been under off-and-on development for several years.
|
||||||
It is still missing several features to bring it in parity with glabels-3.4. These include
|
It is still missing several features to bring it in parity with glabels-3.4. These include
|
||||||
|
|
||||||
- Compatability with older glabels project files
|
- Compatibility with older glabels project files
|
||||||
- An online manual
|
- An online manual
|
||||||
|
|
||||||
|
|
||||||
@@ -37,8 +37,8 @@ There are currently no official releases of gLabels 4.
|
|||||||
### Continuous Integration Snapshots
|
### Continuous Integration Snapshots
|
||||||
|
|
||||||
Continuous integration snapshots are not official releases. These snapshots represent the latest
|
Continuous integration snapshots are not official releases. These snapshots represent the latest
|
||||||
bleading-edge development (unstable) code. Please, DO NOT use it in a production environment. Do not
|
bleeding-edge development (unstable) code. Please, DO NOT use it in a production environment. Do not
|
||||||
expect compatability or consistency of features between snapshots.
|
expect compatibility or consistency of features between snapshots.
|
||||||
|
|
||||||
| Platform | Files |
|
| Platform | Files |
|
||||||
|:---------|:------|
|
|:---------|:------|
|
||||||
|
|||||||
@@ -246,7 +246,7 @@ namespace glabels
|
|||||||
glbarcode::Factory::registerType( "zint::usps", Zint::Usps::create );
|
glbarcode::Factory::registerType( "zint::usps", Zint::Usps::create );
|
||||||
glbarcode::Factory::registerType( "zint::pls", Zint::Pls::create );
|
glbarcode::Factory::registerType( "zint::pls", Zint::Pls::create );
|
||||||
|
|
||||||
registerStyle( "ausp", "zint", tr("Austraila Post Standard"),
|
registerStyle( "ausp", "zint", tr("Australia Post Standard"),
|
||||||
false, false, true, false, "12345678901234567890123", true, 23 );
|
false, false, true, false, "12345678901234567890123", true, 23 );
|
||||||
|
|
||||||
registerStyle( "ausrp", "zint", tr("Australia Post Reply Paid"),
|
registerStyle( "ausrp", "zint", tr("Australia Post Reply Paid"),
|
||||||
@@ -303,7 +303,7 @@ namespace glabels
|
|||||||
registerStyle( "code128", "zint", tr("Code 128"),
|
registerStyle( "code128", "zint", tr("Code 128"),
|
||||||
true, true, true, false, "0000000000", true, 10 );
|
true, true, true, false, "0000000000", true, 10 );
|
||||||
|
|
||||||
registerStyle( "code128b", "zint", tr("Code 128 (Mode C supression)"),
|
registerStyle( "code128b", "zint", tr("Code 128 (Mode C suppression)"),
|
||||||
true, true, true, false, "0000000000", true, 10 );
|
true, true, true, false, "0000000000", true, 10 );
|
||||||
|
|
||||||
registerStyle( "daft", "zint", tr("DAFT Code"),
|
registerStyle( "daft", "zint", tr("DAFT Code"),
|
||||||
|
|||||||
@@ -171,7 +171,7 @@ namespace glabels
|
|||||||
|
|
||||||
|
|
||||||
///
|
///
|
||||||
/// Prefered N Property Getter
|
/// Preferred N Property Getter
|
||||||
///
|
///
|
||||||
int Style::preferedN() const
|
int Style::preferedN() const
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -217,7 +217,7 @@ namespace glabels
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* begining of a simple field. */
|
/* beginning of a simple field. */
|
||||||
field.append( c );
|
field.append( c );
|
||||||
state = SIMPLE;
|
state = SIMPLE;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ namespace glabels
|
|||||||
{
|
{
|
||||||
QList<QColor> colorList = readColorList();
|
QList<QColor> colorList = readColorList();
|
||||||
|
|
||||||
// Remove any occurances of this color already in list
|
// Remove any occurrences of this color already in list
|
||||||
colorList.removeAll( color );
|
colorList.removeAll( color );
|
||||||
|
|
||||||
// Now add to list
|
// Now add to list
|
||||||
|
|||||||
@@ -245,7 +245,7 @@ namespace glabels
|
|||||||
{
|
{
|
||||||
recordsTable->setColumnCount( mKeys.size() + 1 ); // Include extra column
|
recordsTable->setColumnCount( mKeys.size() + 1 ); // Include extra column
|
||||||
|
|
||||||
// First column = primay Key
|
// First column = primary Key
|
||||||
auto* item = new QTableWidgetItem( mPrimaryKey );
|
auto* item = new QTableWidgetItem( mPrimaryKey );
|
||||||
item->setFlags( Qt::ItemIsEnabled );
|
item->setFlags( Qt::ItemIsEnabled );
|
||||||
recordsTable->setHorizontalHeaderItem( 0, item );
|
recordsTable->setHorizontalHeaderItem( 0, item );
|
||||||
@@ -287,7 +287,7 @@ namespace glabels
|
|||||||
int iRow = 0;
|
int iRow = 0;
|
||||||
foreach ( merge::Record* record, records )
|
foreach ( merge::Record* record, records )
|
||||||
{
|
{
|
||||||
// First column for primay field
|
// First column for primary field
|
||||||
auto* item = new QTableWidgetItem();
|
auto* item = new QTableWidgetItem();
|
||||||
if ( record->contains( mPrimaryKey ) )
|
if ( record->contains( mPrimaryKey ) )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1174,7 +1174,7 @@ namespace glabels
|
|||||||
{
|
{
|
||||||
alreadyInitialized = true;
|
alreadyInitialized = true;
|
||||||
|
|
||||||
// Set some realistic defaults based on symetric sheet using previosly chosen values
|
// Set some realistic defaults based on symmetric sheet using previously chosen values
|
||||||
nxSpin->setValue( nxMax );
|
nxSpin->setValue( nxMax );
|
||||||
nySpin->setValue( nyMax );
|
nySpin->setValue( nyMax );
|
||||||
x0Spin->setValue( (pageW - (nxMax-1)*dxMin - w) / 2 );
|
x0Spin->setValue( (pageW - (nxMax-1)*dxMin - w) / 2 );
|
||||||
@@ -1333,7 +1333,7 @@ namespace glabels
|
|||||||
{
|
{
|
||||||
alreadyInitialized = true;
|
alreadyInitialized = true;
|
||||||
|
|
||||||
// Set some realistic defaults based on symetric sheet using previosly chosen values
|
// Set some realistic defaults based on symmetric sheet using previously chosen values
|
||||||
nxSpin1->setValue( nxMax );
|
nxSpin1->setValue( nxMax );
|
||||||
nySpin1->setValue( nyMax - nyMax/2 );
|
nySpin1->setValue( nyMax - nyMax/2 );
|
||||||
x0Spin1->setValue( (pageW - (nxMax-1)*dxMin - w) / 2 );
|
x0Spin1->setValue( (pageW - (nxMax-1)*dxMin - w) / 2 );
|
||||||
|
|||||||
@@ -65,7 +65,7 @@
|
|||||||
<string>New Product</string>
|
<string>New Product</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="description">
|
<property name="description">
|
||||||
<string>Create a a new product template from scratch</string>
|
<string>Create a new product template from scratch</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|||||||
@@ -31,9 +31,9 @@ namespace glbarcode
|
|||||||
/**
|
/**
|
||||||
* @class BarcodeCepnet BarcodeCepnet.h glbarcode/BarcodeCepnet.h
|
* @class BarcodeCepnet BarcodeCepnet.h glbarcode/BarcodeCepnet.h
|
||||||
*
|
*
|
||||||
* 8 digit *CEPNET* barcode (Brazillian Post, based on POSTNET), extends BarcodePostnet
|
* 8 digit *CEPNET* barcode (Brazilian Post, based on POSTNET), extends BarcodePostnet
|
||||||
*
|
*
|
||||||
* @image html sample-cepnet.svg "Sample Brazillian Post CEPNET Barcode"
|
* @image html sample-cepnet.svg "Sample Brazilian Post CEPNET Barcode"
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* ### Input Data Format ###
|
* ### Input Data Format ###
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ namespace glbarcode
|
|||||||
/* Left frame bar */
|
/* Left frame bar */
|
||||||
code += frameSymbol;
|
code += frameSymbol;
|
||||||
|
|
||||||
/* process each digit, adding approptiate symbol */
|
/* process each digit, adding appropriate symbol */
|
||||||
int sum = 0;
|
int sum = 0;
|
||||||
for (char c : cookedData)
|
for (char c : cookedData)
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -65,7 +65,7 @@ namespace glabels
|
|||||||
|
|
||||||
|
|
||||||
////////////////////////////
|
////////////////////////////
|
||||||
// Attribue Methods
|
// Attribute Methods
|
||||||
////////////////////////////
|
////////////////////////////
|
||||||
ModelObject* owner() const;
|
ModelObject* owner() const;
|
||||||
Location location() const;
|
Location location() const;
|
||||||
|
|||||||
@@ -239,7 +239,7 @@ namespace glabels
|
|||||||
QString version = XmlUtil::getStringAttr( node, "version", "" );
|
QString version = XmlUtil::getStringAttr( node, "version", "" );
|
||||||
if ( version != "4.0" )
|
if ( version != "4.0" )
|
||||||
{
|
{
|
||||||
qWarning() << "TODO: compatability mode.";
|
qWarning() << "TODO: compatibility mode.";
|
||||||
}
|
}
|
||||||
|
|
||||||
auto* label = new Model();
|
auto* label = new Model();
|
||||||
@@ -738,7 +738,7 @@ namespace glabels
|
|||||||
void
|
void
|
||||||
XmlLabelParser::parsePixdataNode( const QDomElement& node, DataCache& data )
|
XmlLabelParser::parsePixdataNode( const QDomElement& node, DataCache& data )
|
||||||
{
|
{
|
||||||
// TODO, compatability with glabels-3
|
// TODO, compatibility with glabels-3
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user