forked from blue/squawk
some further work on omemo, far from done yet
This commit is contained in:
parent
6f32e99593
commit
77dd28b600
18 changed files with 161 additions and 43 deletions
|
@ -17,6 +17,8 @@
|
|||
#ifndef UI_WIDGETS_INFO_H
|
||||
#define UI_WIDGETS_INFO_H
|
||||
|
||||
#include <list>
|
||||
|
||||
#include <QWidget>
|
||||
#include <QScopedPointer>
|
||||
#include <QGraphicsOpacityEffect>
|
||||
|
@ -30,6 +32,10 @@
|
|||
#include "contactgeneral.h"
|
||||
#include "contactcontacts.h"
|
||||
#include "description.h"
|
||||
#ifdef WITH_OMEMO
|
||||
#include "omemo/omemo.h"
|
||||
#endif
|
||||
|
||||
|
||||
namespace UI {
|
||||
namespace Ui
|
||||
|
@ -58,6 +64,9 @@ private:
|
|||
void initializeContactGeneral(const QString& jid, const Shared::VCard& card, bool editable);
|
||||
void initializeContactContacts(const QString& jid, const Shared::VCard& card, bool editable);
|
||||
void initializeDescription(const QString& description, bool editable);
|
||||
#ifdef WITH_OMEMO
|
||||
void initializeOmemo(const std::list<Shared::KeyInfo>& keys);
|
||||
#endif
|
||||
void initializeOverlay();
|
||||
void initializeButtonBox();
|
||||
void clear();
|
||||
|
@ -68,6 +77,9 @@ private:
|
|||
QScopedPointer<Ui::Info> m_ui;
|
||||
ContactGeneral* contactGeneral;
|
||||
ContactContacts* contactContacts;
|
||||
#ifdef WITH_OMEMO
|
||||
Omemo* omemo;
|
||||
#endif
|
||||
Description* description;
|
||||
QWidget* overlay;
|
||||
Progress* progress;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue