diff --git a/glabels/EditVariableDialog.cpp b/glabels/EditVariableDialog.cpp index 4d3b84d..4a1135e 100644 --- a/glabels/EditVariableDialog.cpp +++ b/glabels/EditVariableDialog.cpp @@ -37,8 +37,8 @@ namespace // All variable increments. (must be in sorted order) const QVector allIncrements = { glabels::model::Variable::Increment::NEVER, + glabels::model::Variable::Increment::PER_ITEM, glabels::model::Variable::Increment::PER_COPY, - glabels::model::Variable::Increment::PER_MERGE_RECORD, glabels::model::Variable::Increment::PER_PAGE }; } diff --git a/model/PageRenderer.cpp b/model/PageRenderer.cpp index fc27d2c..8af7d17 100644 --- a/model/PageRenderer.cpp +++ b/model/PageRenderer.cpp @@ -283,6 +283,7 @@ namespace glabels iLabel++; iCurrentPage = iLabel / mNLabelsPerPage; + mVariables->incrementVariablesOnItem(); mVariables->incrementVariablesOnCopy(); if ( (iLabel % mNLabelsPerPage) == 0 /* starting a new page */ ) { @@ -341,7 +342,7 @@ namespace glabels iLabel++; iCurrentPage = iLabel / mNLabelsPerPage; - mVariables->incrementVariablesOnMerge(); + mVariables->incrementVariablesOnItem(); if ( iRecord == 0 ) { mVariables->incrementVariablesOnCopy(); diff --git a/model/Variable.cpp b/model/Variable.cpp index 8b81a86..1cdca5d 100644 --- a/model/Variable.cpp +++ b/model/Variable.cpp @@ -90,9 +90,9 @@ namespace glabels } - void Variable::incrementValueOnCopy() + void Variable::incrementValueOnItem() { - if ( mIncrement == Increment::PER_COPY ) + if ( mIncrement == Increment::PER_ITEM ) { switch (mType) { @@ -110,9 +110,9 @@ namespace glabels } - void Variable::incrementValueOnMerge() + void Variable::incrementValueOnCopy() { - if ( mIncrement == Increment::PER_MERGE_RECORD ) + if ( mIncrement == Increment::PER_COPY ) { switch (mType) { @@ -219,10 +219,10 @@ namespace glabels { case Increment::NEVER: return tr("Never"); + case Increment::PER_ITEM: + return tr("Per item"); case Increment::PER_COPY: return tr("Per copy"); - case Increment::PER_MERGE_RECORD: - return tr("Per merge record"); case Increment::PER_PAGE: return tr("Per page"); } @@ -235,10 +235,10 @@ namespace glabels { case Increment::NEVER: return "never"; + case Increment::PER_ITEM: + return "per_item"; case Increment::PER_COPY: return "per_copy"; - case Increment::PER_MERGE_RECORD: - return "per_merge_record"; case Increment::PER_PAGE: return "per_page"; } @@ -251,14 +251,14 @@ namespace glabels { return Increment::NEVER; } + else if ( id == "per_item" ) + { + return Increment::PER_ITEM; + } else if ( id == "per_copy" ) { return Increment::PER_COPY; } - else if ( id == "per_merge_record" ) - { - return Increment::PER_MERGE_RECORD; - } else if ( id == "per_page" ) { return Increment::PER_PAGE; diff --git a/model/Variable.h b/model/Variable.h index 3feb694..95f3dec 100644 --- a/model/Variable.h +++ b/model/Variable.h @@ -46,8 +46,8 @@ namespace glabels enum class Increment { NEVER, + PER_ITEM, PER_COPY, - PER_MERGE_RECORD, PER_PAGE }; @@ -71,8 +71,8 @@ namespace glabels QString stepSize() const; void resetValue(); + void incrementValueOnItem(); void incrementValueOnCopy(); - void incrementValueOnMerge(); void incrementValueOnPage(); QString value() const; diff --git a/model/Variables.cpp b/model/Variables.cpp index 9bf149f..03fa927 100644 --- a/model/Variables.cpp +++ b/model/Variables.cpp @@ -97,6 +97,18 @@ namespace glabels } + /// + /// Increment variables on item + /// + void Variables::incrementVariablesOnItem() + { + for ( auto& v : *this ) + { + v.incrementValueOnItem(); + } + } + + /// /// Increment variables on copy /// @@ -109,18 +121,6 @@ namespace glabels } - /// - /// Increment variables on merge record - /// - void Variables::incrementVariablesOnMerge() - { - for ( auto& v : *this ) - { - v.incrementValueOnMerge(); - } - } - - /// /// Increment variables on page /// diff --git a/model/Variables.h b/model/Variables.h index ec7b578..379d56f 100644 --- a/model/Variables.h +++ b/model/Variables.h @@ -64,8 +64,8 @@ namespace glabels void replaceVariable( const QString& name, const Variable& variable ); void resetVariables(); + void incrementVariablesOnItem(); void incrementVariablesOnCopy(); - void incrementVariablesOnMerge(); void incrementVariablesOnPage(); diff --git a/translations/glabels_C.ts b/translations/glabels_C.ts index f7cdb4e..75a8f11 100644 --- a/translations/glabels_C.ts +++ b/translations/glabels_C.ts @@ -1072,10 +1072,6 @@ Per copy - - Per merge record - - Per page @@ -1088,6 +1084,10 @@ Floating Point + + Per item + + VariablesView