mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2024-10-01 01:26:01 -04:00
Merge pull request #378 from keepassxreboot/feature/view-references
Highlight reference field in Database view
This commit is contained in:
commit
a1e1a33308
@ -254,6 +254,17 @@ bool Entry::isExpired() const
|
||||
return m_data.timeInfo.expires() && m_data.timeInfo.expiryTime() < QDateTime::currentDateTimeUtc();
|
||||
}
|
||||
|
||||
bool Entry::hasReferences() const
|
||||
{
|
||||
const QList<QString> keyList = EntryAttributes::DefaultAttributes;
|
||||
for (const QString& key : keyList) {
|
||||
if (m_attributes->isReference(key)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
EntryAttributes* Entry::attributes()
|
||||
{
|
||||
return m_attributes;
|
||||
@ -679,20 +690,20 @@ QString Entry::resolvePlaceholder(const QString& str) const
|
||||
// using format from http://keepass.info/help/base/fieldrefs.html at the time of writing,
|
||||
// but supporting lookups of standard fields and references by UUID only
|
||||
|
||||
QRegExp tmpRegExp("\\{REF:([TUPAN])@I:([^}]+)\\}", Qt::CaseInsensitive, QRegExp::RegExp2);
|
||||
if (tmpRegExp.indexIn(result) != -1) {
|
||||
QRegExp* tmpRegExp = m_attributes->referenceRegExp();
|
||||
if (tmpRegExp->indexIn(result) != -1) {
|
||||
// cap(0) contains the whole reference
|
||||
// cap(1) contains which field is wanted
|
||||
// cap(2) contains the uuid of the referenced entry
|
||||
Entry* tmpRefEntry = m_group->database()->resolveEntry(Uuid(QByteArray::fromHex(tmpRegExp.cap(2).toLatin1())));
|
||||
Entry* tmpRefEntry = m_group->database()->resolveEntry(Uuid(QByteArray::fromHex(tmpRegExp->cap(2).toLatin1())));
|
||||
if (tmpRefEntry) {
|
||||
// entry found, get the relevant field
|
||||
QString tmpRefField = tmpRegExp.cap(1).toLower();
|
||||
if (tmpRefField == "t") result.replace(tmpRegExp.cap(0), tmpRefEntry->title(), Qt::CaseInsensitive);
|
||||
else if (tmpRefField == "u") result.replace(tmpRegExp.cap(0), tmpRefEntry->username(), Qt::CaseInsensitive);
|
||||
else if (tmpRefField == "p") result.replace(tmpRegExp.cap(0), tmpRefEntry->password(), Qt::CaseInsensitive);
|
||||
else if (tmpRefField == "a") result.replace(tmpRegExp.cap(0), tmpRefEntry->url(), Qt::CaseInsensitive);
|
||||
else if (tmpRefField == "n") result.replace(tmpRegExp.cap(0), tmpRefEntry->notes(), Qt::CaseInsensitive);
|
||||
QString tmpRefField = tmpRegExp->cap(1).toLower();
|
||||
if (tmpRefField == "t") result.replace(tmpRegExp->cap(0), tmpRefEntry->title(), Qt::CaseInsensitive);
|
||||
else if (tmpRefField == "u") result.replace(tmpRegExp->cap(0), tmpRefEntry->username(), Qt::CaseInsensitive);
|
||||
else if (tmpRefField == "p") result.replace(tmpRegExp->cap(0), tmpRefEntry->password(), Qt::CaseInsensitive);
|
||||
else if (tmpRefField == "a") result.replace(tmpRegExp->cap(0), tmpRefEntry->url(), Qt::CaseInsensitive);
|
||||
else if (tmpRefField == "n") result.replace(tmpRegExp->cap(0), tmpRefEntry->notes(), Qt::CaseInsensitive);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -79,6 +79,7 @@ public:
|
||||
QString password() const;
|
||||
QString notes() const;
|
||||
bool isExpired() const;
|
||||
bool hasReferences() const;
|
||||
EntryAttributes* attributes();
|
||||
const EntryAttributes* attributes() const;
|
||||
EntryAttachments* attachments();
|
||||
|
@ -28,6 +28,7 @@ const QString EntryAttributes::RememberCmdExecAttr = "_EXEC_CMD";
|
||||
|
||||
EntryAttributes::EntryAttributes(QObject* parent)
|
||||
: QObject(parent)
|
||||
, m_referenceRegExp("\\{REF:([TUPAN])@I:([^}]+)\\}", Qt::CaseInsensitive, QRegExp::RegExp2)
|
||||
{
|
||||
clear();
|
||||
}
|
||||
@ -69,6 +70,25 @@ bool EntryAttributes::isProtected(const QString& key) const
|
||||
return m_protectedAttributes.contains(key);
|
||||
}
|
||||
|
||||
bool EntryAttributes::isReference(const QString& key) const
|
||||
{
|
||||
if (!m_attributes.contains(key)) {
|
||||
Q_ASSERT(false);
|
||||
return false;
|
||||
}
|
||||
|
||||
QString data = value(key);
|
||||
if (m_referenceRegExp.indexIn(data) != -1) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
QRegExp* EntryAttributes::referenceRegExp()
|
||||
{
|
||||
return &m_referenceRegExp;
|
||||
}
|
||||
|
||||
void EntryAttributes::set(const QString& key, const QString& value, bool protect)
|
||||
{
|
||||
bool emitModified = false;
|
||||
|
@ -35,6 +35,8 @@ public:
|
||||
QString value(const QString& key) const;
|
||||
bool contains(const QString& key) const;
|
||||
bool isProtected(const QString& key) const;
|
||||
bool isReference(const QString& key) const;
|
||||
QRegExp* referenceRegExp();
|
||||
void set(const QString& key, const QString& value, bool protect = false);
|
||||
void remove(const QString& key);
|
||||
void rename(const QString& oldKey, const QString& newKey);
|
||||
@ -71,6 +73,7 @@ Q_SIGNALS:
|
||||
private:
|
||||
QMap<QString, QString> m_attributes;
|
||||
QSet<QString> m_protectedAttributes;
|
||||
QRegExp m_referenceRegExp;
|
||||
};
|
||||
|
||||
#endif // KEEPASSX_ENTRYATTRIBUTES_H
|
||||
|
@ -19,6 +19,7 @@
|
||||
|
||||
#include <QFont>
|
||||
#include <QMimeData>
|
||||
#include <QPalette>
|
||||
|
||||
#include "core/DatabaseIcons.h"
|
||||
#include "core/Entry.h"
|
||||
@ -127,8 +128,10 @@ QVariant EntryModel::data(const QModelIndex& index, int role) const
|
||||
}
|
||||
|
||||
Entry* entry = entryFromIndex(index);
|
||||
EntryAttributes* attr = entry->attributes();
|
||||
|
||||
if (role == Qt::DisplayRole) {
|
||||
QString result;
|
||||
switch (index.column()) {
|
||||
case ParentGroup:
|
||||
if (entry->group()) {
|
||||
@ -136,11 +139,23 @@ QVariant EntryModel::data(const QModelIndex& index, int role) const
|
||||
}
|
||||
break;
|
||||
case Title:
|
||||
return entry->title();
|
||||
result = entry->resolvePlaceholder(entry->title());
|
||||
if (attr->isReference(EntryAttributes::TitleKey)) {
|
||||
result.prepend(tr("Ref: ","Reference abbreviation"));
|
||||
}
|
||||
return result;
|
||||
case Username:
|
||||
return entry->username();
|
||||
result = entry->resolvePlaceholder(entry->username());
|
||||
if (attr->isReference(EntryAttributes::UserNameKey)) {
|
||||
result.prepend(tr("Ref: ","Reference abbreviation"));
|
||||
}
|
||||
return result;
|
||||
case Url:
|
||||
return entry->url();
|
||||
result = entry->resolvePlaceholder(entry->url());
|
||||
if (attr->isReference(EntryAttributes::URLKey)) {
|
||||
result.prepend(tr("Ref: ","Reference abbreviation"));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
else if (role == Qt::DecorationRole) {
|
||||
@ -166,6 +181,12 @@ QVariant EntryModel::data(const QModelIndex& index, int role) const
|
||||
}
|
||||
return font;
|
||||
}
|
||||
else if (role == Qt::TextColorRole) {
|
||||
if (entry->hasReferences()) {
|
||||
QPalette p;
|
||||
return QVariant(p.color(QPalette::Active, QPalette::Mid));
|
||||
}
|
||||
}
|
||||
|
||||
return QVariant();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user