MainWindow: integrated new WelcomeScreen widget

Initial integration of (not yet fully functional) WelcomeScreen.
This commit is contained in:
Tobias Doerffel
2009-08-21 19:12:36 +02:00
parent 34a20ba610
commit 0404cc760f
3 changed files with 24 additions and 5 deletions

View File

@@ -69,6 +69,9 @@ public:
return m_toolBar;
}
// show MainWidget or WelcomeScreen
void setMainWidgetVisible( bool _visible );
//int addWidgetToToolBar( QWidget * _w, int _row = -1, int _col = -1 );
//void addSpacingToToolBar( int _size );
@@ -158,6 +161,9 @@ private:
void toggleWindow( QWidget * _w );
QWidget * m_mainWidget;
QWidget * m_welcomeScreen;
QMdiArea * m_workspace;
QWidget * m_toolBar;

View File

@@ -73,6 +73,7 @@
#include "visualization_widget.h"
#include "ResourceBrowser.h"
#include "QuickLoadDialog.h"
#include "WelcomeScreen.h"
#include "gui/tracks/track_container_scene.h"
@@ -85,13 +86,13 @@ MainWindow::MainWindow() :
{
setAttribute( Qt::WA_DeleteOnClose );
QWidget * main_widget = new QWidget( this );
QVBoxLayout * vbox = new QVBoxLayout( main_widget );
m_mainWidget = new QWidget( this );
QVBoxLayout * vbox = new QVBoxLayout( m_mainWidget );
vbox->setSpacing( 0 );
vbox->setMargin( 0 );
QWidget * w = new QWidget( main_widget );
QWidget * w = new QWidget( m_mainWidget );
QHBoxLayout * hbox = new QHBoxLayout( w );
hbox->setSpacing( 0 );
hbox->setMargin( 0 );
@@ -139,7 +140,7 @@ MainWindow::MainWindow() :
// create global-toolbar at the top of our window
m_toolBar = new QWidget( main_widget );
m_toolBar = new QWidget( m_mainWidget );
m_toolBar->setObjectName( "mainToolbar" );
m_toolBar->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
m_toolBar->setFixedHeight( 64 );
@@ -152,9 +153,11 @@ MainWindow::MainWindow() :
vbox->addWidget( m_toolBar );
vbox->addWidget( w );
setCentralWidget( main_widget );
m_welcomeScreen = new WelcomeScreen( this );
setCentralWidget( m_welcomeScreen );
m_updateTimer.start( 1000 / 20, this ); // 20 fps
}
@@ -182,6 +185,14 @@ MainWindow::~MainWindow()
void MainWindow::setMainWidgetVisible( bool _visible )
{
setCentralWidget( _visible ? m_mainWidget : m_welcomeScreen );
}
void MainWindow::finalize()
{
resetWindowTitle();

View File

@@ -26,6 +26,7 @@
#include "WelcomeScreen.h"
#include "RecentResourceListModel.h"
#include "MainWindow.h"
#include "engine.h"
#include "embed.h"
@@ -102,6 +103,7 @@ WelcomeScreen::~WelcomeScreen()
void WelcomeScreen::createNewProject()
{
engine::mainWindow()->setMainWidgetVisible( true );
}