Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-28 00:07:09 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13 from felisucoibi/0.6-buttons

Browse Source 
0.6 buttons renamed chat lobbies to chat rooms
This commit is contained in:
felisucoibi 2017-01-18 10:55:01 +01:00 committed by GitHub
commit 717b455699
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
retroshare-gui/src/gui/ChatLobbyWidget.cpp
View File

@ -171,8 +171,8 @@ ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WindowFlags flags)
int S = QFontMetricsF(font()).height(); int S = QFontMetricsF(font()).height();
QString help_str = tr("\ QString help_str = tr("\
<h1><img width=\"%1\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Chat Lobbies</h1> \ <h1><img width=\"%1\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Chat Rooms</h1> \
<p>Chat lobbies are distributed chat rooms, and work pretty much like IRC. \ <p>Chat rooms work pretty much like IRC. \
They allow you to talk anonymously with tons of people without the need to make friends.</p> \ They allow you to talk anonymously with tons of people without the need to make friends.</p> \
<p>A chat lobby can be public (your friends see it) or private (your friends can't see it, unless you \ <p>A chat lobby can be public (your friends see it) or private (your friends can't see it, unless you \
invite them with <img src=\":/images/add_24x24.png\" width=%2/>). \ invite them with <img src=\":/images/add_24x24.png\" width=%2/>). \
@ -181,10 +181,10 @@ ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WindowFlags flags)
<p>The list at left shows \ <p>The list at left shows \
chat lobbies your friends are participating in. You can either \ chat lobbies your friends are participating in. You can either \
<ul> \ <ul> \
<li>Right click to create a new chat lobby</li> \ <li>Right click to create a new chat room</li> \
<li>Double click a chat lobby to enter, chat, and show it to your friends</li> \ <li>Double click a chat lobby to enter, chat, and show it to your friends</li> \
</ul> \ </ul> \
Note: For the chat lobbies to work properly, your computer needs be on time. So check your system clock!\ Note: For the chat rooms to work properly, your computer needs be on time. So check your system clock!\
</p> \ </p> \
" "
).arg(QString::number(2*S)).arg(QString::number(S)) ; ).arg(QString::number(2*S)).arg(QString::number(S)) ;

2
retroshare-gui/src/gui/ChatLobbyWidget.ui
View File

@ -72,7 +72,7 @@
<item> <item>
<widget class="StyledLabel" name="titleBarLabel"> <widget class="StyledLabel" name="titleBarLabel">
<property name="text"> <property name="text">
<string>Chat lobbies</string> <string>Chat rooms</string>
</property> </property>
</widget> </widget>
</item> </item>

4
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -348,7 +348,7 @@ void MainWindow::initStackedPage()
// CirclesDialog *circlesDialog = NULL; // CirclesDialog *circlesDialog = NULL;
// addPage(circlesDialog = new CirclesDialog(ui->stackPages), grp, &notify); // addPage(circlesDialog = new CirclesDialog(ui->stackPages), grp, &notify);
//#endif //#endif
addPage(friendsDialog = new FriendsDialog(ui->stackPages), grp, &notify);
addPage(chatLobbyDialog = new ChatLobbyWidget(ui->stackPages), grp, &notify); addPage(chatLobbyDialog = new ChatLobbyWidget(ui->stackPages), grp, &notify);
addPage(transfersDialog = new TransfersDialog(ui->stackPages), grp, &notify); addPage(transfersDialog = new TransfersDialog(ui->stackPages), grp, &notify);
addPage(gxschannelDialog = new GxsChannelDialog(ui->stackPages), grp, &notify); addPage(gxschannelDialog = new GxsChannelDialog(ui->stackPages), grp, &notify);
@ -356,7 +356,7 @@ void MainWindow::initStackedPage()
addPage(messagesDialog = new MessagesDialog(ui->stackPages), grp, &notify); addPage(messagesDialog = new MessagesDialog(ui->stackPages), grp, &notify);
addPage(postedDialog = new PostedDialog(ui->stackPages), grp, &notify); addPage(postedDialog = new PostedDialog(ui->stackPages), grp, &notify);
addPage(idDialog = new IdDialog(ui->stackPages), grp, &notify); addPage(idDialog = new IdDialog(ui->stackPages), grp, &notify);
addPage(friendsDialog = new FriendsDialog(ui->stackPages), grp, &notify);
#ifdef RS_USE_NEW_PEOPLE_DIALOG #ifdef RS_USE_NEW_PEOPLE_DIALOG
PeopleDialog *peopleDialog = NULL; PeopleDialog *peopleDialog = NULL;
addPage(peopleDialog = new PeopleDialog(ui->stackPages), grp, &notify); addPage(peopleDialog = new PeopleDialog(ui->stackPages), grp, &notify);

6
retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp
View File

@ -40,7 +40,7 @@ CreateLobbyDialog::CreateLobbyDialog(const std::set<RsPeerId>& peer_list, int pr
ui->setupUi(this); ui->setupUi(this);
ui->headerFrame->setHeaderImage(QPixmap(":/icons/png/chat-lobbies.png")); ui->headerFrame->setHeaderImage(QPixmap(":/icons/png/chat-lobbies.png"));
ui->headerFrame->setHeaderText(tr("Create Chat Lobby")); ui->headerFrame->setHeaderText(tr("Create Chat Room"));
RsGxsId default_identity ; RsGxsId default_identity ;
rsMsgs->getDefaultIdentityForChatLobby(default_identity) ; rsMsgs->getDefaultIdentityForChatLobby(default_identity) ;
@ -48,7 +48,7 @@ CreateLobbyDialog::CreateLobbyDialog(const std::set<RsPeerId>& peer_list, int pr
ui->idChooser_CB->loadIds(IDCHOOSER_ID_REQUIRED, default_identity); ui->idChooser_CB->loadIds(IDCHOOSER_ID_REQUIRED, default_identity);
#if QT_VERSION >= 0x040700 #if QT_VERSION >= 0x040700
ui->lobbyName_LE->setPlaceholderText(tr("Put a sensible lobby name here")); ui->lobbyName_LE->setPlaceholderText(tr("Put a sensible chat room name here"));
ui->lobbyTopic_LE->setPlaceholderText(tr("Set a descriptive topic here")); ui->lobbyTopic_LE->setPlaceholderText(tr("Set a descriptive topic here"));
#endif #endif
@ -149,7 +149,7 @@ void CreateLobbyDialog::createLobby()
ChatLobbyId id = rsMsgs->createChatLobby(lobby_name,gxs_id, lobby_topic, shareList, lobby_flags); ChatLobbyId id = rsMsgs->createChatLobby(lobby_name,gxs_id, lobby_topic, shareList, lobby_flags);
std::cerr << "gui: Created chat lobby " << std::hex << id << std::dec << std::endl ; std::cerr << "gui: Created chat room " << std::hex << id << std::dec << std::endl ;
// open chat window !! // open chat window !!
ChatDialog::chatFriend(ChatId(id)) ; ChatDialog::chatFriend(ChatId(id)) ;

14
retroshare-gui/src/gui/settings/NotifyPage.ui
View File

@ -47,7 +47,7 @@
<item> <item>
<widget class="QCheckBox" name="notify_Peers"> <widget class="QCheckBox" name="notify_Peers">
<property name="text"> <property name="text">
<string>Friend Connect</string> <string>Friend Connected</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -68,7 +68,7 @@
<item> <item>
<widget class="QCheckBox" name="notify_Posted"> <widget class="QCheckBox" name="notify_Posted">
<property name="text"> <property name="text">
<string>Posted</string> <string>Links</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -82,14 +82,14 @@
<item> <item>
<widget class="QCheckBox" name="notify_Messages"> <widget class="QCheckBox" name="notify_Messages">
<property name="text"> <property name="text">
<string>Messages</string> <string>Mails</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="notify_Chat"> <widget class="QCheckBox" name="notify_Chat">
<property name="text"> <property name="text">
<string>Chat</string> <string>Chats</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -242,7 +242,7 @@
<item> <item>
<widget class="QCheckBox" name="popup_ChatLobby"> <widget class="QCheckBox" name="popup_ChatLobby">
<property name="text"> <property name="text">
<string>Chat Lobby</string> <string>Chat Room</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -414,7 +414,7 @@
<item> <item>
<widget class="QCheckBox" name="systray_ChatLobby"> <widget class="QCheckBox" name="systray_ChatLobby">
<property name="text"> <property name="text">
<string>Chat lobbies</string> <string>Chat rooms</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -438,7 +438,7 @@
</widget> </widget>
<widget class="QWidget" name="tabChatLobbies"> <widget class="QWidget" name="tabChatLobbies">
<attribute name="title"> <attribute name="title">
<string>Chat Lobbies</string> <string>Chat Rooms</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="tabChatLobbiesVLayout"> <layout class="QVBoxLayout" name="tabChatLobbiesVLayout">
<item> <item>