Fix broken translations in dive list filter plus simplify strings

Fix some broken translations in the dive list filter UI by adding
Q_OBJECT line to the class definitions of filter classes.

Plus simplify some strings given to translation by separating parts
like ": ".

Suggested-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Suggested-by: Jan Mulder <jlmulder@xs4all.nl>
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
This commit is contained in:
Stefan Fuchs 2018-09-09 10:25:42 +02:00 committed by bstoeger
parent d1060319d7
commit 56fda691ec
2 changed files with 9 additions and 4 deletions

View file

@ -541,23 +541,23 @@ void FilterBase::hideEvent(QHideEvent *event)
TagFilter::TagFilter(QWidget *parent) : FilterBase(TagFilterModel::instance(), parent) TagFilter::TagFilter(QWidget *parent) : FilterBase(TagFilterModel::instance(), parent)
{ {
ui.label->setText(tr("Tags: ")); ui.label->setText(tr("Tags") + QStringLiteral(": "));
} }
BuddyFilter::BuddyFilter(QWidget *parent) : FilterBase(BuddyFilterModel::instance(), parent) BuddyFilter::BuddyFilter(QWidget *parent) : FilterBase(BuddyFilterModel::instance(), parent)
{ {
ui.label->setText(tr("Person: ")); ui.label->setText(tr("Person") + QStringLiteral(": "));
ui.label->setToolTip(tr("Searches for buddies and divemasters")); ui.label->setToolTip(tr("Searches for buddies and divemasters"));
} }
LocationFilter::LocationFilter(QWidget *parent) : FilterBase(LocationFilterModel::instance(), parent) LocationFilter::LocationFilter(QWidget *parent) : FilterBase(LocationFilterModel::instance(), parent)
{ {
ui.label->setText(tr("Location: ")); ui.label->setText(tr("Location") + QStringLiteral(": "));
} }
SuitFilter::SuitFilter(QWidget *parent) : FilterBase(SuitsFilterModel::instance(), parent) SuitFilter::SuitFilter(QWidget *parent) : FilterBase(SuitsFilterModel::instance(), parent)
{ {
ui.label->setText(tr("Suits: ")); ui.label->setText(tr("Suits") + QStringLiteral(": "));
} }
MultiFilter::MultiFilter(QWidget *parent) : QWidget(parent) MultiFilter::MultiFilter(QWidget *parent) : QWidget(parent)

View file

@ -167,6 +167,7 @@ public:
}; };
class FilterBase : public QWidget { class FilterBase : public QWidget {
Q_OBJECT
void addContextMenuEntry(const QString &s, void (FilterModelBase::*)()); void addContextMenuEntry(const QString &s, void (FilterModelBase::*)());
protected: protected:
FilterBase(FilterModelBase *model, QWidget *parent = 0); FilterBase(FilterModelBase *model, QWidget *parent = 0);
@ -178,21 +179,25 @@ protected:
}; };
class TagFilter : public FilterBase { class TagFilter : public FilterBase {
Q_OBJECT
public: public:
TagFilter(QWidget *parent = 0); TagFilter(QWidget *parent = 0);
}; };
class BuddyFilter : public FilterBase { class BuddyFilter : public FilterBase {
Q_OBJECT
public: public:
BuddyFilter(QWidget *parent = 0); BuddyFilter(QWidget *parent = 0);
}; };
class SuitFilter : public FilterBase { class SuitFilter : public FilterBase {
Q_OBJECT
public: public:
SuitFilter(QWidget *parent = 0); SuitFilter(QWidget *parent = 0);
}; };
class LocationFilter : public FilterBase { class LocationFilter : public FilterBase {
Q_OBJECT
public: public:
LocationFilter(QWidget *parent = 0); LocationFilter(QWidget *parent = 0);
}; };