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

Merge pull request #182 from MyHush/dev

Browse Source 
lock emoji button too
This commit is contained in:
Denio
2020-07-29 10:00:35 +02:00
committed by GitHub
parent 5e08b0f71b 851289fb4c
commit 0ff3ddc2e4
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Chat/Chat.cpp
View File

@@ -127,6 +127,8 @@ void Chat::renderChatBox(Ui::MainWindow *ui, QListView *view, QLabel *label)
chat->appendRow(Items1); chat->appendRow(Items1);
ui->listChat->setModel(chat); ui->listChat->setModel(chat);
ui->memoTxtChat->setEnabled(true); ui->memoTxtChat->setEnabled(true);
ui->emojiButton->setEnabled(true);
ui->sendChatButton->setEnabled(true);
} }
else else

11
src/mainwindow.cpp
View File

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