Browse Source

add incoming contact Request windows

pull/130/head
DenioD 4 years ago
parent
commit
5006a8c7d7
  1. 17
      src/chatmodel.cpp
  2. 2
      src/chatmodel.h
  3. 1
      src/mainwindow.cpp
  4. 1
      src/mainwindow.h

17
src/chatmodel.cpp

@ -100,10 +100,7 @@ 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();
// ui->lcdNumber->setStyleSheet("background-color: red");
@ -149,17 +146,17 @@ void ChatModel::renderChatBox(Ui::MainWindow* ui, QListView *view)
}
void ChatModel::renderContactRequest(){
void MainWindow::renderContactRequest(){
Ui_requestDialog requestContact;
QDialog dialog(main);
QDialog dialog(this);
requestContact.setupUi(&dialog);
Settings::saveRestore(&dialog);
{
QStandardItemModel* contactRequest = new QStandardItemModel();
for (auto &c : DataStore::getChatDataStore()->getAllRawChatItems())//this->chatItems)
{
@ -214,8 +211,6 @@ void ChatModel::renderContactRequest(){
}
});
QObject::connect(requestContact.pushButton, &QPushButton::clicked, [&] () {
QString cid = requestContact.requestCID->text();
@ -228,7 +223,7 @@ void ChatModel::renderContactRequest(){
qDebug()<<"Beginn kopiert" <<cid << addr << newLabel << myAddr;
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();
}
void ChatModel::addCid(QString tx, QString cid)
{
this->cidMap[tx] = cid;

2
src/chatmodel.h

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

1
src/mainwindow.cpp

@ -1057,6 +1057,7 @@ void MainWindow::setupchatTab() {
QObject::connect(ui->sendChatButton, &QPushButton::clicked, this, &MainWindow::sendChatButton);
QObject::connect(ui->sendContact, &QPushButton::clicked, this, &MainWindow::ContactRequest);
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

1
src/mainwindow.h

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

Loading…
Cancel
Save