Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-04 23:25:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged branch v0.5-gxs-b1 into trunk (from -r 5351 -> 5995)

Browse source 
This brings a huge amount of goodness into the trunk,
but there is still a big chunk todo before it can be released.

 * GXS Backend.
 * GXS Services:
	- Identities.
	- Circles
	- Photos
	- Wiki
	- GxsForums
	- Posted.
 * SSH no-gui server.

See branch commits for more info.

To switch on GXS stuff, enable CONFIG += gxs
in both libretroshare.pro and retroshare-gui.pro



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5996 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-12-16 19:17:11 +00:00
commit 069b72e0b2
549 changed files with 111171 additions and 25579 deletions
Download patch file Download diff file Expand all files Collapse all files

7
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -322,10 +322,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
addAction(new QAction(QIcon(IMAGE_UNFINISHED), tr("Unfinished"), ui.toolBar), SLOT(showApplWindow()));
#endif
if (activatePage((Page) Settings->getLastPageInMainWindow()) == false) {
/* Select the first action */
grp->actions()[0]->setChecked(true);
}
ui.stackPages->setCurrentIndex(Settings->getLastPageInMainWindow());
/** StatusBar section ********/
/* initialize combobox in status bar */
@ -401,7 +398,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
/** Destructor. */
MainWindow::~MainWindow()
{
Settings->setLastPageInMainWindow(getActivatePage());
Settings->setLastPageInMainWindow(ui.stackPages->currentIndex());
delete peerstatus;
delete natstatus;