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

prevent sending of empty memos from chatpage

Browse Source
This commit is contained in:
DenioD
2020-05-01 23:06:50 +02:00
parent c7d0acac71
commit 3b80b98c0d
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/chatmodel.cpp
View File

@@ -131,6 +131,9 @@ void ChatModel::renderChatBox(Ui::MainWindow* ui, QListWidget *view)
for(auto &p : AddressBook::getInstance()->getAllAddressLabels()){ for(auto &p : AddressBook::getInstance()->getAllAddressLabels()){
if ((p.getCid() == c.second.getCid())){ if ((p.getCid() == c.second.getCid())){
line+= QString("[") + "Verified Message" + QString("]"); ////Todo: Render a green checkmark instead of QString line+= QString("[") + "Verified Message" + QString("]"); ////Todo: Render a green checkmark instead of QString
}else{
// line+= QString("[") + "Warning. Not verified!" + QString("]");
} }
} }
line += QString("[") + myDateTime.toString("dd.MM.yyyy hh:mm:ss ") + QString("] "); line += QString("[") + myDateTime.toString("dd.MM.yyyy hh:mm:ss ") + QString("] ");
@@ -234,7 +237,7 @@ Tx MainWindow::createTxFromChatPage() {
} }
void MainWindow::sendChatButton() { void MainWindow::sendChatButton() {
////////////////////////////Todo: Check if its a zaddr////////// ////////////////////////////Todo: Check if a Contact is selected//////////
// Create a Tx from the values on the send tab. Note that this Tx object // Create a Tx from the values on the send tab. Note that this Tx object
// might not be valid yet. // might not be valid yet.
@@ -242,17 +245,17 @@ void MainWindow::sendChatButton() {
// Memos can only be used with zAddrs. So check that first // Memos can only be used with zAddrs. So check that first
// for(auto &c : AddressBook::getInstance()->getAllAddressLabels()) // for(auto &c : AddressBook::getInstance()->getAllAddressLabels())
// if (ui->ContactZaddr->text().trimmed() == c.getName()) { if (ui->ContactZaddr->text().trimmed().isEmpty() || ui->memoTxtChat->toPlainText().trimmed().isEmpty()) {
// auto addr = ""; // auto addr = "";
// if (! Settings::isZAddress(AddressBook::addressFromAddressLabel(addr->text()))) { // if (! Settings::isZAddress(AddressBook::addressFromAddressLabel(addr->text()))) {
// QMessageBox msg(QMessageBox::Critical, tr("Memos can only be used with z-addresses"), QMessageBox msg(QMessageBox::Critical, tr("You have to select a contact and insert a Memo"),
// tr("The memo field can only be used with a z-address.\n") + addr->text() + tr("\ndoesn't look like a z-address"), tr("You have selected no Contact from Contactlist,\n") + tr("\nor your Memo is empty"),
// QMessageBox::Ok, this); QMessageBox::Ok, this);
// msg.exec(); msg.exec();
// return; return;
// } }
Tx tx = createTxFromChatPage(); Tx tx = createTxFromChatPage();