diff --git a/src/plugins/projectexplorer/projectwelcomepagewidget.cpp b/src/plugins/projectexplorer/projectwelcomepagewidget.cpp index 4cab1e656b3..44bd83d34c8 100644 --- a/src/plugins/projectexplorer/projectwelcomepagewidget.cpp +++ b/src/plugins/projectexplorer/projectwelcomepagewidget.cpp @@ -35,6 +35,8 @@ #include #include #include +#include +#include #include #include @@ -89,7 +91,13 @@ ProjectWelcomePageWidget::ProjectWelcomePageWidget(QWidget *parent) : connect(ui->sessTreeWidget, SIGNAL(activated(QString)), SLOT(slotSessionClicked(QString))); connect(ui->projTreeWidget, SIGNAL(activated(QString)), SLOT(slotProjectClicked(QString))); connect(ui->createNewProjectButton, SIGNAL(clicked()), SLOT(slotCreateNewProject())); + connect(ui->openProjectButton, SIGNAL(clicked()), this, SLOT(slotOpenProject())); connect(ui->manageSessionsButton, SIGNAL(clicked()), SIGNAL(manageSessions())); + + ui->createNewProjectButton->setIcon( + QIcon::fromTheme("document-new", ui->createNewProjectButton->icon())); + ui->openProjectButton->setIcon( + QIcon::fromTheme("document-open", ui->openProjectButton->icon())); } ProjectWelcomePageWidget::~ProjectWelcomePageWidget() @@ -152,6 +160,22 @@ void ProjectWelcomePageWidget::activateEditMode() modeManager->activateMode(Core::Constants::MODE_EDIT); } +void ProjectWelcomePageWidget::slotOpenProject() +{ + // ### We need a way to access the mimedatabase and differentiate + // between project types and other files. This is currently not possible + + const QString filters = "All Files (*);;Projects(*.pro *.qmlproject)"; + QString selectedFilters = "Projects(*.pro *.qmlproject)"; + QStringList files = + Core::ICore::instance()->fileManager()->getOpenFileNames( + filters, tr("Open Project"), &selectedFilters); + + Core::Internal::MainWindow *mw = qobject_cast + (Core::ICore::instance()->mainWindow()); + Q_ASSERT(mw); + mw->openFiles(files); +} void ProjectWelcomePageWidget::slotSessionClicked(const QString &data) { diff --git a/src/plugins/projectexplorer/projectwelcomepagewidget.h b/src/plugins/projectexplorer/projectwelcomepagewidget.h index 67e4d082427..c49904de5bb 100644 --- a/src/plugins/projectexplorer/projectwelcomepagewidget.h +++ b/src/plugins/projectexplorer/projectwelcomepagewidget.h @@ -69,6 +69,7 @@ private slots: void slotSessionClicked(const QString &data); void slotProjectClicked(const QString &data); void slotCreateNewProject(); + void slotOpenProject(); private: void activateEditMode(); diff --git a/src/plugins/projectexplorer/projectwelcomepagewidget.ui b/src/plugins/projectexplorer/projectwelcomepagewidget.ui index ca0818e9555..33c956a5432 100644 --- a/src/plugins/projectexplorer/projectwelcomepagewidget.ui +++ b/src/plugins/projectexplorer/projectwelcomepagewidget.ui @@ -57,7 +57,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -98,7 +98,23 @@ 6 - + + + + 160 + 36 + + + + Qt::TabFocus + + + Manage Sessions... + + + + + Qt::Horizontal @@ -111,18 +127,15 @@ - + - 180 - 40 + 160 + 36 - - Qt::TabFocus - - Manage Sessions... + Open Project... @@ -130,8 +143,8 @@ - 180 - 40 + 160 + 36 diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp index 816408cbe61..62d262727fc 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp +++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp @@ -87,6 +87,9 @@ GettingStartedWelcomePageWidget::GettingStartedWelcomePageWidget(QWidget *parent connect(ui->nextTipBtn, SIGNAL(clicked()), this, SLOT(slotNextTip())); connect(ui->prevTipBtn, SIGNAL(clicked()), this, SLOT(slotPrevTip())); connect(ui->createNewProjectButton, SIGNAL(clicked()), this, SLOT(slotCreateNewProject())); + + ui->createNewProjectButton->setIcon( + QIcon::fromTheme("document-new", ui->createNewProjectButton->icon())); } GettingStartedWelcomePageWidget::~GettingStartedWelcomePageWidget() diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui index 6cf9b134509..6a2155d79df 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui +++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui @@ -7,7 +7,7 @@ 0 0 646 - 361 + 367 @@ -357,8 +357,8 @@ - 180 - 40 + 160 + 36