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

Corrected compilation pb + pushed news feed out of release version + put back network in left most place.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1111 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2009-04-03 20:39:04 +00:00
parent 304bd556e0
commit e0d25d507a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -174,9 +174,8 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
QActionGroup *grp = new QActionGroup(this); QActionGroup *grp = new QActionGroup(this);
NewsFeed *newsFeed = NULL; ui.stackPages->add(networkDialog = new NetworkDialog(ui.stackPages),
ui.stackPages->add(newsFeed = new NewsFeed(ui.stackPages), createPageAction(QIcon(IMAGE_NETWORK), tr("Network"), grp));
createPageAction(QIcon(IMAGE_NEWSFEED), tr("News Feed"), grp));
ui.stackPages->add(peersDialog = new PeersDialog(ui.stackPages), ui.stackPages->add(peersDialog = new PeersDialog(ui.stackPages),
@ -242,9 +241,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
#endif #endif
ui.stackPages->add(networkDialog = new NetworkDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_NETWORK), tr("Network"), grp));
ui.stackPages->add(pluginsPage = new PluginsPage(ui.stackPages), ui.stackPages->add(pluginsPage = new PluginsPage(ui.stackPages),
createPageAction(QIcon(IMAGE_PLUGINS), tr("Plugins"), grp)); createPageAction(QIcon(IMAGE_PLUGINS), tr("Plugins"), grp));
@ -275,6 +271,10 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
#else #else
NewsFeed *newsFeed = NULL;
ui.stackPages->add(newsFeed = new NewsFeed(ui.stackPages),
createPageAction(QIcon(IMAGE_NEWSFEED), tr("News Feed"), grp));
addAction(new QAction(QIcon(IMAGE_UNFINISHED), tr("Unfinished"), ui.toolBar), SLOT(showApplWindow())); addAction(new QAction(QIcon(IMAGE_UNFINISHED), tr("Unfinished"), ui.toolBar), SLOT(showApplWindow()));
toolAct = ui.toolBarservice->toggleViewAction(); toolAct = ui.toolBarservice->toggleViewAction();
@ -650,7 +650,7 @@ void MainWindow::closeEvent(QCloseEvent *e)
firstTime = false; firstTime = false;
} }
hide(); hide();
e->ignore();p e->ignore();
} }
} }