From baa9713384c9b55b1236062c73e10fdb49ca5f77 Mon Sep 17 00:00:00 2001 From: csoler Date: Sat, 21 Jan 2017 21:38:10 +0100 Subject: [PATCH] partially changed lobby->chat room in displayed strings in the GUI --- retroshare-gui/src/gui/ChatLobbyWidget.cpp | 40 +++++++++---------- .../src/gui/chat/ChatLobbyDialog.cpp | 18 ++++----- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.cpp b/retroshare-gui/src/gui/ChatLobbyWidget.cpp index a7efa552d..7b97e15a5 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.cpp +++ b/retroshare-gui/src/gui/ChatLobbyWidget.cpp @@ -174,15 +174,15 @@ ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WindowFlags flags)

  Chat Rooms

\

Chat rooms work pretty much like IRC. \ They allow you to talk anonymously with tons of people without the need to make friends.

\ -

A chat lobby can be public (your friends see it) or private (your friends can't see it, unless you \ +

A chat room can be public (your friends see it) or private (your friends can't see it, unless you \ invite them with ). \ - Once you have been invited to a private lobby, you will be able to see it when your friends \ + Once you have been invited to a private room, you will be able to see it when your friends \ are using it.

\

The list at left shows \ chat lobbies your friends are participating in. You can either \

\ Note: For the chat rooms to work properly, your computer needs be on time. So check your system clock!\

\ @@ -255,7 +255,7 @@ void ChatLobbyWidget::lobbyTreeWidgetCustomPopupMenu(QPoint) QMenu contextMnu(this); if (item && item->type() == TYPE_FOLDER) { - QAction *action = contextMnu.addAction(QIcon(IMAGE_CREATE), tr("Create chat lobby"), this, SLOT(createChatLobby())); + QAction *action = contextMnu.addAction(QIcon(IMAGE_CREATE), tr("Create chat room"), this, SLOT(createChatLobby())); action->setData(item->data(COLUMN_DATA, ROLE_PRIVACYLEVEL).toInt()); } @@ -265,7 +265,7 @@ void ChatLobbyWidget::lobbyTreeWidgetCustomPopupMenu(QPoint) rsIdentity->getOwnIds(own_identities) ; if (item->data(COLUMN_DATA, ROLE_SUBSCRIBED).toBool()) - contextMnu.addAction(QIcon(IMAGE_UNSUBSCRIBE), tr("Leave this lobby"), this, SLOT(unsubscribeItem())); + contextMnu.addAction(QIcon(IMAGE_UNSUBSCRIBE), tr("Leave this room"), this, SLOT(unsubscribeItem())); else { QTreeWidgetItem *item = ui.lobbyTreeWidget->currentItem(); @@ -280,18 +280,18 @@ void ChatLobbyWidget::lobbyTreeWidgetCustomPopupMenu(QPoint) if(own_identities.empty()) { if(removed) - contextMnu.addAction(QIcon(IMAGE_SUBSCRIBE), tr("Create a non anonymous identity and enter this lobby"), this, SLOT(createIdentityAndSubscribe())); + contextMnu.addAction(QIcon(IMAGE_SUBSCRIBE), tr("Create a non anonymous identity and enter this room"), this, SLOT(createIdentityAndSubscribe())); else - contextMnu.addAction(QIcon(IMAGE_SUBSCRIBE), tr("Create an identity and enter this lobby"), this, SLOT(createIdentityAndSubscribe())); + contextMnu.addAction(QIcon(IMAGE_SUBSCRIBE), tr("Create an identity and enter this chat room"), this, SLOT(createIdentityAndSubscribe())); } else if(own_identities.size() == 1) { - QAction *action = contextMnu.addAction(QIcon(IMAGE_SUBSCRIBE), tr("Enter this lobby"), this, SLOT(subscribeChatLobbyAs())); + QAction *action = contextMnu.addAction(QIcon(IMAGE_SUBSCRIBE), tr("Enter this chat room"), this, SLOT(subscribeChatLobbyAs())); action->setData(QString::fromStdString((own_identities.front()).toStdString())) ; } else { - QMenu *mnu = contextMnu.addMenu(QIcon(IMAGE_SUBSCRIBE),tr("Enter this lobby as...")) ; + QMenu *mnu = contextMnu.addMenu(QIcon(IMAGE_SUBSCRIBE),tr("Enter this chat room as...")) ; for(std::list::const_iterator it=own_identities.begin();it!=own_identities.end();++it) { @@ -405,7 +405,7 @@ void ChatLobbyWidget::addChatPage(ChatLobbyDialog *d) if(rsMsgs->getChatLobbyInfo(id,linfo)) _lobby_infos[id].default_icon = (linfo.lobby_flags & RS_CHAT_LOBBY_FLAGS_PUBLIC) ? QIcon(IMAGE_PUBLIC):QIcon(IMAGE_PRIVATE) ; else - std::cerr << "(EE) cannot find info for lobby " << std::hex << id << std::dec << std::endl; + std::cerr << "(EE) cannot find info for room " << std::hex << id << std::dec << std::endl; } } @@ -424,7 +424,7 @@ void ChatLobbyWidget::setCurrentChatPage(ChatLobbyDialog *d) void ChatLobbyWidget::updateDisplay() { #ifdef CHAT_LOBBY_GUI_DEBUG - std::cerr << "updating chat lobby display!" << std::endl; + std::cerr << "updating chat room display!" << std::endl; #endif std::vector visibleLobbies; rsMsgs->getListOfNearbyChatLobbies(visibleLobbies); @@ -795,7 +795,7 @@ void ChatLobbyWidget::subscribeChatLobbyAtItem(QTreeWidgetItem *item) if( (flags & RS_CHAT_LOBBY_FLAGS_PGP_SIGNED) && !(idd.mFlags & RS_IDENTITY_FLAGS_PGP_LINKED)) { - QMessageBox::warning(NULL,tr("Default identity is anonymous"),tr("You cannot join this lobby with your default identity, since it is anonymous and the lobby forbids it.")) ; + QMessageBox::warning(NULL,tr("Default identity is anonymous"),tr("You cannot join this chat room with your default identity, since it is anonymous and the chat room forbids it.")) ; return ; } } @@ -840,12 +840,12 @@ void ChatLobbyWidget::showBlankPage(ChatLobbyId id) ui.lobbysec_lineEdit->setText( (( (*it).lobby_flags & RS_CHAT_LOBBY_FLAGS_PGP_SIGNED)?tr("No anonymous IDs"):tr("Anonymous IDs accepted")) ); ui.lobbypeers_lineEdit->setText( QString::number((*it).total_number_of_peers) ); - QString text = tr("You're not subscribed to this lobby; Double click-it to enter and chat.") ; + QString text = tr("You're not subscribed to this chat room; Double click-it to enter and chat.") ; if(my_ids.empty()) { if( (*it).lobby_flags & RS_CHAT_LOBBY_FLAGS_PGP_SIGNED) - text += "\n\n"+tr("You will need to create a non anonymous identity in order to join this chat lobby.") ; + text += "\n\n"+tr("You will need to create a non anonymous identity in order to join this chat room.") ; else text += "\n\n"+tr("You will need to create an identity in order to join chat lobbies.") ; } @@ -861,7 +861,7 @@ void ChatLobbyWidget::showBlankPage(ChatLobbyId id) ui.lobbypeers_lineEdit->clear(); ui.lobbysec_lineEdit->clear(); - QString text = tr("No lobby selected. \nSelect lobbies at left to show details.\nDouble click lobbies to enter and chat.") ; + QString text = tr("No chat room selected. \nSelect chat rooms at left to show details.\nDouble click lobbies to enter and chat.") ; ui.lobbyInfoLabel->setText(text) ; } @@ -965,7 +965,7 @@ void ChatLobbyWidget::unsubscribeItem() void ChatLobbyWidget::unsubscribeChatLobby(ChatLobbyId id) { - std::cerr << "Unsubscribing from chat lobby" << std::endl; + std::cerr << "Unsubscribing from chat room" << std::endl; // close the tab. @@ -1072,12 +1072,12 @@ void ChatLobbyWidget::readChatLobbyInvites() for(std::list::const_iterator it(invites.begin());it!=invites.end();++it) { - QMessageBox mb(QObject::tr("Join chat lobby"), - tr("%1 invites you to chat lobby named %2").arg(QString::fromUtf8(rsPeers->getPeerName((*it).peer_id).c_str())).arg(RsHtml::plainText(it->lobby_name)), + QMessageBox mb(QObject::tr("Join chat room"), + tr("%1 invites you to chat room named %2").arg(QString::fromUtf8(rsPeers->getPeerName((*it).peer_id).c_str())).arg(RsHtml::plainText(it->lobby_name)), QMessageBox::Question, QMessageBox::Yes,QMessageBox::No, 0); - QLabel *label = new QLabel(tr("Choose an identity for this lobby:")); + QLabel *label = new QLabel(tr("Choose an identity for this chat room:")); GxsIdChooser *idchooser = new GxsIdChooser ; idchooser->loadIds(IDCHOOSER_ID_REQUIRED,default_id) ; @@ -1112,7 +1112,7 @@ void ChatLobbyWidget::readChatLobbyInvites() if(rsMsgs->acceptLobbyInvite((*it).lobby_id,chosen_id)) ChatDialog::chatFriend(ChatId((*it).lobby_id),true); else - std::cerr << "Can't join lobby with id 0x" << std::hex << (*it).lobby_id << std::dec << std::endl; + std::cerr << "Can't join chat room with id 0x" << std::hex << (*it).lobby_id << std::dec << std::endl; } } diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp index 987f12244..4056156bb 100644 --- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp +++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp @@ -178,7 +178,7 @@ ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::Wi unsubscribeButton->setMaximumSize(QSize(2.4*S,2.4*S)) ; unsubscribeButton->setText(QString()) ; unsubscribeButton->setAutoRaise(true) ; - unsubscribeButton->setToolTip(tr("Leave this lobby (Unsubscribe)")); + unsubscribeButton->setToolTip(tr("Leave this chat room (Unsubscribe)")); { QIcon icon ; @@ -314,7 +314,7 @@ void ChatLobbyDialog::init() { title = QString::fromUtf8(linfo.lobby_name.c_str()); - QString msg = tr("Welcome to lobby %1").arg(RsHtml::plainText(linfo.lobby_name)); + QString msg = tr("Welcome to chat room %1").arg(RsHtml::plainText(linfo.lobby_name)); _lobby_name = QString::fromUtf8(linfo.lobby_name.c_str()) ; if (!linfo.lobby_topic.empty()) { msg += "\n" + tr("Topic: %1").arg(RsHtml::plainText(linfo.lobby_topic)); @@ -480,9 +480,9 @@ void ChatLobbyDialog::addChatMsg(const ChatMessage& msg) QString notifyMsg = name + ": " + editor.toPlainText(); if(notifyMsg.length() > 30) - MainWindow::displayLobbySystrayMsg(tr("Lobby chat") + ": " + _lobby_name, notifyMsg.left(30) + QString("...")); + MainWindow::displayLobbySystrayMsg(tr("Room chat") + ": " + _lobby_name, notifyMsg.left(30) + QString("...")); else - MainWindow::displayLobbySystrayMsg(tr("Lobby chat") + ": " + _lobby_name, notifyMsg); + MainWindow::displayLobbySystrayMsg(tr("Room chat") + ": " + _lobby_name, notifyMsg); } // also update peer list. @@ -790,12 +790,12 @@ void ChatLobbyDialog::displayLobbyEvent(int event_type, const RsGxsId& gxs_id, c { case RS_CHAT_LOBBY_EVENT_PEER_LEFT: qsParticipant=gxs_id; - ui.chatWidget->addChatMsg(true, tr("Lobby management"), QDateTime::currentDateTime(), QDateTime::currentDateTime(), tr("%1 has left the lobby.").arg(RsHtml::plainText(name)), ChatWidget::MSGTYPE_SYSTEM); + ui.chatWidget->addChatMsg(true, tr("Lobby management"), QDateTime::currentDateTime(), QDateTime::currentDateTime(), tr("%1 has left the room.").arg(RsHtml::plainText(name)), ChatWidget::MSGTYPE_SYSTEM); emit peerLeft(id()) ; break; case RS_CHAT_LOBBY_EVENT_PEER_JOINED: qsParticipant=gxs_id; - ui.chatWidget->addChatMsg(true, tr("Lobby management"), QDateTime::currentDateTime(), QDateTime::currentDateTime(), tr("%1 joined the lobby.").arg(RsHtml::plainText(name)), ChatWidget::MSGTYPE_SYSTEM); + ui.chatWidget->addChatMsg(true, tr("Lobby management"), QDateTime::currentDateTime(), QDateTime::currentDateTime(), tr("%1 joined the room.").arg(RsHtml::plainText(name)), ChatWidget::MSGTYPE_SYSTEM); emit peerJoined(id()) ; break; case RS_CHAT_LOBBY_EVENT_PEER_STATUS: @@ -827,10 +827,10 @@ void ChatLobbyDialog::displayLobbyEvent(int event_type, const RsGxsId& gxs_id, c } break; case RS_CHAT_LOBBY_EVENT_KEEP_ALIVE: - //std::cerr << "Received keep alive packet from " << nickname.toStdString() << " in lobby " << getPeerId() << std::endl; + //std::cerr << "Received keep alive packet from " << nickname.toStdString() << " in chat room " << getPeerId() << std::endl; break; default: - std::cerr << "ChatLobbyDialog::displayLobbyEvent() Unhandled lobby event type " << event_type << std::endl; + std::cerr << "ChatLobbyDialog::displayLobbyEvent() Unhandled chat room event type " << event_type << std::endl; } if (!qsParticipant.isNull()) @@ -854,7 +854,7 @@ bool ChatLobbyDialog::canClose() } */ - if (QMessageBox::Yes == QMessageBox::question(this, tr("Unsubscribe to lobby"), tr("Do you want to unsubscribe to this chat lobby?"), QMessageBox::Yes | QMessageBox::No)) { + if (QMessageBox::Yes == QMessageBox::question(this, tr("Unsubscribe from chat room"), tr("Do you want to unsubscribe to this chat room?"), QMessageBox::Yes | QMessageBox::No)) { return true; }