diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 807b43667..7a6c5f263 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -344,14 +344,6 @@ void MainWindow::initStackedPage() addPage(homePage = new HomePage(ui->stackPages), grp, NULL); - addPage(newsFeed = new NewsFeed(ui->stackPages), grp, ¬ify); - addPage(friendsDialog = new FriendsDialog(ui->stackPages), grp, ¬ify); - -#ifdef RS_USE_NEW_PEOPLE_DIALOG - PeopleDialog *peopleDialog = NULL; - addPage(peopleDialog = new PeopleDialog(ui->stackPages), grp, ¬ify); -#endif - addPage(idDialog = new IdDialog(ui->stackPages), grp, ¬ify); //#ifdef RS_USE_CIRCLES @@ -359,13 +351,18 @@ void MainWindow::initStackedPage() // addPage(circlesDialog = new CirclesDialog(ui->stackPages), grp, ¬ify); //#endif - addPage(transfersDialog = new TransfersDialog(ui->stackPages), grp, ¬ify); addPage(chatLobbyDialog = new ChatLobbyWidget(ui->stackPages), grp, ¬ify); - addPage(messagesDialog = new MessagesDialog(ui->stackPages), grp, ¬ify); + addPage(transfersDialog = new TransfersDialog(ui->stackPages), grp, ¬ify); addPage(gxschannelDialog = new GxsChannelDialog(ui->stackPages), grp, ¬ify); addPage(gxsforumDialog = new GxsForumsDialog(ui->stackPages), grp, ¬ify); + addPage(messagesDialog = new MessagesDialog(ui->stackPages), grp, ¬ify); addPage(postedDialog = new PostedDialog(ui->stackPages), grp, ¬ify); - + addPage(friendsDialog = new FriendsDialog(ui->stackPages), grp, ¬ify); + #ifdef RS_USE_NEW_PEOPLE_DIALOG + PeopleDialog *peopleDialog = NULL; + addPage(peopleDialog = new PeopleDialog(ui->stackPages), grp, ¬ify); + #endif + addPage(newsFeed = new NewsFeed(ui->stackPages), grp, ¬ify); #ifdef RS_USE_WIKI WikiDialog *wikiDialog = NULL; addPage(wikiDialog = new WikiDialog(ui->stackPages), grp, ¬ify); @@ -430,7 +427,8 @@ void MainWindow::initStackedPage() #endif /** Add icon on Action bar */ - addAction(new QAction(QIcon(IMAGE_ADDFRIEND), tr("Add"), ui->toolBarAction), &MainWindow::addFriend, SLOT(addFriend())); + // I remove add a friend because it's in HOME ghibli + //addAction(new QAction(QIcon(IMAGE_ADDFRIEND), tr("Add"), ui->toolBarAction), &MainWindow::addFriend, SLOT(addFriend())); //addAction(new QAction(QIcon(IMAGE_NEWRSCOLLECTION), tr("New"), ui->toolBarAction), &MainWindow::newRsCollection, SLOT(newRsCollection())); addAction(new QAction(QIcon(IMAGE_PREFERENCES), tr("Options"), ui->toolBarAction), &MainWindow::showSettings, SLOT(showSettings())); addAction(new QAction(QIcon(IMAGE_ABOUT), tr("About"), ui->toolBarAction), &MainWindow::showabout, SLOT(showabout()));