Browse Source

prevent to send message without contact #81

pull/130/head
DenioD 4 years ago
parent
commit
ec3afa57ce
  1. 2
      src/chatmodel.cpp
  2. 6
      src/mainwindow.cpp

2
src/chatmodel.cpp

@ -540,7 +540,7 @@ void MainWindow::sendChat() {
QString Name = ui->contactNameMemo->text();
int sizename = Name.size();
qDebug()<< sizename;
if ((sizename < 1) || (ui->memoTxtChat->toPlainText().trimmed().isEmpty())) {
if ((ui->contactNameMemo->text().isEmpty()) || (ui->memoTxtChat->toPlainText().trimmed().isEmpty())) {
QMessageBox msg(QMessageBox::Critical, tr("You have to select a contact and insert a Memo"),
tr("You have selected no Contact from Contactlist,\n") + tr("\nor your Memo is empty"),

6
src/mainwindow.cpp

@ -1368,6 +1368,7 @@ void MainWindow::setupchatTab() {
QObject::connect(ui->pushContact, &QPushButton::clicked, this , &MainWindow::renderContactRequest);
///////// Set selected Zaddr for Chat with Klick
ui->contactNameMemo->setText("");
QObject::connect(ui->listContactWidget, &QTableView::clicked, [=] () {
@ -1401,6 +1402,7 @@ void MainWindow::setupchatTab() {
ui->listContactWidget->addAction(HushAction);
ui->listContactWidget->addAction(requestHushAction);
ui->listContactWidget->addAction(subatomicAction);
QObject::connect(requestHushAction, &QAction::triggered, [=]() {
QModelIndex index = ui->listContactWidget->currentIndex();
QString label_contact = index.data(Qt::DisplayRole).toString();
@ -1411,8 +1413,8 @@ void MainWindow::setupchatTab() {
rpc->refresh(true);
}
MainWindow::showRequesthush();
MainWindow::showRequesthush();
});
QObject::connect(editAction, &QAction::triggered, [=]() {

Loading…
Cancel
Save