mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-02-09 19:38:45 -05:00
Merge pull request #1806 from sehraf/pr_move-log-tab
Insert wiki/etc and plugins before the log tab
This commit is contained in:
commit
b1680bd591
@ -421,7 +421,6 @@ void MainWindow::initStackedPage()
|
|||||||
PeopleDialog *peopleDialog = NULL;
|
PeopleDialog *peopleDialog = NULL;
|
||||||
addPage(peopleDialog = new PeopleDialog(ui->stackPages), grp, ¬ify);
|
addPage(peopleDialog = new PeopleDialog(ui->stackPages), grp, ¬ify);
|
||||||
#endif
|
#endif
|
||||||
addPage(newsFeed = new NewsFeed(ui->stackPages), grp, ¬ify);
|
|
||||||
#ifdef RS_USE_WIKI
|
#ifdef RS_USE_WIKI
|
||||||
WikiDialog *wikiDialog = NULL;
|
WikiDialog *wikiDialog = NULL;
|
||||||
addPage(wikiDialog = new WikiDialog(ui->stackPages), grp, ¬ify);
|
addPage(wikiDialog = new WikiDialog(ui->stackPages), grp, ¬ify);
|
||||||
@ -492,6 +491,7 @@ void MainWindow::initStackedPage()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
addPage(newsFeed = new NewsFeed(ui->stackPages), grp, ¬ify);
|
||||||
addPage(settingsDialog = new SettingsPage(ui->stackPages),grp,¬ify);
|
addPage(settingsDialog = new SettingsPage(ui->stackPages),grp,¬ify);
|
||||||
|
|
||||||
/* Create the toolbar */
|
/* Create the toolbar */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user