Commit 385775fc authored by Glen Ditchfield's avatar Glen Ditchfield 🐛 Committed by Glen Ditchfield
Browse files

Use "tag" terminology consistently in the UI

The user interface uses "tag" and "category" as terms for the same thing.
Settle on "tag", for consistency among Akonadi applications.

GUI:
parent 81fcffb6
Pipeline #52376 passed with stage
in 11 minutes and 54 seconds
......@@ -281,7 +281,7 @@ ListView::ListView(const Akonadi::ETMCalendar::Ptr &calendar, QWidget *parent, b
d->mTreeWidget->headerItem()->setText(Summary_Column, i18n("Summary"));
d->mTreeWidget->headerItem()->setText(StartDateTime_Column, i18n("Start Date/Time"));
d->mTreeWidget->headerItem()->setText(EndDateTime_Column, i18n("End Date/Time"));
d->mTreeWidget->headerItem()->setText(Categories_Column, i18n("Categories"));
d->mTreeWidget->headerItem()->setText(Categories_Column, i18n("Tags"));
d->mTreeWidget->setWordWrap(true);
d->mTreeWidget->setAllColumnsShowFocus(true);
......
......@@ -263,7 +263,7 @@ QVariant TodoModel::data(const QModelIndex &index, int role) const
case DueDateColumn:
return todo->hasDueDate() ? QLocale().toString(todo->dtDue().toLocalTime().date(), QLocale::ShortFormat) : QVariant(QString());
case CategoriesColumn: {
QString categories = todo->categories().join(i18nc("delimiter for joining category names", ","));
QString categories = todo->categories().join(i18nc("delimiter for joining category/tag names", ","));
return QVariant(categories);
}
case DescriptionColumn:
......@@ -579,7 +579,7 @@ QVariant TodoModel::headerData(int column, Qt::Orientation orientation, int role
case DueDateColumn:
return QVariant(i18n("Due Date"));
case CategoriesColumn:
return QVariant(i18n("Categories"));
return QVariant(i18n("Tags"));
case DescriptionColumn:
return QVariant(i18n("Description"));
case CalendarColumn:
......
......@@ -44,11 +44,11 @@ TodoViewQuickSearch::TodoViewQuickSearch(const Akonadi::ETMCalendar::Ptr &calend
mCategoryCombo = new Akonadi::TagSelectionComboBox(this);
mCategoryCombo->setCheckable(true);
mCategoryCombo->setToolTip(i18nc("@info:tooltip", "Filter on these categories"));
mCategoryCombo->setToolTip(i18nc("@info:tooltip", "Filter on these tags"));
mCategoryCombo->setWhatsThis(i18nc("@info:whatsthis",
"Use this combobox to filter the to-dos that are shown by "
"a list of selected categories."));
const QString defaultText = i18nc("@item:inlistbox", "Select Categories");
"a list of selected tags."));
const QString defaultText = i18nc("@item:inlistbox", "Select Tags");
mCategoryCombo->lineEdit()->setPlaceholderText(defaultText);
connect(mCategoryCombo, &Akonadi::TagSelectionComboBox::selectionChanged, this, [this]() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment