diff --git a/share/translations/keepassxc_en.ts b/share/translations/keepassxc_en.ts index 9c831227d..437340eb7 100644 --- a/share/translations/keepassxc_en.ts +++ b/share/translations/keepassxc_en.ts @@ -3770,14 +3770,6 @@ Supported extensions are: %1. Datetime modified - - Accessed: - - - - Datetime accessed - - Uuid: @@ -4151,10 +4143,6 @@ Would you like to overwrite the existing attachment? Modified - - Accessed - - Attachments @@ -4191,10 +4179,6 @@ Would you like to overwrite the existing attachment? Last modification date - - Last access date - - Attached files diff --git a/src/gui/EditWidgetProperties.cpp b/src/gui/EditWidgetProperties.cpp index 3e26352d3..462d4953b 100644 --- a/src/gui/EditWidgetProperties.cpp +++ b/src/gui/EditWidgetProperties.cpp @@ -50,7 +50,6 @@ void EditWidgetProperties::setFields(const TimeInfo& timeInfo, const QUuid& uuid static const QString timeFormat("d MMM yyyy HH:mm:ss"); m_ui->modifiedEdit->setText(timeInfo.lastModificationTime().toLocalTime().toString(timeFormat)); m_ui->createdEdit->setText(timeInfo.creationTime().toLocalTime().toString(timeFormat)); - m_ui->accessedEdit->setText(timeInfo.lastAccessTime().toLocalTime().toString(timeFormat)); m_ui->uuidEdit->setText(uuid.toRfc4122().toHex()); } diff --git a/src/gui/EditWidgetProperties.ui b/src/gui/EditWidgetProperties.ui index 0caa9ef27..a96dfc7d3 100644 --- a/src/gui/EditWidgetProperties.ui +++ b/src/gui/EditWidgetProperties.ui @@ -83,27 +83,7 @@ - - - - Accessed: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Datetime accessed - - - true - - - - + Uuid: @@ -113,7 +93,7 @@ - + Unique ID @@ -204,7 +184,6 @@ createdEdit modifiedEdit - accessedEdit uuidEdit diff --git a/src/gui/entry/EntryModel.cpp b/src/gui/entry/EntryModel.cpp index fc69f2f43..9e107fbf9 100644 --- a/src/gui/entry/EntryModel.cpp +++ b/src/gui/entry/EntryModel.cpp @@ -203,9 +203,6 @@ QVariant EntryModel::data(const QModelIndex& index, int role) const case Modified: result = Clock::toString(entry->timeInfo().lastModificationTime().toLocalTime()); return result; - case Accessed: - result = Clock::toString(entry->timeInfo().lastAccessTime().toLocalTime()); - return result; case Attachments: { // Display comma-separated list of attachments QList attachments = entry->attachments()->keys(); @@ -266,8 +263,6 @@ QVariant EntryModel::data(const QModelIndex& index, int role) const return entry->timeInfo().creationTime(); case Modified: return entry->timeInfo().lastModificationTime(); - case Accessed: - return entry->timeInfo().lastAccessTime(); case Paperclip: // Display entries with attachments above those without when // sorting ascendingly (and vice versa when sorting descendingly) @@ -400,8 +395,6 @@ QVariant EntryModel::headerData(int section, Qt::Orientation orientation, int ro return tr("Created"); case Modified: return tr("Modified"); - case Accessed: - return tr("Accessed"); case Attachments: return tr("Attachments"); case Size: @@ -441,8 +434,6 @@ QVariant EntryModel::headerData(int section, Qt::Orientation orientation, int ro return tr("Creation date"); case Modified: return tr("Last modification date"); - case Accessed: - return tr("Last access date"); case Attachments: return tr("Attached files"); case Size: diff --git a/src/gui/entry/EntryModel.h b/src/gui/entry/EntryModel.h index 7b7f17a1f..ff467ee97 100644 --- a/src/gui/entry/EntryModel.h +++ b/src/gui/entry/EntryModel.h @@ -43,7 +43,7 @@ public: Expires = 6, Created = 7, Modified = 8, - Accessed = 9, + Accessed = 9, // Kept for compatibility Paperclip = 10, Attachments = 11, Totp = 12, diff --git a/src/gui/entry/EntryView.cpp b/src/gui/entry/EntryView.cpp index bacf0c05f..2c176eccf 100644 --- a/src/gui/entry/EntryView.cpp +++ b/src/gui/entry/EntryView.cpp @@ -105,12 +105,16 @@ EntryView::EntryView(QWidget* parent) m_columnActions->setExclusive(false); for (int visualIndex = 0; visualIndex < header()->count(); ++visualIndex) { int logicalIndex = header()->logicalIndex(visualIndex); - QString caption = m_model->headerData(logicalIndex, Qt::Horizontal, Qt::DisplayRole).toString(); - if (caption.isEmpty()) { - caption = m_model->headerData(logicalIndex, Qt::Horizontal, Qt::ToolTipRole).toString(); + auto caption = m_model->headerData(logicalIndex, Qt::Horizontal, Qt::DisplayRole); + if (!caption.isValid()) { + caption = m_model->headerData(logicalIndex, Qt::Horizontal, Qt::ToolTipRole); + if (!caption.isValid()) { + // Ignored column, skip it + continue; + } } - auto action = m_headerMenu->addAction(caption); + auto action = m_headerMenu->addAction(caption.toString()); action->setCheckable(true); action->setData(logicalIndex); m_columnActions->addAction(action); @@ -478,7 +482,6 @@ void EntryView::resetViewToDefaults() header()->hideSection(EntryModel::Password); header()->hideSection(EntryModel::Expires); header()->hideSection(EntryModel::Created); - header()->hideSection(EntryModel::Accessed); header()->hideSection(EntryModel::Attachments); header()->hideSection(EntryModel::Size); header()->hideSection(EntryModel::PasswordStrength); @@ -515,6 +518,8 @@ void EntryView::resetViewToDefaults() void EntryView::onHeaderChanged() { m_model->setBackgroundColorVisible(isColumnHidden(EntryModel::Color)); + // Force hide accessed column + header()->hideSection(EntryModel::Accessed); } void EntryView::showEvent(QShowEvent* event)