From aba47719b28a6b3be0f82aff3903e2ccf0b5b0b4 Mon Sep 17 00:00:00 2001 From: tooomm Date: Sun, 4 Feb 2018 19:47:12 +0100 Subject: [PATCH] properly display logical connectors (#3072) they should not get transalted as well --- cockatrice/src/cardfilter.cpp | 8 ++++---- cockatrice/src/filterbuilder.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cockatrice/src/cardfilter.cpp b/cockatrice/src/cardfilter.cpp index b3229d2d..8bee1b65 100644 --- a/cockatrice/src/cardfilter.cpp +++ b/cockatrice/src/cardfilter.cpp @@ -4,13 +4,13 @@ const char *CardFilter::typeName(Type t) { switch (t) { case TypeAnd: - return "and"; + return "AND"; case TypeOr: - return "or"; + return "OR"; case TypeAndNot: - return "and not"; + return "AND NOT"; case TypeOrNot: - return "or not"; + return "OR NOT"; default: return ""; } diff --git a/cockatrice/src/filterbuilder.cpp b/cockatrice/src/filterbuilder.cpp index 27c93781..150cc63e 100644 --- a/cockatrice/src/filterbuilder.cpp +++ b/cockatrice/src/filterbuilder.cpp @@ -17,7 +17,7 @@ FilterBuilder::FilterBuilder(QWidget *parent) : QWidget(parent) typeCombo = new QComboBox; typeCombo->setObjectName("typeCombo"); for (int i = 0; i < CardFilter::TypeEnd; i++) - typeCombo->addItem(tr(CardFilter::typeName(static_cast(i))), QVariant(i)); + typeCombo->addItem(CardFilter::typeName(static_cast(i)), QVariant(i)); QPushButton *ok = new QPushButton(QPixmap("theme:icons/increment"), QString()); ok->setObjectName("ok");