mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2024-10-01 01:26:01 -04:00
add support for multiple autotype sequence, fix #559
This commit is contained in:
parent
065a85e05c
commit
b5cabbeb43
@ -39,6 +39,7 @@ configure_file(version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY)
|
|||||||
set(keepassx_SOURCES
|
set(keepassx_SOURCES
|
||||||
core/AutoTypeAssociations.cpp
|
core/AutoTypeAssociations.cpp
|
||||||
core/AsyncTask.h
|
core/AsyncTask.h
|
||||||
|
core/AutoTypeMatch.cpp
|
||||||
core/Config.cpp
|
core/Config.cpp
|
||||||
core/CsvParser.cpp
|
core/CsvParser.cpp
|
||||||
core/Database.cpp
|
core/Database.cpp
|
||||||
@ -137,6 +138,8 @@ set(keepassx_SOURCES
|
|||||||
gui/csvImport/CsvImportWizard.cpp
|
gui/csvImport/CsvImportWizard.cpp
|
||||||
gui/csvImport/CsvParserModel.cpp
|
gui/csvImport/CsvParserModel.cpp
|
||||||
gui/entry/AutoTypeAssociationsModel.cpp
|
gui/entry/AutoTypeAssociationsModel.cpp
|
||||||
|
gui/entry/AutoTypeMatchModel.cpp
|
||||||
|
gui/entry/AutoTypeMatchView.cpp
|
||||||
gui/entry/EditEntryWidget.cpp
|
gui/entry/EditEntryWidget.cpp
|
||||||
gui/entry/EditEntryWidget_p.h
|
gui/entry/EditEntryWidget_p.h
|
||||||
gui/entry/EntryAttachmentsModel.cpp
|
gui/entry/EntryAttachmentsModel.cpp
|
||||||
|
@ -27,6 +27,7 @@
|
|||||||
#include "autotype/AutoTypePlatformPlugin.h"
|
#include "autotype/AutoTypePlatformPlugin.h"
|
||||||
#include "autotype/AutoTypeSelectDialog.h"
|
#include "autotype/AutoTypeSelectDialog.h"
|
||||||
#include "autotype/WildcardMatcher.h"
|
#include "autotype/WildcardMatcher.h"
|
||||||
|
#include "core/AutoTypeMatch.h"
|
||||||
#include "core/Config.h"
|
#include "core/Config.h"
|
||||||
#include "core/Database.h"
|
#include "core/Database.h"
|
||||||
#include "core/Entry.h"
|
#include "core/Entry.h"
|
||||||
@ -136,7 +137,12 @@ void AutoType::executeAutoTypeActions(const Entry* entry, QWidget* hideWindow, c
|
|||||||
|
|
||||||
QString sequence;
|
QString sequence;
|
||||||
if (customSequence.isEmpty()) {
|
if (customSequence.isEmpty()) {
|
||||||
sequence = autoTypeSequence(entry);
|
QList<QString> sequences = autoTypeSequences(entry);
|
||||||
|
if(sequences.isEmpty()) {
|
||||||
|
sequence = "";
|
||||||
|
} else {
|
||||||
|
sequence = sequences.first();
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
sequence = customSequence;
|
sequence = customSequence;
|
||||||
}
|
}
|
||||||
@ -199,36 +205,36 @@ void AutoType::performGlobalAutoType(const QList<Database*>& dbList)
|
|||||||
|
|
||||||
m_inAutoType = true;
|
m_inAutoType = true;
|
||||||
|
|
||||||
QList<Entry*> entryList;
|
QList<AutoTypeMatch> matchList;
|
||||||
QHash<Entry*, QString> sequenceHash;
|
|
||||||
|
|
||||||
for (Database* db : dbList) {
|
for (Database* db : dbList) {
|
||||||
const QList<Entry*> dbEntries = db->rootGroup()->entriesRecursive();
|
const QList<Entry*> dbEntries = db->rootGroup()->entriesRecursive();
|
||||||
for (Entry* entry : dbEntries) {
|
for (Entry* entry : dbEntries) {
|
||||||
QString sequence = autoTypeSequence(entry, windowTitle);
|
const QList<QString> sequences = autoTypeSequences(entry, windowTitle);
|
||||||
|
for (QString sequence : sequences) {
|
||||||
if (!sequence.isEmpty()) {
|
if (!sequence.isEmpty()) {
|
||||||
entryList << entry;
|
matchList << AutoTypeMatch(entry,sequence);
|
||||||
sequenceHash.insert(entry, sequence);
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (entryList.isEmpty()) {
|
if (matchList.isEmpty()) {
|
||||||
m_inAutoType = false;
|
m_inAutoType = false;
|
||||||
QString message = tr("Couldn't find an entry that matches the window title:");
|
QString message = tr("Couldn't find an entry that matches the window title:");
|
||||||
message.append("\n\n");
|
message.append("\n\n");
|
||||||
message.append(windowTitle);
|
message.append(windowTitle);
|
||||||
MessageBox::information(nullptr, tr("Auto-Type - KeePassXC"), message);
|
MessageBox::information(nullptr, tr("Auto-Type - KeePassXC"), message);
|
||||||
} else if ((entryList.size() == 1) && !config()->get("security/autotypeask").toBool()) {
|
} else if ((matchList.size() == 1) && !config()->get("security/autotypeask").toBool()) {
|
||||||
m_inAutoType = false;
|
m_inAutoType = false;
|
||||||
performAutoType(entryList.first(), nullptr, sequenceHash[entryList.first()]);
|
performAutoType(matchList.first().entry, nullptr, matchList.first().sequence);
|
||||||
} else {
|
} else {
|
||||||
m_windowFromGlobal = m_plugin->activeWindow();
|
m_windowFromGlobal = m_plugin->activeWindow();
|
||||||
AutoTypeSelectDialog* selectDialog = new AutoTypeSelectDialog();
|
AutoTypeSelectDialog* selectDialog = new AutoTypeSelectDialog();
|
||||||
connect(
|
connect(selectDialog, SIGNAL(matchActivated(AutoTypeMatch)),
|
||||||
selectDialog, SIGNAL(entryActivated(Entry*, QString)), SLOT(performAutoTypeFromGlobal(Entry*, QString)));
|
SLOT(performAutoTypeFromGlobal(AutoTypeMatch)));
|
||||||
connect(selectDialog, SIGNAL(rejected()), SLOT(resetInAutoType()));
|
connect(selectDialog, SIGNAL(rejected()), SLOT(resetInAutoType()));
|
||||||
selectDialog->setEntries(entryList, sequenceHash);
|
selectDialog->setMatchList(matchList);
|
||||||
#if defined(Q_OS_MAC)
|
#if defined(Q_OS_MAC)
|
||||||
m_plugin->raiseOwnWindow();
|
m_plugin->raiseOwnWindow();
|
||||||
Tools::wait(500);
|
Tools::wait(500);
|
||||||
@ -239,7 +245,7 @@ void AutoType::performGlobalAutoType(const QList<Database*>& dbList)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AutoType::performAutoTypeFromGlobal(Entry* entry, const QString& sequence)
|
void AutoType::performAutoTypeFromGlobal(AutoTypeMatch match)
|
||||||
{
|
{
|
||||||
Q_ASSERT(m_inAutoType);
|
Q_ASSERT(m_inAutoType);
|
||||||
|
|
||||||
@ -247,7 +253,7 @@ void AutoType::performAutoTypeFromGlobal(Entry* entry, const QString& sequence)
|
|||||||
|
|
||||||
m_inAutoType = false;
|
m_inAutoType = false;
|
||||||
|
|
||||||
performAutoType(entry, nullptr, sequence, m_windowFromGlobal);
|
performAutoType(match.entry, nullptr, match.sequence, m_windowFromGlobal);
|
||||||
}
|
}
|
||||||
|
|
||||||
void AutoType::resetInAutoType()
|
void AutoType::resetInAutoType()
|
||||||
@ -506,78 +512,56 @@ QList<AutoTypeAction*> AutoType::createActionFromTemplate(const QString& tmpl, c
|
|||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
QString AutoType::autoTypeSequence(const Entry* entry, const QString& windowTitle)
|
QList<QString> AutoType::autoTypeSequences(const Entry* entry, const QString& windowTitle)
|
||||||
{
|
{
|
||||||
|
QList<QString> sequenceList;
|
||||||
|
|
||||||
if (!entry->autoTypeEnabled()) {
|
if (!entry->autoTypeEnabled()) {
|
||||||
return QString();
|
return sequenceList;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool enableSet = false;
|
|
||||||
QString sequence;
|
|
||||||
if (!windowTitle.isEmpty()) {
|
if (!windowTitle.isEmpty()) {
|
||||||
bool match = false;
|
|
||||||
const QList<AutoTypeAssociations::Association> assocList = entry->autoTypeAssociations()->getAll();
|
const QList<AutoTypeAssociations::Association> assocList = entry->autoTypeAssociations()->getAll();
|
||||||
for (const AutoTypeAssociations::Association& assoc : assocList) {
|
for (const AutoTypeAssociations::Association& assoc : assocList) {
|
||||||
const QString window = entry->resolveMultiplePlaceholders(assoc.window);
|
const QString window = entry->resolveMultiplePlaceholders(assoc.window);
|
||||||
if (windowMatches(windowTitle, window)) {
|
if (windowMatches(windowTitle, window)) {
|
||||||
if (!assoc.sequence.isEmpty()) {
|
if (!assoc.sequence.isEmpty()) {
|
||||||
sequence = assoc.sequence;
|
sequenceList.append(assoc.sequence);
|
||||||
} else {
|
} else {
|
||||||
sequence = entry->defaultAutoTypeSequence();
|
sequenceList.append(entry->effectiveAutoTypeSequence());
|
||||||
}
|
}
|
||||||
match = true;
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!match && config()->get("AutoTypeEntryTitleMatch").toBool() &&
|
if (config()->get("AutoTypeEntryTitleMatch").toBool() &&
|
||||||
windowMatchesTitle(windowTitle, entry->resolvePlaceholder(entry->title()))) {
|
windowMatchesTitle(windowTitle, entry->resolvePlaceholder(entry->title()))) {
|
||||||
sequence = entry->defaultAutoTypeSequence();
|
sequenceList.append(entry->effectiveAutoTypeSequence());
|
||||||
match = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!match && config()->get("AutoTypeEntryURLMatch").toBool() &&
|
if (config()->get("AutoTypeEntryURLMatch").toBool() &&
|
||||||
windowMatchesUrl(windowTitle, entry->resolvePlaceholder(entry->url()))) {
|
windowMatchesUrl(windowTitle, entry->resolvePlaceholder(entry->url()))) {
|
||||||
sequence = entry->defaultAutoTypeSequence();
|
sequenceList.append(entry->effectiveAutoTypeSequence());
|
||||||
match = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!match) {
|
if (sequenceList.isEmpty()) {
|
||||||
return QString();
|
return sequenceList;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
sequence = entry->defaultAutoTypeSequence();
|
sequenceList.append(entry->effectiveAutoTypeSequence());
|
||||||
}
|
}
|
||||||
|
|
||||||
const Group* group = entry->group();
|
const Group* group = entry->group();
|
||||||
do {
|
do {
|
||||||
if (!enableSet) {
|
|
||||||
if (group->autoTypeEnabled() == Group::Disable) {
|
if (group->autoTypeEnabled() == Group::Disable) {
|
||||||
return QString();
|
return QList<QString>();
|
||||||
} else if (group->autoTypeEnabled() == Group::Enable) {
|
} else if (group->autoTypeEnabled() == Group::Enable) {
|
||||||
enableSet = true;
|
return sequenceList;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (sequence.isEmpty()) {
|
|
||||||
sequence = group->defaultAutoTypeSequence();
|
|
||||||
}
|
|
||||||
|
|
||||||
group = group->parentGroup();
|
group = group->parentGroup();
|
||||||
} while (group && (!enableSet || sequence.isEmpty()));
|
|
||||||
|
|
||||||
if (sequence.isEmpty() && (!entry->resolvePlaceholder(entry->username()).isEmpty() ||
|
} while (group);
|
||||||
!entry->resolvePlaceholder(entry->password()).isEmpty())) {
|
|
||||||
if (entry->resolvePlaceholder(entry->username()).isEmpty()) {
|
|
||||||
sequence = "{PASSWORD}{ENTER}";
|
|
||||||
} else if (entry->resolvePlaceholder(entry->password()).isEmpty()) {
|
|
||||||
sequence = "{USERNAME}{ENTER}";
|
|
||||||
} else {
|
|
||||||
sequence = "{USERNAME}{TAB}{PASSWORD}{ENTER}";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return sequence;
|
return sequenceList;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool AutoType::windowMatches(const QString& windowTitle, const QString& windowPattern)
|
bool AutoType::windowMatches(const QString& windowTitle, const QString& windowPattern)
|
||||||
|
@ -23,6 +23,8 @@
|
|||||||
#include <QStringList>
|
#include <QStringList>
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
|
|
||||||
|
#include "core/AutoTypeMatch.h"
|
||||||
|
|
||||||
class AutoTypeAction;
|
class AutoTypeAction;
|
||||||
class AutoTypeExecutor;
|
class AutoTypeExecutor;
|
||||||
class AutoTypePlatformInterface;
|
class AutoTypePlatformInterface;
|
||||||
@ -69,7 +71,7 @@ signals:
|
|||||||
void globalShortcutTriggered();
|
void globalShortcutTriggered();
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void performAutoTypeFromGlobal(Entry* entry, const QString& sequence);
|
void performAutoTypeFromGlobal(AutoTypeMatch match);
|
||||||
void resetInAutoType();
|
void resetInAutoType();
|
||||||
void unloadPlugin();
|
void unloadPlugin();
|
||||||
|
|
||||||
@ -79,7 +81,7 @@ private:
|
|||||||
void loadPlugin(const QString& pluginPath);
|
void loadPlugin(const QString& pluginPath);
|
||||||
bool parseActions(const QString& sequence, const Entry* entry, QList<AutoTypeAction*>& actions);
|
bool parseActions(const QString& sequence, const Entry* entry, QList<AutoTypeAction*>& actions);
|
||||||
QList<AutoTypeAction*> createActionFromTemplate(const QString& tmpl, const Entry* entry);
|
QList<AutoTypeAction*> createActionFromTemplate(const QString& tmpl, const Entry* entry);
|
||||||
QString autoTypeSequence(const Entry* entry, const QString& windowTitle = QString());
|
QList<QString> autoTypeSequences(const Entry* entry, const QString& windowTitle = QString());
|
||||||
bool windowMatchesTitle(const QString& windowTitle, const QString& resolvedTitle);
|
bool windowMatchesTitle(const QString& windowTitle, const QString& resolvedTitle);
|
||||||
bool windowMatchesUrl(const QString& windowTitle, const QString& resolvedUrl);
|
bool windowMatchesUrl(const QString& windowTitle, const QString& resolvedUrl);
|
||||||
bool windowMatches(const QString& windowTitle, const QString& windowPattern);
|
bool windowMatches(const QString& windowTitle, const QString& windowPattern);
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
|
* Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
|
||||||
|
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -25,14 +26,15 @@
|
|||||||
#include <QVBoxLayout>
|
#include <QVBoxLayout>
|
||||||
|
|
||||||
#include "autotype/AutoTypeSelectView.h"
|
#include "autotype/AutoTypeSelectView.h"
|
||||||
|
#include "core/AutoTypeMatch.h"
|
||||||
#include "core/Config.h"
|
#include "core/Config.h"
|
||||||
#include "core/FilePath.h"
|
#include "core/FilePath.h"
|
||||||
#include "gui/entry/EntryModel.h"
|
#include "gui/entry/AutoTypeMatchModel.h"
|
||||||
|
|
||||||
AutoTypeSelectDialog::AutoTypeSelectDialog(QWidget* parent)
|
AutoTypeSelectDialog::AutoTypeSelectDialog(QWidget* parent)
|
||||||
: QDialog(parent)
|
: QDialog(parent)
|
||||||
, m_view(new AutoTypeSelectView(this))
|
, m_view(new AutoTypeSelectView(this))
|
||||||
, m_entryActivatedEmitted(false)
|
, m_matchActivatedEmitted(false)
|
||||||
{
|
{
|
||||||
setAttribute(Qt::WA_DeleteOnClose);
|
setAttribute(Qt::WA_DeleteOnClose);
|
||||||
// Places the window on the active (virtual) desktop instead of where the main window is.
|
// Places the window on the active (virtual) desktop instead of where the main window is.
|
||||||
@ -42,7 +44,7 @@ AutoTypeSelectDialog::AutoTypeSelectDialog(QWidget* parent)
|
|||||||
setWindowIcon(filePath()->applicationIcon());
|
setWindowIcon(filePath()->applicationIcon());
|
||||||
|
|
||||||
QRect screenGeometry = QApplication::desktop()->availableGeometry(QCursor::pos());
|
QRect screenGeometry = QApplication::desktop()->availableGeometry(QCursor::pos());
|
||||||
QSize size = config()->get("GUI/AutoTypeSelectDialogSize", QSize(400, 250)).toSize();
|
QSize size = config()->get("GUI/AutoTypeSelectDialogSize", QSize(600, 250)).toSize();
|
||||||
size.setWidth(qMin(size.width(), screenGeometry.width()));
|
size.setWidth(qMin(size.width(), screenGeometry.width()));
|
||||||
size.setHeight(qMin(size.height(), screenGeometry.height()));
|
size.setHeight(qMin(size.height(), screenGeometry.height()));
|
||||||
resize(size);
|
resize(size);
|
||||||
@ -56,10 +58,10 @@ AutoTypeSelectDialog::AutoTypeSelectDialog(QWidget* parent)
|
|||||||
QLabel* descriptionLabel = new QLabel(tr("Select entry to Auto-Type:"), this);
|
QLabel* descriptionLabel = new QLabel(tr("Select entry to Auto-Type:"), this);
|
||||||
layout->addWidget(descriptionLabel);
|
layout->addWidget(descriptionLabel);
|
||||||
|
|
||||||
connect(m_view, SIGNAL(activated(QModelIndex)), SLOT(emitEntryActivated(QModelIndex)));
|
connect(m_view, SIGNAL(activated(QModelIndex)), SLOT(emitMatchActivated(QModelIndex)));
|
||||||
connect(m_view, SIGNAL(clicked(QModelIndex)), SLOT(emitEntryActivated(QModelIndex)));
|
connect(m_view, SIGNAL(clicked(QModelIndex)), SLOT(emitMatchActivated(QModelIndex)));
|
||||||
|
connect(m_view->model(), SIGNAL(rowsRemoved(QModelIndex,int,int)), SLOT(matchRemoved()));
|
||||||
connect(m_view, SIGNAL(rejected()), SLOT(reject()));
|
connect(m_view, SIGNAL(rejected()), SLOT(reject()));
|
||||||
connect(m_view->model(), SIGNAL(rowsRemoved(QModelIndex,int,int)), SLOT(entryRemoved()));
|
|
||||||
layout->addWidget(m_view);
|
layout->addWidget(m_view);
|
||||||
|
|
||||||
QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel, Qt::Horizontal, this);
|
QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel, Qt::Horizontal, this);
|
||||||
@ -67,10 +69,9 @@ AutoTypeSelectDialog::AutoTypeSelectDialog(QWidget* parent)
|
|||||||
layout->addWidget(buttonBox);
|
layout->addWidget(buttonBox);
|
||||||
}
|
}
|
||||||
|
|
||||||
void AutoTypeSelectDialog::setEntries(const QList<Entry*>& entries, const QHash<Entry*, QString>& sequences)
|
void AutoTypeSelectDialog::setMatchList(const QList<AutoTypeMatch>& matchList)
|
||||||
{
|
{
|
||||||
m_sequences = sequences;
|
m_view->setMatchList(matchList);
|
||||||
m_view->setEntryList(entries);
|
|
||||||
|
|
||||||
m_view->header()->resizeSections(QHeaderView::ResizeToContents);
|
m_view->header()->resizeSections(QHeaderView::ResizeToContents);
|
||||||
}
|
}
|
||||||
@ -82,20 +83,20 @@ void AutoTypeSelectDialog::done(int r)
|
|||||||
QDialog::done(r);
|
QDialog::done(r);
|
||||||
}
|
}
|
||||||
|
|
||||||
void AutoTypeSelectDialog::emitEntryActivated(const QModelIndex& index)
|
void AutoTypeSelectDialog::emitMatchActivated(const QModelIndex& index)
|
||||||
{
|
{
|
||||||
// make sure we don't emit the signal twice when both activated() and clicked() are triggered
|
// make sure we don't emit the signal twice when both activated() and clicked() are triggered
|
||||||
if (m_entryActivatedEmitted) {
|
if (m_matchActivatedEmitted) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
m_entryActivatedEmitted = true;
|
m_matchActivatedEmitted = true;
|
||||||
|
|
||||||
Entry* entry = m_view->entryFromIndex(index);
|
AutoTypeMatch match = m_view->matchFromIndex(index);
|
||||||
accept();
|
accept();
|
||||||
emit entryActivated(entry, m_sequences[entry]);
|
emit matchActivated(match);
|
||||||
}
|
}
|
||||||
|
|
||||||
void AutoTypeSelectDialog::entryRemoved()
|
void AutoTypeSelectDialog::matchRemoved()
|
||||||
{
|
{
|
||||||
if (m_view->model()->rowCount() == 0) {
|
if (m_view->model()->rowCount() == 0) {
|
||||||
reject();
|
reject();
|
||||||
|
@ -22,8 +22,9 @@
|
|||||||
#include <QDialog>
|
#include <QDialog>
|
||||||
#include <QHash>
|
#include <QHash>
|
||||||
|
|
||||||
|
#include "core/AutoTypeMatch.h"
|
||||||
|
|
||||||
class AutoTypeSelectView;
|
class AutoTypeSelectView;
|
||||||
class Entry;
|
|
||||||
|
|
||||||
class AutoTypeSelectDialog : public QDialog
|
class AutoTypeSelectDialog : public QDialog
|
||||||
{
|
{
|
||||||
@ -31,22 +32,21 @@ class AutoTypeSelectDialog : public QDialog
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
explicit AutoTypeSelectDialog(QWidget* parent = nullptr);
|
explicit AutoTypeSelectDialog(QWidget* parent = nullptr);
|
||||||
void setEntries(const QList<Entry*>& entries, const QHash<Entry*, QString>& sequences);
|
void setMatchList(const QList<AutoTypeMatch>& matchList);
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void entryActivated(Entry* entry, const QString& sequence);
|
void matchActivated(AutoTypeMatch match);
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void done(int r) override;
|
void done(int r) override;
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void emitEntryActivated(const QModelIndex& index);
|
void emitMatchActivated(const QModelIndex& index);
|
||||||
void entryRemoved();
|
void matchRemoved();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
AutoTypeSelectView* const m_view;
|
AutoTypeSelectView* const m_view;
|
||||||
QHash<Entry*, QString> m_sequences;
|
bool m_matchActivatedEmitted;
|
||||||
bool m_entryActivatedEmitted;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // KEEPASSX_AUTOTYPESELECTDIALOG_H
|
#endif // KEEPASSX_AUTOTYPESELECTDIALOG_H
|
||||||
|
@ -21,15 +21,12 @@
|
|||||||
#include <QMouseEvent>
|
#include <QMouseEvent>
|
||||||
|
|
||||||
AutoTypeSelectView::AutoTypeSelectView(QWidget* parent)
|
AutoTypeSelectView::AutoTypeSelectView(QWidget* parent)
|
||||||
: EntryView(parent)
|
: AutoTypeMatchView(parent)
|
||||||
{
|
{
|
||||||
hideColumn(3);
|
|
||||||
setMouseTracking(true);
|
setMouseTracking(true);
|
||||||
setAllColumnsShowFocus(true);
|
setAllColumnsShowFocus(true);
|
||||||
setDragEnabled(false);
|
|
||||||
setSelectionMode(QAbstractItemView::SingleSelection);
|
|
||||||
|
|
||||||
connect(model(), SIGNAL(modelReset()), SLOT(selectFirstEntry()));
|
connect(model(), SIGNAL(modelReset()), SLOT(selectFirstMatch()));
|
||||||
}
|
}
|
||||||
|
|
||||||
void AutoTypeSelectView::mouseMoveEvent(QMouseEvent* event)
|
void AutoTypeSelectView::mouseMoveEvent(QMouseEvent* event)
|
||||||
@ -44,10 +41,10 @@ void AutoTypeSelectView::mouseMoveEvent(QMouseEvent* event)
|
|||||||
unsetCursor();
|
unsetCursor();
|
||||||
}
|
}
|
||||||
|
|
||||||
EntryView::mouseMoveEvent(event);
|
AutoTypeMatchView::mouseMoveEvent(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
void AutoTypeSelectView::selectFirstEntry()
|
void AutoTypeSelectView::selectFirstMatch()
|
||||||
{
|
{
|
||||||
QModelIndex index = model()->index(0, 0);
|
QModelIndex index = model()->index(0, 0);
|
||||||
|
|
||||||
|
@ -18,11 +18,9 @@
|
|||||||
#ifndef KEEPASSX_AUTOTYPESELECTVIEW_H
|
#ifndef KEEPASSX_AUTOTYPESELECTVIEW_H
|
||||||
#define KEEPASSX_AUTOTYPESELECTVIEW_H
|
#define KEEPASSX_AUTOTYPESELECTVIEW_H
|
||||||
|
|
||||||
#include "gui/entry/EntryView.h"
|
#include "gui/entry/AutoTypeMatchView.h"
|
||||||
|
|
||||||
class Entry;
|
class AutoTypeSelectView : public AutoTypeMatchView
|
||||||
|
|
||||||
class AutoTypeSelectView : public EntryView
|
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
@ -34,7 +32,7 @@ protected:
|
|||||||
void keyReleaseEvent(QKeyEvent* e) override;
|
void keyReleaseEvent(QKeyEvent* e) override;
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void selectFirstEntry();
|
void selectFirstMatch();
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void rejected();
|
void rejected();
|
||||||
|
39
src/core/AutoTypeMatch.cpp
Normal file
39
src/core/AutoTypeMatch.cpp
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2015 David Wu <lightvector@gmail.com>
|
||||||
|
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 or (at your option)
|
||||||
|
* version 3 of the License.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "AutoTypeMatch.h"
|
||||||
|
|
||||||
|
AutoTypeMatch::AutoTypeMatch()
|
||||||
|
: entry(nullptr),
|
||||||
|
sequence()
|
||||||
|
{}
|
||||||
|
|
||||||
|
AutoTypeMatch::AutoTypeMatch(Entry* entry, QString sequence)
|
||||||
|
: entry(entry),
|
||||||
|
sequence(sequence)
|
||||||
|
{}
|
||||||
|
|
||||||
|
bool AutoTypeMatch::operator==(const AutoTypeMatch& other) const
|
||||||
|
{
|
||||||
|
return entry == other.entry && sequence == other.sequence;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool AutoTypeMatch::operator!=(const AutoTypeMatch& other) const
|
||||||
|
{
|
||||||
|
return entry != other.entry || sequence != other.sequence;
|
||||||
|
}
|
41
src/core/AutoTypeMatch.h
Normal file
41
src/core/AutoTypeMatch.h
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2015 David Wu <lightvector@gmail.com>
|
||||||
|
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 or (at your option)
|
||||||
|
* version 3 of the License.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef KEEPASSX_AUTOTYPEMATCH_H
|
||||||
|
#define KEEPASSX_AUTOTYPEMATCH_H
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
#include <QString>
|
||||||
|
|
||||||
|
class Entry;
|
||||||
|
|
||||||
|
struct AutoTypeMatch
|
||||||
|
{
|
||||||
|
Entry* entry;
|
||||||
|
QString sequence;
|
||||||
|
|
||||||
|
AutoTypeMatch();
|
||||||
|
AutoTypeMatch(Entry* entry, QString sequence);
|
||||||
|
|
||||||
|
bool operator==(const AutoTypeMatch& other) const;
|
||||||
|
bool operator!=(const AutoTypeMatch& other) const;
|
||||||
|
};
|
||||||
|
|
||||||
|
Q_DECLARE_TYPEINFO(AutoTypeMatch, Q_MOVABLE_TYPE);
|
||||||
|
|
||||||
|
#endif // KEEPASSX_AUTOTYPEMATCH_H
|
202
src/gui/entry/AutoTypeMatchModel.cpp
Normal file
202
src/gui/entry/AutoTypeMatchModel.cpp
Normal file
@ -0,0 +1,202 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2015 David Wu <lightvector@gmail.com>
|
||||||
|
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 or (at your option)
|
||||||
|
* version 3 of the License.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "AutoTypeMatchModel.h"
|
||||||
|
|
||||||
|
#include <QFont>
|
||||||
|
|
||||||
|
#include "core/DatabaseIcons.h"
|
||||||
|
#include "core/Entry.h"
|
||||||
|
#include "core/Global.h"
|
||||||
|
#include "core/Group.h"
|
||||||
|
#include "core/Metadata.h"
|
||||||
|
|
||||||
|
AutoTypeMatchModel::AutoTypeMatchModel(QObject* parent)
|
||||||
|
: QAbstractTableModel(parent)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
AutoTypeMatch AutoTypeMatchModel::matchFromIndex(const QModelIndex& index) const
|
||||||
|
{
|
||||||
|
Q_ASSERT(index.isValid() && index.row() < m_matches.size());
|
||||||
|
return m_matches.at(index.row());
|
||||||
|
}
|
||||||
|
|
||||||
|
QModelIndex AutoTypeMatchModel::indexFromMatch(AutoTypeMatch match) const
|
||||||
|
{
|
||||||
|
int row = m_matches.indexOf(match);
|
||||||
|
Q_ASSERT(row != -1);
|
||||||
|
return index(row, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void AutoTypeMatchModel::setMatchList(const QList<AutoTypeMatch>& matches)
|
||||||
|
{
|
||||||
|
beginResetModel();
|
||||||
|
|
||||||
|
severConnections();
|
||||||
|
|
||||||
|
m_allGroups.clear();
|
||||||
|
m_matches = matches;
|
||||||
|
|
||||||
|
QSet<Database*> databases;
|
||||||
|
|
||||||
|
for (AutoTypeMatch match : asConst(m_matches)) {
|
||||||
|
databases.insert(match.entry->group()->database());
|
||||||
|
}
|
||||||
|
|
||||||
|
for (Database* db : asConst(databases)) {
|
||||||
|
Q_ASSERT(db);
|
||||||
|
for (const Group* group : db->rootGroup()->groupsRecursive(true)) {
|
||||||
|
m_allGroups.append(group);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (db->metadata()->recycleBin()) {
|
||||||
|
m_allGroups.removeOne(db->metadata()->recycleBin());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const Group* group : asConst(m_allGroups)) {
|
||||||
|
makeConnections(group);
|
||||||
|
}
|
||||||
|
|
||||||
|
endResetModel();
|
||||||
|
}
|
||||||
|
|
||||||
|
int AutoTypeMatchModel::rowCount(const QModelIndex& parent) const
|
||||||
|
{
|
||||||
|
if (parent.isValid()) {
|
||||||
|
return 0;
|
||||||
|
} else {
|
||||||
|
return m_matches.size();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int AutoTypeMatchModel::columnCount(const QModelIndex& parent) const
|
||||||
|
{
|
||||||
|
Q_UNUSED(parent);
|
||||||
|
|
||||||
|
return 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
QVariant AutoTypeMatchModel::data(const QModelIndex& index, int role) const
|
||||||
|
{
|
||||||
|
if (!index.isValid()) {
|
||||||
|
return QVariant();
|
||||||
|
}
|
||||||
|
|
||||||
|
AutoTypeMatch match = matchFromIndex(index);
|
||||||
|
|
||||||
|
if (role == Qt::DisplayRole) {
|
||||||
|
QString result;
|
||||||
|
switch (index.column()) {
|
||||||
|
case ParentGroup:
|
||||||
|
if (match.entry->group()) {
|
||||||
|
return match.entry->group()->name();
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case Title:
|
||||||
|
return match.entry->resolveMultiplePlaceholders(match.entry->title());
|
||||||
|
case Username:
|
||||||
|
return match.entry->resolveMultiplePlaceholders(match.entry->username());
|
||||||
|
case Sequence:
|
||||||
|
return match.sequence;
|
||||||
|
}
|
||||||
|
} else if (role == Qt::DecorationRole) {
|
||||||
|
switch (index.column()) {
|
||||||
|
case ParentGroup:
|
||||||
|
if (match.entry->group()) {
|
||||||
|
return match.entry->group()->iconScaledPixmap();
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case Title:
|
||||||
|
if (match.entry->isExpired()) {
|
||||||
|
return databaseIcons()->iconPixmap(DatabaseIcons::ExpiredIconIndex);
|
||||||
|
} else {
|
||||||
|
return match.entry->iconScaledPixmap();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (role == Qt::FontRole) {
|
||||||
|
QFont font;
|
||||||
|
if (match.entry->isExpired()) {
|
||||||
|
font.setStrikeOut(true);
|
||||||
|
}
|
||||||
|
return font;
|
||||||
|
}
|
||||||
|
|
||||||
|
return QVariant();
|
||||||
|
}
|
||||||
|
|
||||||
|
QVariant AutoTypeMatchModel::headerData(int section, Qt::Orientation orientation, int role) const
|
||||||
|
{
|
||||||
|
if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
|
||||||
|
switch (section) {
|
||||||
|
case ParentGroup:
|
||||||
|
return tr("Group");
|
||||||
|
case Title:
|
||||||
|
return tr("Title");
|
||||||
|
case Username:
|
||||||
|
return tr("Username");
|
||||||
|
case Sequence:
|
||||||
|
return tr("Sequence");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return QVariant();
|
||||||
|
}
|
||||||
|
|
||||||
|
void AutoTypeMatchModel::entryDataChanged(Entry* entry)
|
||||||
|
{
|
||||||
|
for (int row = 0; row < m_matches.size(); row++) {
|
||||||
|
AutoTypeMatch match = m_matches[row];
|
||||||
|
if (match.entry == entry) {
|
||||||
|
emit dataChanged(index(row, 0), index(row, columnCount()-1));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AutoTypeMatchModel::entryAboutToRemove(Entry* entry)
|
||||||
|
{
|
||||||
|
for (int row = 0; row < m_matches.size(); row++) {
|
||||||
|
AutoTypeMatch match = m_matches[row];
|
||||||
|
if (match.entry == entry) {
|
||||||
|
beginRemoveRows(QModelIndex(), row, row);
|
||||||
|
m_matches.removeAt(row);
|
||||||
|
endRemoveRows();
|
||||||
|
row--;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void AutoTypeMatchModel::entryRemoved()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void AutoTypeMatchModel::severConnections()
|
||||||
|
{
|
||||||
|
for (const Group* group : asConst(m_allGroups)) {
|
||||||
|
disconnect(group, nullptr, this, nullptr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void AutoTypeMatchModel::makeConnections(const Group* group)
|
||||||
|
{
|
||||||
|
connect(group, SIGNAL(entryAboutToRemove(Entry*)), SLOT(entryAboutToRemove(Entry*)));
|
||||||
|
connect(group, SIGNAL(entryRemoved(Entry*)), SLOT(entryRemoved()));
|
||||||
|
connect(group, SIGNAL(entryDataChanged(Entry*)), SLOT(entryDataChanged(Entry*)));
|
||||||
|
}
|
66
src/gui/entry/AutoTypeMatchModel.h
Normal file
66
src/gui/entry/AutoTypeMatchModel.h
Normal file
@ -0,0 +1,66 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2015 David Wu <lightvector@gmail.com>
|
||||||
|
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 or (at your option)
|
||||||
|
* version 3 of the License.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef KEEPASSX_AUTOTYPEMATCHMODEL_H
|
||||||
|
#define KEEPASSX_AUTOTYPEMATCHMODEL_H
|
||||||
|
|
||||||
|
#include <QAbstractTableModel>
|
||||||
|
|
||||||
|
#include "core/AutoTypeMatch.h"
|
||||||
|
|
||||||
|
class Entry;
|
||||||
|
class Group;
|
||||||
|
|
||||||
|
class AutoTypeMatchModel : public QAbstractTableModel
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
enum ModelColumn
|
||||||
|
{
|
||||||
|
ParentGroup = 0,
|
||||||
|
Title = 1,
|
||||||
|
Username = 2,
|
||||||
|
Sequence = 3
|
||||||
|
};
|
||||||
|
|
||||||
|
explicit AutoTypeMatchModel(QObject* parent = nullptr);
|
||||||
|
AutoTypeMatch matchFromIndex(const QModelIndex& index) const;
|
||||||
|
QModelIndex indexFromMatch(AutoTypeMatch match) const;
|
||||||
|
|
||||||
|
int rowCount(const QModelIndex& parent = QModelIndex()) const override;
|
||||||
|
int columnCount(const QModelIndex& parent = QModelIndex()) const override;
|
||||||
|
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
|
||||||
|
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
|
||||||
|
|
||||||
|
void setMatchList(const QList<AutoTypeMatch>& matches);
|
||||||
|
|
||||||
|
private Q_SLOTS:
|
||||||
|
void entryAboutToRemove(Entry* entry);
|
||||||
|
void entryRemoved();
|
||||||
|
void entryDataChanged(Entry* entry);
|
||||||
|
|
||||||
|
private:
|
||||||
|
void severConnections();
|
||||||
|
void makeConnections(const Group* group);
|
||||||
|
|
||||||
|
QList<AutoTypeMatch> m_matches;
|
||||||
|
QList<const Group*> m_allGroups;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // KEEPASSX_AUTOTYPEMATCHMODEL_H
|
116
src/gui/entry/AutoTypeMatchView.cpp
Normal file
116
src/gui/entry/AutoTypeMatchView.cpp
Normal file
@ -0,0 +1,116 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2015 David Wu <lightvector@gmail.com>
|
||||||
|
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 or (at your option)
|
||||||
|
* version 3 of the License.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "AutoTypeMatchView.h"
|
||||||
|
|
||||||
|
#include <QHeaderView>
|
||||||
|
#include <QKeyEvent>
|
||||||
|
|
||||||
|
#include "gui/SortFilterHideProxyModel.h"
|
||||||
|
|
||||||
|
AutoTypeMatchView::AutoTypeMatchView(QWidget* parent)
|
||||||
|
: QTreeView(parent)
|
||||||
|
, m_model(new AutoTypeMatchModel(this))
|
||||||
|
, m_sortModel(new SortFilterHideProxyModel(this))
|
||||||
|
{
|
||||||
|
m_sortModel->setSourceModel(m_model);
|
||||||
|
m_sortModel->setDynamicSortFilter(true);
|
||||||
|
m_sortModel->setSortLocaleAware(true);
|
||||||
|
m_sortModel->setSortCaseSensitivity(Qt::CaseInsensitive);
|
||||||
|
QTreeView::setModel(m_sortModel);
|
||||||
|
|
||||||
|
setUniformRowHeights(true);
|
||||||
|
setRootIsDecorated(false);
|
||||||
|
setAlternatingRowColors(true);
|
||||||
|
setDragEnabled(false);
|
||||||
|
setSortingEnabled(true);
|
||||||
|
setSelectionMode(QAbstractItemView::SingleSelection);
|
||||||
|
header()->setDefaultSectionSize(150);
|
||||||
|
|
||||||
|
connect(this, SIGNAL(doubleClicked(QModelIndex)), SLOT(emitMatchActivated(QModelIndex)));
|
||||||
|
connect(selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), SIGNAL(matchSelectionChanged()));
|
||||||
|
}
|
||||||
|
|
||||||
|
void AutoTypeMatchView::keyPressEvent(QKeyEvent* event)
|
||||||
|
{
|
||||||
|
if ((event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return) && currentIndex().isValid()) {
|
||||||
|
emitMatchActivated(currentIndex());
|
||||||
|
}
|
||||||
|
|
||||||
|
QTreeView::keyPressEvent(event);
|
||||||
|
}
|
||||||
|
|
||||||
|
void AutoTypeMatchView::setMatchList(const QList<AutoTypeMatch>& matches)
|
||||||
|
{
|
||||||
|
m_model->setMatchList(matches);
|
||||||
|
for (int i = 0; i < m_model->columnCount(); ++i) {
|
||||||
|
resizeColumnToContents(i);
|
||||||
|
if (columnWidth(i) > 250) {
|
||||||
|
setColumnWidth(i, 250);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
setFirstMatchActive();
|
||||||
|
}
|
||||||
|
|
||||||
|
void AutoTypeMatchView::setFirstMatchActive()
|
||||||
|
{
|
||||||
|
if (m_model->rowCount() > 0) {
|
||||||
|
QModelIndex index = m_sortModel->mapToSource(m_sortModel->index(0, 0));
|
||||||
|
setCurrentMatch(m_model->matchFromIndex(index));
|
||||||
|
} else {
|
||||||
|
emit matchSelectionChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void AutoTypeMatchView::emitMatchActivated(const QModelIndex& index)
|
||||||
|
{
|
||||||
|
AutoTypeMatch match = matchFromIndex(index);
|
||||||
|
|
||||||
|
emit matchActivated(match);
|
||||||
|
}
|
||||||
|
|
||||||
|
void AutoTypeMatchView::setModel(QAbstractItemModel* model)
|
||||||
|
{
|
||||||
|
Q_UNUSED(model);
|
||||||
|
Q_ASSERT(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
AutoTypeMatch AutoTypeMatchView::currentMatch()
|
||||||
|
{
|
||||||
|
QModelIndexList list = selectionModel()->selectedRows();
|
||||||
|
if (list.size() == 1) {
|
||||||
|
return m_model->matchFromIndex(m_sortModel->mapToSource(list.first()));
|
||||||
|
} else {
|
||||||
|
return AutoTypeMatch();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void AutoTypeMatchView::setCurrentMatch(AutoTypeMatch match)
|
||||||
|
{
|
||||||
|
selectionModel()->setCurrentIndex(m_sortModel->mapFromSource(m_model->indexFromMatch(match)),
|
||||||
|
QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
|
||||||
|
}
|
||||||
|
|
||||||
|
AutoTypeMatch AutoTypeMatchView::matchFromIndex(const QModelIndex& index)
|
||||||
|
{
|
||||||
|
if (index.isValid()) {
|
||||||
|
return m_model->matchFromIndex(m_sortModel->mapToSource(index));
|
||||||
|
} else {
|
||||||
|
return AutoTypeMatch();
|
||||||
|
}
|
||||||
|
}
|
58
src/gui/entry/AutoTypeMatchView.h
Normal file
58
src/gui/entry/AutoTypeMatchView.h
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2015 David Wu <lightvector@gmail.com>
|
||||||
|
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 or (at your option)
|
||||||
|
* version 3 of the License.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef KEEPASSX_AUTOTYPEMATCHVIEW_H
|
||||||
|
#define KEEPASSX_AUTOTYPEMATCHVIEW_H
|
||||||
|
|
||||||
|
#include <QTreeView>
|
||||||
|
|
||||||
|
#include "core/AutoTypeMatch.h"
|
||||||
|
|
||||||
|
#include "gui/entry/AutoTypeMatchModel.h"
|
||||||
|
|
||||||
|
class SortFilterHideProxyModel;
|
||||||
|
|
||||||
|
class AutoTypeMatchView : public QTreeView
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit AutoTypeMatchView(QWidget* parent = nullptr);
|
||||||
|
void setModel(QAbstractItemModel* model) override;
|
||||||
|
AutoTypeMatch currentMatch();
|
||||||
|
void setCurrentMatch(AutoTypeMatch match);
|
||||||
|
AutoTypeMatch matchFromIndex(const QModelIndex& index);
|
||||||
|
void setMatchList(const QList<AutoTypeMatch>& matches);
|
||||||
|
void setFirstMatchActive();
|
||||||
|
|
||||||
|
Q_SIGNALS:
|
||||||
|
void matchActivated(AutoTypeMatch match);
|
||||||
|
void matchSelectionChanged();
|
||||||
|
|
||||||
|
protected:
|
||||||
|
void keyPressEvent(QKeyEvent* event) override;
|
||||||
|
|
||||||
|
private Q_SLOTS:
|
||||||
|
void emitMatchActivated(const QModelIndex& index);
|
||||||
|
|
||||||
|
private:
|
||||||
|
AutoTypeMatchModel* const m_model;
|
||||||
|
SortFilterHideProxyModel* const m_sortModel;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // KEEPASSX_AUTOTYPEMATCHVIEW_H
|
Loading…
Reference in New Issue
Block a user