Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-18 05:44:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11 from felisucoibi/0.6-buttons

Browse Source 
0.6 buttons v2
This commit is contained in:
felisucoibi 2017-01-17 16:56:17 +01:00 committed by GitHub
commit 8519b790bd
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/FriendsDialog.h
View File

@ -57,7 +57,7 @@ public:
~FriendsDialog ();
virtual QIcon iconPixmap() const { return QIcon(IMAGE_NETWORK) ; } //MainPage
virtual QString pageName() const { return tr("Network") ; } //MainPage
virtual QString pageName() const { return tr("Friends") ; } //MainPage
virtual QString helpText() const { return ""; } //MainPage
virtual UserNotify *getUserNotify(QObject *parent);

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

@ -344,8 +344,6 @@ void MainWindow::initStackedPage()
addPage(homePage = new HomePage(ui->stackPages), grp, NULL);
addPage(idDialog = new IdDialog(ui->stackPages), grp, &notify);
//#ifdef RS_USE_CIRCLES
// CirclesDialog *circlesDialog = NULL;
// addPage(circlesDialog = new CirclesDialog(ui->stackPages), grp, &notify);
@ -357,6 +355,7 @@ void MainWindow::initStackedPage()
addPage(gxsforumDialog = new GxsForumsDialog(ui->stackPages), grp, &notify);
addPage(messagesDialog = new MessagesDialog(ui->stackPages), grp, &notify);
addPage(postedDialog = new PostedDialog(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
PeopleDialog *peopleDialog = NULL;

2
retroshare-gui/src/gui/chat/ChatLobbyUserNotify.cpp
View File

@ -33,7 +33,7 @@
ChatLobbyUserNotify::ChatLobbyUserNotify(QObject *parent) :
UserNotify(parent)
{
_name = tr("Chat Lobbies");
_name = tr("Chats");
_group = "ChatLobby";
_bCheckForNickName = Settings->valueFromGroup(_group, "CheckForNickName", true).toBool();