Merge pull request #182 from MyHush/dev

lock emoji button too
MyHush · Jul 29, 2020 · 0ff3ddc · 0ff3ddc
2 parents 5e08b0f + 851289f
commit 0ff3ddc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/Chat/Chat.cpp b/src/Chat/Chat.cpp
@@ -127,6 +127,8 @@ void Chat::renderChatBox(Ui::MainWindow *ui, QListView *view, QLabel *label)
                 chat->appendRow(Items1);
                 ui->listChat->setModel(chat);
                 ui->memoTxtChat->setEnabled(true);
+                ui->emojiButton->setEnabled(true);
+                ui->sendChatButton->setEnabled(true);
 
             }
             else

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -1423,6 +1423,8 @@ void MainWindow::setupTransactionsTab() {
 void MainWindow::setupchatTab() {
 
     ui->memoTxtChat->setEnabled(false);
+    ui->emojiButton->setEnabled(false);
+    ui->sendChatButton->setEnabled(false);
 
           /////////////Setting Icons for Chattab and different themes
 
@@ -1471,6 +1473,8 @@ void MainWindow::setupchatTab() {
     QObject::connect(ui->sendChatButton, &QPushButton::clicked, [&] () {
 
         ui->memoTxtChat->setEnabled(false);
+        ui->emojiButton->setEnabled(false);
+
 
     });
     QObject::connect(ui->safeContactRequest, &QPushButton::clicked, this, &MainWindow::addContact);
@@ -1613,9 +1617,12 @@ void MainWindow::setupchatTab() {
      ui->listContactWidget->addAction(HushAction);
      ui->listContactWidget->addAction(editAction); 
      ui->listContactWidget->addAction(subatomicAction);
+
      ui->memoTxtChat->setEnabled(false);
+     ui->emojiButton->setEnabled(false);
+     ui->sendChatButton->setEnabled(false);
 
-          QModelIndex index = ui->listContactWidget->currentIndex();
+        QModelIndex index = ui->listContactWidget->currentIndex();
         QString label_contact = index.data(Qt::DisplayRole).toString();
 
         for(auto &p : AddressBook::getInstance()->getAllAddressLabels())