Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Increment per item, not per merge record.

Browse Source
This commit is contained in:
Jim Evins
2019-03-24 22:33:40 -04:00
parent efbb052856
commit 54a66dfd8f
7 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/Variable.cpp
+12 -12
View File
@@ -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;