ui squawk refactoring

This commit is contained in:
Blue 2022-04-11 18:45:12 +03:00
parent 69e0c88d8d
commit 2c26c7e264
Signed by untrusted user: blue
GPG key ID: 9B203B252A63EE38
13 changed files with 263 additions and 61 deletions

View file

@ -31,7 +31,7 @@
#include <set>
#include <list>
#include "widgets/accounts.h"
#include "widgets/accounts/accounts.h"
#include "widgets/chat.h"
#include "widgets/room.h"
#include "widgets/newcontact.h"
@ -40,6 +40,7 @@
#include "widgets/vcard/vcard.h"
#include "widgets/settings/settings.h"
#include "widgets/about.h"
#include "dialogqueue.h"
#include "shared/shared.h"
@ -122,13 +123,12 @@ private:
Accounts* accounts;
Settings* preferences;
About* about;
DialogQueue dialogueQueue;
Models::Roster rosterModel;
Conversations conversations;
QMenu* contextMenu;
QDBusInterface dbus;
std::map<QString, VCard*> vCards;
std::deque<QString> requestedAccountsForPasswords;
QInputDialog* prompt;
Conversation* currentConversation;
QModelIndex restoreSelection;
bool needToRestore;
@ -161,8 +161,6 @@ private slots:
void onRequestArchive(const QString& account, const QString& jid, const QString& before);
void onRosterContextMenu(const QPoint& point);
void onItemCollepsed(const QModelIndex& index);
void onPasswordPromptAccepted();
void onPasswordPromptRejected();
void onRosterSelectionChanged(const QModelIndex& current, const QModelIndex& previous);
void onContextAboutToHide();
void onAboutSquawkCalled();
@ -171,8 +169,6 @@ private slots:
void onUnnoticedMessage(const QString& account, const Shared::Message& msg);
private:
void checkNextAccountForPassword();
void onPasswordPromptDone();
void subscribeConversation(Conversation* conv);
};