mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-05 13:37:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Refactor browser Access Control Dialog (#9607)

Browse source
This commit is contained in:
Sami Vänttinen 2023-07-09 21:33:05 +03:00 • committed by GitHub
parent 35baeaff79
commit 190a1fa10c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 253 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

130
src/browser/BrowserAccessControlDialog.cpp
View file

@ -1,6 +1,6 @@
/*
* Copyright (C) 2023 KeePassXC Team <team@keepassxc.org>
* Copyright (C) 2013 Francois Ferrand
* Copyright (C) 2022 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
@ -21,12 +21,11 @@
#include <QUrl>
#include "core/Entry.h"
#include <QCloseEvent>
#include "gui/Icons.h"
BrowserAccessControlDialog::BrowserAccessControlDialog(QWidget* parent)
: QDialog(parent)
, m_ui(new Ui::BrowserAccessControlDialog())
, m_entriesAccepted(false)
{
setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
@ -34,13 +33,22 @@ BrowserAccessControlDialog::BrowserAccessControlDialog(QWidget* parent)
connect(m_ui->allowButton, SIGNAL(clicked()), SLOT(accept()));
connect(m_ui->denyButton, SIGNAL(clicked()), SLOT(reject()));
connect(m_ui->itemsTable, SIGNAL(cellDoubleClicked(int, int)), this, SLOT(accept()));
connect(m_ui->itemsTable->selectionModel(),
SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
this,
SLOT(selectionChanged()));
connect(m_ui->itemsTable, SIGNAL(acceptSelections()), SLOT(accept()));
connect(m_ui->itemsTable, SIGNAL(focusInWithoutSelections()), this, SLOT(selectionChanged()));
}
BrowserAccessControlDialog::~BrowserAccessControlDialog()
{
}
void BrowserAccessControlDialog::setItems(const QList<Entry*>& items, const QString& urlString, bool httpAuth)
void BrowserAccessControlDialog::setEntries(const QList<Entry*>& entriesToConfirm,
const QString& urlString,
bool httpAuth)
{
QUrl url(urlString);
m_ui->siteLabel->setText(m_ui->siteLabel->text().arg(
@ -49,60 +57,114 @@ void BrowserAccessControlDialog::setItems(const QList<Entry*>& items, const QStr
m_ui->rememberDecisionCheckBox->setVisible(!httpAuth);
m_ui->rememberDecisionCheckBox->setChecked(false);
m_ui->itemsTable->setRowCount(items.count());
m_ui->itemsTable->setRowCount(entriesToConfirm.count());
m_ui->itemsTable->setColumnCount(2);
int row = 0;
for (const auto& entry : items) {
auto item = new QTableWidgetItem();
item->setText(entry->title() + " - " + entry->username());
item->setData(Qt::UserRole, row);
item->setCheckState(Qt::Checked);
item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
m_ui->itemsTable->setItem(row, 0, item);
auto disableButton = new QPushButton(tr("Disable for this site"));
disableButton->setAutoDefault(false);
connect(disableButton, &QAbstractButton::pressed, [&, item] {
emit disableAccess(item);
m_ui->itemsTable->removeRow(item->row());
if (m_ui->itemsTable->rowCount() == 0) {
reject();
}
});
m_ui->itemsTable->setCellWidget(row, 1, disableButton);
for (const auto& entry : entriesToConfirm) {
addEntryToList(entry, row);
++row;
}
m_ui->itemsTable->resizeColumnsToContents();
m_ui->itemsTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
m_ui->itemsTable->selectAll();
m_ui->allowButton->setFocus();
}
void BrowserAccessControlDialog::addEntryToList(Entry* entry, int row)
{
auto item = new QTableWidgetItem();
item->setText(entry->title() + " - " + entry->username());
item->setData(Qt::UserRole, row);
item->setFlags(item->flags() | Qt::ItemIsSelectable);
m_ui->itemsTable->setItem(row, 0, item);
auto disableButton = new QPushButton();
disableButton->setIcon(icons()->icon("entry-delete"));
disableButton->setToolTip(tr("Disable for this site"));
connect(disableButton, &QAbstractButton::pressed, [&, item, disableButton] {
auto font = item->font();
if (item->flags() == Qt::NoItemFlags) {
item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
item->setSelected(true);
font.setStrikeOut(false);
item->setFont(font);
disableButton->setIcon(icons()->icon("entry-delete"));
disableButton->setToolTip(tr("Disable for this site"));
m_ui->rememberDecisionCheckBox->setEnabled(true);
} else {
item->setFlags(Qt::NoItemFlags);
item->setSelected(false);
font.setStrikeOut(true);
item->setFont(font);
disableButton->setIcon(icons()->icon("entry-restore"));
disableButton->setToolTip(tr("Undo"));
// Disable Remember checkbox if all items are disabled
auto areAllDisabled = BrowserAccessControlDialog::areAllDisabled();
m_ui->rememberDecisionCheckBox->setEnabled(!areAllDisabled);
}
});
m_ui->itemsTable->setCellWidget(row, 1, disableButton);
}
bool BrowserAccessControlDialog::remember() const
{
return m_ui->rememberDecisionCheckBox->isChecked();
}
QList<QTableWidgetItem*> BrowserAccessControlDialog::getSelectedEntries() const
QList<QTableWidgetItem*> BrowserAccessControlDialog::getEntries(SelectionType selectionType) const
{
QList<QTableWidgetItem*> selected;
for (int i = 0; i < m_ui->itemsTable->rowCount(); ++i) {
auto item = m_ui->itemsTable->item(i, 0);
if (item->checkState() == Qt::Checked) {
for (auto& item : getAllItems()) {
// Add to list depending on selection type and item status
if ((selectionType == SelectionType::Selected && item->isSelected())
|| (selectionType == SelectionType::NonSelected && !item->isSelected())
|| (selectionType == SelectionType::Disabled && item->flags() == Qt::NoItemFlags)) {
selected.append(item);
}
}
return selected;
}
QList<QTableWidgetItem*> BrowserAccessControlDialog::getNonSelectedEntries() const
void BrowserAccessControlDialog::selectionChanged()
{
QList<QTableWidgetItem*> notSelected;
for (int i = 0; i < m_ui->itemsTable->rowCount(); ++i) {
auto item = m_ui->itemsTable->item(i, 0);
if (item->checkState() != Qt::Checked) {
notSelected.append(item);
auto selectedRows = m_ui->itemsTable->selectionModel()->selectedRows();
m_ui->allowButton->setEnabled(!selectedRows.isEmpty());
m_ui->allowButton->setDefault(!selectedRows.isEmpty());
m_ui->allowButton->setAutoDefault(!selectedRows.isEmpty());
if (selectedRows.isEmpty()) {
m_ui->allowButton->clearFocus();
m_ui->denyButton->setFocus();
}
}
bool BrowserAccessControlDialog::areAllDisabled() const
{
auto areAllDisabled = true;
for (const auto& item : getAllItems()) {
if (item->flags() != Qt::NoItemFlags) {
areAllDisabled = false;
}
}
return notSelected;
return areAllDisabled;
}
QList<QTableWidgetItem*> BrowserAccessControlDialog::getAllItems() const
{
QList<QTableWidgetItem*> items;
for (int i = 0; i < m_ui->itemsTable->rowCount(); ++i) {
auto item = m_ui->itemsTable->item(i, 0);
items.append(item);
}
return items;
}