Tweaking of new label dialog.

2015-08-23 20:30:50 -04:00
parent 85541c2ec3
commit ea8a5d084c
9 changed files with 323 additions and 118 deletions
@@ -64,13 +64,14 @@ namespace glabels
 		{
 			TemplatePickerItem *tItem = dynamic_cast<TemplatePickerItem *>(item);

-			if ( tItem->tmplate()->name().contains( searchString, Qt::CaseInsensitive ) &&
-			     (isoMask == tItem->tmplate()->isSizeIso()) &&
-			     (usMask == tItem->tmplate()->isSizeUs()) &&
-			     (otherMask == tItem->tmplate()->isSizeOther()) )
+			bool sizeMask =
+				(isoMask   && tItem->tmplate()->isSizeIso())   ||
+				(usMask    && tItem->tmplate()->isSizeUs())    ||
+				(otherMask && tItem->tmplate()->isSizeOther());
+
+			if ( tItem->tmplate()->name().contains( searchString, Qt::CaseInsensitive ) && sizeMask )
 			{
 				item->setHidden( false );
-
 			}
 			else
 			{