Use tab widget for welcome page. Move init to start of app

NathanW2 · NathanW2 · commit 100a60981c1c · 2015-08-26T12:15:24.000+10:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -582,7 +582,16 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
   int myBlue = settings.value( "/qgis/default_canvas_color_blue", 255 ).toInt();
   mMapCanvas->setCanvasColor( QColor( myRed, myGreen, myBlue ) );
 
-  centralLayout->addWidget( mMapCanvas, 0, 0, 2, 1 );
+  mWelcomePage = new QgsWelcomePage;
+
+  mCentralContainer = new QStackedWidget;
+  mCentralContainer->insertWidget( 0, mMapCanvas );
+  mCentralContainer->insertWidget( 1, mWelcomePage );
+
+  qobject_cast<QGridLayout *>( centralWidget->layout() )->addWidget( mCentralContainer, 0, 0, 2, 1 );
+
+  mCentralContainer->setCurrentIndex( 1 );
+
 
   // a bar to warn the user with non-blocking messages
   mInfoBar = new QgsMessageBar( centralWidget );
@@ -3913,19 +3922,8 @@ void QgisApp::fileOpenAfterLaunch()
   QString projPath = QString();
   if ( projOpen == 0 ) // welcome page
   {
-    mWelcomePage = new QgsWelcomePage;
-
-    mCentralContainer = new QStackedWidget;
-    mCentralContainer->insertWidget( 0, mMapCanvas );
-    mCentralContainer->insertWidget( 1, mWelcomePage );
-
     connect( mMapCanvas, SIGNAL( layersChanged() ), this, SLOT( showMapCanvas() ) );
     connect( this, SIGNAL( newProject() ), this, SLOT( showMapCanvas() ) );
-
-    qobject_cast<QGridLayout *>( centralWidget()->layout() )->addWidget( mCentralContainer, 0, 0, 2, 1 );
-
-    mCentralContainer->setCurrentIndex( 1 );
-
     return;
   }
   if ( projOpen == 1 && mRecentProjects.size() > 0 ) // most recent project
diff --git a/src/app/qgswelcomepage.cpp b/src/app/qgswelcomepage.cpp
@@ -26,7 +26,7 @@
 #include <QDesktopServices>
 
 QgsWelcomePage::QgsWelcomePage( QWidget* parent )
-    : QWidget( parent )
+    : QTabWidget( parent )
 {
   QVBoxLayout* mainLayout = new QVBoxLayout;
   mainLayout->setMargin( 0 );
@@ -62,7 +62,7 @@ QgsWelcomePage::QgsWelcomePage( QWidget* parent )
 
   recentProjctsContainer->layout()->addWidget( recentProjectsListView );
 
-  layout->addWidget( recentProjctsContainer );
+  addTab( recentProjctsContainer, "Recent Projects" );
 
   QWidget* whatsNewContainer = new QWidget;
   whatsNewContainer->setLayout( new QVBoxLayout );
@@ -73,14 +73,14 @@ QgsWelcomePage::QgsWelcomePage( QWidget* parent )
   whatsNewPage->setUrl( QUrl::fromLocalFile( QgsApplication::whatsNewFilePath() ) );
   whatsNewPage->page()->setLinkDelegationPolicy( QWebPage::DelegateAllLinks );
   whatsNewPage->setContextMenuPolicy( Qt::NoContextMenu );
-  whatsNewPage->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Expanding );
+  whatsNewPage->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
   whatsNewPage->setStyleSheet( "background:transparent" );
   whatsNewPage->setAttribute( Qt::WA_TranslucentBackground );
 
   whatsNewContainer->layout()->addWidget( whatsNewPage );
-  whatsNewContainer->setMaximumWidth( 250 );
-  whatsNewContainer->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Preferred );
-  layout->addWidget( whatsNewContainer );
+//  whatsNewContainer->setMaximumWidth( 250 );
+//  whatsNewContainer->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Preferred );
+  addTab( whatsNewContainer, "News" );
 
   connect( whatsNewPage, SIGNAL( linkClicked( QUrl ) ), this, SLOT( whatsNewLinkClicked( QUrl ) ) );
 
diff --git a/src/app/qgswelcomepage.h b/src/app/qgswelcomepage.h
@@ -16,12 +16,13 @@
 #ifndef QGSWELCOMEDIALOG_H
 #define QGSWELCOMEDIALOG_H
 
+#include <QTabWidget>
 #include <QWidget>
 #include <QLabel>
 
 #include "qgswelcomepageitemsmodel.h"
 
-class QgsWelcomePage : public QWidget
+class QgsWelcomePage : public QTabWidget
 {
     Q_OBJECT
 
