add incoming contact Request windows

This commit is contained in:
DenioD
2020-05-08 21:25:43 +02:00
parent 8fe06f39e9
commit 5006a8c7d7
4 changed files with 8 additions and 13 deletions

View File

@@ -100,10 +100,7 @@ void ChatModel::renderChatBox(Ui::MainWindow* ui, QListView &view)
void ChatModel::renderChatBox(Ui::MainWindow* ui, QListView *view) void ChatModel::renderChatBox(Ui::MainWindow* ui, QListView *view)
{ {
QObject::connect(ui->pushContact, &QPushButton::clicked,[&] ()
{
renderContactRequest();
});
QStandardItemModel* chat = new QStandardItemModel(); QStandardItemModel* chat = new QStandardItemModel();
// ui->lcdNumber->setStyleSheet("background-color: red"); // ui->lcdNumber->setStyleSheet("background-color: red");
@@ -149,10 +146,10 @@ void ChatModel::renderChatBox(Ui::MainWindow* ui, QListView *view)
} }
void ChatModel::renderContactRequest(){ void MainWindow::renderContactRequest(){
Ui_requestDialog requestContact; Ui_requestDialog requestContact;
QDialog dialog(main); QDialog dialog(this);
requestContact.setupUi(&dialog); requestContact.setupUi(&dialog);
Settings::saveRestore(&dialog); Settings::saveRestore(&dialog);
@@ -214,8 +211,6 @@ void ChatModel::renderContactRequest(){
} }
}); });
QObject::connect(requestContact.pushButton, &QPushButton::clicked, [&] () { QObject::connect(requestContact.pushButton, &QPushButton::clicked, [&] () {
QString cid = requestContact.requestCID->text(); QString cid = requestContact.requestCID->text();
@@ -228,7 +223,7 @@ void ChatModel::renderContactRequest(){
qDebug()<<"Beginn kopiert" <<cid << addr << newLabel << myAddr; qDebug()<<"Beginn kopiert" <<cid << addr << newLabel << myAddr;
AddressBook::getInstance()->addAddressLabel(newLabel, addr, myAddr, cid, avatar); AddressBook::getInstance()->addAddressLabel(newLabel, addr, myAddr, cid, avatar);
QMessageBox::information(main, "Added Contact","successfully added your new contact. You can now Chat with this contact"); QMessageBox::information(this, "Added Contact","successfully added your new contact. You can now Chat with this contact");
@@ -238,8 +233,6 @@ void ChatModel::renderContactRequest(){
dialog.exec(); dialog.exec();
} }
void ChatModel::addCid(QString tx, QString cid) void ChatModel::addCid(QString tx, QString cid)
{ {
this->cidMap[tx] = cid; this->cidMap[tx] = cid;

View File

@@ -329,7 +329,7 @@ class ChatModel
void setItems(std::vector<ChatItem> items); void setItems(std::vector<ChatItem> items);
void renderChatBox(Ui::MainWindow* ui, QListView &view); void renderChatBox(Ui::MainWindow* ui, QListView &view);
void renderChatBox(Ui::MainWindow* ui, QListView *view); void renderChatBox(Ui::MainWindow* ui, QListView *view);
void renderContactRequest(); // void renderContactRequest();
void triggerRequest(); void triggerRequest();
void showMessages(); void showMessages();
void clear(); void clear();

View File

@@ -1057,6 +1057,7 @@ void MainWindow::setupchatTab() {
QObject::connect(ui->sendChatButton, &QPushButton::clicked, this, &MainWindow::sendChatButton); QObject::connect(ui->sendChatButton, &QPushButton::clicked, this, &MainWindow::sendChatButton);
QObject::connect(ui->sendContact, &QPushButton::clicked, this, &MainWindow::ContactRequest); QObject::connect(ui->sendContact, &QPushButton::clicked, this, &MainWindow::ContactRequest);
QObject::connect(ui->safeContactRequest, &QPushButton::clicked, this, &MainWindow::addContact); QObject::connect(ui->safeContactRequest, &QPushButton::clicked, this, &MainWindow::addContact);
QObject::connect(ui->pushContact, &QPushButton::clicked, this , &MainWindow::renderContactRequest);
///////// Set selected Zaddr for Chat with Klick ///////// Set selected Zaddr for Chat with Klick

View File

@@ -62,6 +62,7 @@ public:
void updateLabels(); void updateLabels();
void updateTAddrCombo(bool checked); void updateTAddrCombo(bool checked);
// void renderContactRequest();
// void setChatItem(ChatItem* item); // void setChatItem(ChatItem* item);
//void ChatItem* getChatItem(); //void ChatItem* getChatItem();