Browse Source

Merge pull request #182 from MyHush/dev

lock emoji button too
pull/203/merge v1.3.9
Denio 4 years ago
committed by GitHub
parent
commit
0ff3ddc2e4
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/Chat/Chat.cpp
  2. 9
      src/mainwindow.cpp

2
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

9
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())

Loading…
Cancel
Save