Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 08:04:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2596 from ddobrev/master

Browse source 
Informed users who want to chat they have to log in first
This commit is contained in:
Stephen Birarda 2014-04-03 10:27:37 -07:00
commit cc199364e2
3 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
interface/interface_en.ts
View file

@ -44,32 +44,37 @@
<source> online now:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/ui/ChatWindow.cpp" line="47"/>
<source>You must be logged in to chat with others.</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
<location filename="src/ui/ChatWindow.cpp" line="135"/>
<location filename="src/ui/ChatWindow.cpp" line="139"/>
<source>day</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
<numerusform>%n day</numerusform>
<numerusform>%n days</numerusform>
</translation>
</message>
<message numerus="yes">
<location filename="src/ui/ChatWindow.cpp" line="135"/>
<location filename="src/ui/ChatWindow.cpp" line="139"/>
<source>hour</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
<numerusform>%n hour</numerusform>
<numerusform>%n hours</numerusform>
</translation>
</message>
<message numerus="yes">
<location filename="src/ui/ChatWindow.cpp" line="135"/>
<location filename="src/ui/ChatWindow.cpp" line="139"/>
<source>minute</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
<numerusform>%n minute</numerusform>
<numerusform>%n minutes</numerusform>
</translation>
</message>
<message>
<location filename="src/ui/ChatWindow.cpp" line="191"/>
<location filename="src/ui/ChatWindow.cpp" line="195"/>
<source>%1 online now:</source>
<translation type="unfinished"></translation>
</message>
@ -106,18 +111,18 @@
<context>
<name>Menu</name>
<message>
<location filename="src/Menu.cpp" line="462"/>
<location filename="src/Menu.cpp" line="461"/>
<source>Open .ini config file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/Menu.cpp" line="464"/>
<location filename="src/Menu.cpp" line="476"/>
<location filename="src/Menu.cpp" line="463"/>
<location filename="src/Menu.cpp" line="475"/>
<source>Text files (*.ini)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/Menu.cpp" line="474"/>
<location filename="src/Menu.cpp" line="473"/>
<source>Save .ini config file</source>
<translation type="unfinished"></translation>
</message>

10
interface/src/Menu.cpp
View file

@ -180,18 +180,17 @@ Menu::Menu() :
QMenu* toolsMenu = addMenu("Tools");
addActionToQMenuAndActionHash(toolsMenu, MenuOption::MetavoxelEditor, 0, this, SLOT(showMetavoxelEditor()));
#ifdef HAVE_QXMPP
_chatAction = addActionToQMenuAndActionHash(toolsMenu,
MenuOption::Chat,
Qt::Key_Return,
this,
SLOT(showChat()));
#ifdef HAVE_QXMPP
const QXmppClient& xmppClient = XmppClient::getInstance().getXMPPClient();
toggleChat();
connect(&xmppClient, SIGNAL(connected()), this, SLOT(toggleChat()));
connect(&xmppClient, SIGNAL(disconnected()), this, SLOT(toggleChat()));
#else
_chatAction->setEnabled(false);
#endif
QMenu* viewMenu = addMenu("View");
@ -1155,11 +1154,6 @@ void Menu::showMetavoxelEditor() {
}
void Menu::showChat() {
if (!_chatAction->isEnabled()) {
// Don't do anything if chat is disabled (No
// QXMPP library or xmpp is disconnected).
return;
}
QMainWindow* mainWindow = Application::getInstance()->getWindow();
if (!_chatWindow) {
mainWindow->addDockWidget(Qt::NoDockWidgetArea, _chatWindow = new ChatWindow());

4
interface/src/ui/ChatWindow.cpp
View file

@ -42,6 +42,10 @@ ChatWindow::ChatWindow() :
ui->messagesGridLayout->setColumnStretch(1, 3);
ui->messagePlainTextEdit->installEventFilter(this);
if (!AccountManager::getInstance().isLoggedIn()) {
ui->connectingToXMPPLabel->setText(tr("You must be logged in to chat with others."));
}
#ifdef HAVE_QXMPP
const QXmppClient& xmppClient = XmppClient::getInstance().getXMPPClient();