DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

prevent to send message without contact #81

Browse Source
This commit is contained in:
DenioD
2020-06-05 23:55:31 +02:00
parent e65cc54e79
commit ec3afa57ce
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/chatmodel.cpp
View File

@@ -540,7 +540,7 @@ void MainWindow::sendChat() {
QString Name = ui->contactNameMemo->text(); QString Name = ui->contactNameMemo->text();
int sizename = Name.size(); int sizename = Name.size();
qDebug()<< sizename; 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"), 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"), tr("You have selected no Contact from Contactlist,\n") + tr("\nor your Memo is empty"),

6
src/mainwindow.cpp
View File

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