From e0d25d507ac829c6d61d4f02511f8faa4d16b182 Mon Sep 17 00:00:00 2001 From: csoler Date: Fri, 3 Apr 2009 20:39:04 +0000 Subject: [PATCH] Corrected compilation pb + pushed news feed out of release version + put back network in left most place. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1111 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/MainWindow.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 3fb2ee5fc..4ea52ff7d 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -174,9 +174,8 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) QActionGroup *grp = new QActionGroup(this); - NewsFeed *newsFeed = NULL; - ui.stackPages->add(newsFeed = new NewsFeed(ui.stackPages), - createPageAction(QIcon(IMAGE_NEWSFEED), tr("News Feed"), grp)); + ui.stackPages->add(networkDialog = new NetworkDialog(ui.stackPages), + createPageAction(QIcon(IMAGE_NETWORK), tr("Network"), grp)); ui.stackPages->add(peersDialog = new PeersDialog(ui.stackPages), @@ -242,9 +241,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) #endif - ui.stackPages->add(networkDialog = new NetworkDialog(ui.stackPages), - createPageAction(QIcon(IMAGE_NETWORK), tr("Network"), grp)); - ui.stackPages->add(pluginsPage = new PluginsPage(ui.stackPages), createPageAction(QIcon(IMAGE_PLUGINS), tr("Plugins"), grp)); @@ -275,6 +271,10 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) #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())); toolAct = ui.toolBarservice->toggleViewAction(); @@ -650,7 +650,7 @@ void MainWindow::closeEvent(QCloseEvent *e) firstTime = false; } hide(); - e->ignore();p + e->ignore(); } }