blue/squawk
blue/squawk
2
3
Fork 8
Code Issues 23 Pull requests 3 Releases 10 Wiki Activity Actions

Own omemo key display, a bit of CMake clean up

Browse source
This commit is contained in:
Blue 2023-11-13 19:05:26 -03:00
parent 19835af3cf
commit 00af582287
Signed by: blue
GPG key ID: 9B203B252A63EE38
16 changed files with 443 additions and 360 deletions
Download patch file Download diff file Expand all files Collapse all files

71
ui/widgets/info/omemo/omemo.cpp
View file

@ -1,18 +1,20 @@
// Squawk messenger.
// Copyright (C) 2019 Yury Gubich <blue@macaw.me>
//
// 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 3 of the License, or
// (at your option) any later version.
//
// 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/>.
/*
* Squawk messenger.
* Copyright (C) 2019 Yury Gubich <blue@macaw.me>
*
* 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 3 of the License, or
* (at your option) any later version.
*
* 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 "omemo.h"
#include "ui_omemo.h"
@ -23,25 +25,31 @@ constexpr uint8_t fingerprintLength = 32;
UI::Omemo::Omemo(QWidget* parent):
QWidget(parent),
m_ui(new Ui::Omemo()),
deviceKeyDelegate(),
keysDelegate(),
unusedKeysDelegate(),
deviceKeyModel(),
keysModel(),
unusedKeysModel(),
contextMenu(new QMenu())
{
m_ui->setupUi(this);
m_ui->deviceKeyView->setItemDelegate(&deviceKeyDelegate);
m_ui->deviceKeyView->setModel(&deviceKeyModel);
m_ui->keysView->setItemDelegate(&keysDelegate);
m_ui->keysView->setModel(&keysModel);
m_ui->unusedKeysView->setItemDelegate(&unusedKeysDelegate);
m_ui->unusedKeysView->setModel(&unusedKeysModel);
unusedVisibility(false);
deviceKeyVisibility(false);
m_ui->keysView->setContextMenuPolicy(Qt::CustomContextMenu);
connect(m_ui->keysView, &QWidget::customContextMenuRequested, this, &Omemo::onActiveKeysContextMenu);
}
UI::Omemo::~Omemo()
{
UI::Omemo::~Omemo() {
contextMenu->deleteLater();
}
@ -50,9 +58,9 @@ void UI::Omemo::generateMockData() {
std::uniform_int_distribution<char> dist(CHAR_MIN, CHAR_MAX);
for (int i = 0; i < 5; ++i) {
QByteArray fp(fingerprintLength, 0);
for (int i = 0; i < fingerprintLength; ++i) {
for (int i = 0; i < fingerprintLength; ++i)
fp[i] = dist(rd);
}
Shared::KeyInfo info;
info.id = i;
if (i % 3 == 0)
@ -68,14 +76,21 @@ void UI::Omemo::generateMockData() {
void UI::Omemo::setData(const std::list<Shared::KeyInfo>& keys) {
keysModel.clear();
unusedKeysModel.clear();
deviceKeyModel.clear();
for (const Shared::KeyInfo& key : keys) {
keysModel.addKey(key);
if (key.currentDevice)
deviceKeyModel.addKey(key);
else
keysModel.addKey(key);
}
unusedVisibility(unusedKeysModel.rowCount() > 0);
deviceKeyVisibility(deviceKeyModel.rowCount() > 0);
}
const QString UI::Omemo::title() const {
return m_ui->OMEMOHeading->text();}
return m_ui->OMEMOHeading->text();
}
void UI::Omemo::onActiveKeysContextMenu(const QPoint& pos) {
contextMenu->clear();
@ -119,3 +134,15 @@ void UI::Omemo::onActiveKeysContextMenu(const QPoint& pos) {
contextMenu->popup(m_ui->keysView->viewport()->mapToGlobal(pos));
}
void UI::Omemo::deviceKeyVisibility(bool visible) {
m_ui->deviceKeyHeading->setVisible(visible);
m_ui->deviceKeyline->setVisible(visible);
m_ui->deviceKeyView->setVisible(visible);
}
void UI::Omemo::unusedVisibility(bool visible) {
m_ui->unusedKeysView->setVisible(visible);
m_ui->unusedKeysHeading->setVisible(visible);
m_ui->line->setVisible(visible);
}