From 5db313caee0665b4faf9db00e8f6b34620e952fa Mon Sep 17 00:00:00 2001 From: Imanol-Mikel Barba Sabariego Date: Tue, 7 Jan 2014 00:06:23 +0000 Subject: [PATCH] git-svn-id: svn://imanolbarba.net/PAD@47 c2ee353e-ed0d-4329-bf56-03aec153487f --- QChatClient/chatroom.cpp | 7 ++----- QChatClient/chatroom.ui | 3 +++ build-QChatClient-Desktop-Debug/QChatClient | Bin 1893132 -> 0 bytes build-QChatClient-Desktop-Debug/ui_chatroom.h | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/QChatClient/chatroom.cpp b/QChatClient/chatroom.cpp index be4b8c5..da17c68 100644 --- a/QChatClient/chatroom.cpp +++ b/QChatClient/chatroom.cpp @@ -189,6 +189,7 @@ void Chatroom::setConnected(bool status) this->ui->inputText->setReadOnly(true); this->ui->sendButton->setDisabled(true); this->ui->actionDisconnect->setDisabled(true); + this->ui->userList->clear(); } else if(status == true) { @@ -373,11 +374,7 @@ void Chatroom::startSession() LoginScreen login(&s,this); login.exec(); int result = login.result(); - if(result == QDialog::Accepted) - { - ui->inputText->setReadOnly(false); - } - else if(result == QDialog::Rejected) + if(result == QDialog::Rejected) { return; } diff --git a/QChatClient/chatroom.ui b/QChatClient/chatroom.ui index 0905cd5..8c6539a 100644 --- a/QChatClient/chatroom.ui +++ b/QChatClient/chatroom.ui @@ -69,6 +69,9 @@ + + true + 0 diff --git a/build-QChatClient-Desktop-Debug/QChatClient b/build-QChatClient-Desktop-Debug/QChatClient index b368172..60f4e9d 100755 Binary files a/build-QChatClient-Desktop-Debug/QChatClient and b/build-QChatClient-Desktop-Debug/QChatClient differ diff --git a/build-QChatClient-Desktop-Debug/ui_chatroom.h b/build-QChatClient-Desktop-Debug/ui_chatroom.h index c355dd4..6b17446 100644 --- a/build-QChatClient-Desktop-Debug/ui_chatroom.h +++ b/build-QChatClient-Desktop-Debug/ui_chatroom.h @@ -97,6 +97,7 @@ public: windowSplitter->addWidget(chatWindow); userList = new QListWidget(windowSplitter); userList->setObjectName(QStringLiteral("userList")); + userList->setEnabled(true); QSizePolicy sizePolicy1(QSizePolicy::Ignored, QSizePolicy::Expanding); sizePolicy1.setHorizontalStretch(0); sizePolicy1.setVerticalStretch(0); -- libgit2 0.22.2