diff --git a/src/libs/utils/welcomemodetreewidget.cpp b/src/libs/utils/welcomemodetreewidget.cpp index 2d9ebaa4dd3..df85bd00c5e 100644 --- a/src/libs/utils/welcomemodetreewidget.cpp +++ b/src/libs/utils/welcomemodetreewidget.cpp @@ -40,11 +40,11 @@ void WelcomeModeLabel::setStyledText(const QString &text) { QString rc = QLatin1String( "" - "" + "" "

" - ""); + ""); rc += text; - rc += QLatin1String("

"); + rc += QLatin1String("

"); setText(rc); } diff --git a/src/plugins/projectexplorer/projectwelcomepagewidget.cpp b/src/plugins/projectexplorer/projectwelcomepagewidget.cpp index f1332e03cbb..46bc3e0dabc 100644 --- a/src/plugins/projectexplorer/projectwelcomepagewidget.cpp +++ b/src/plugins/projectexplorer/projectwelcomepagewidget.cpp @@ -76,7 +76,7 @@ ProjectWelcomePageWidget::ProjectWelcomePageWidget(QWidget *parent) : ui(new Ui::ProjectWelcomePageWidget) { ui->setupUi(this); - ui->projTitleLabel->setStyledText(tr("Open Recent Project")); + ui->projTitleLabel->setStyledText(tr("Recent Projects")); ui->recentSessionsTitleLabel->setStyledText(tr("Resume Session")); updateWelcomePage(WelcomePageData()); diff --git a/src/plugins/projectexplorer/projectwelcomepagewidget.ui b/src/plugins/projectexplorer/projectwelcomepagewidget.ui index cb94d9b53bc..23b5bc84a13 100644 --- a/src/plugins/projectexplorer/projectwelcomepagewidget.ui +++ b/src/plugins/projectexplorer/projectwelcomepagewidget.ui @@ -13,231 +13,320 @@ Form - + + + 9 + + + 2 + - - - - 0 - 0 - - - - - 270 - 130 - - + - + #frame{ + border: 1px solid #c9c9c9; + border-radius: 3px; + padding: 2px; + background: #f9f9f9; + margin: 1px; +} - - - 0 - - - 3 - - - - - - 0 - 0 - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + + + + + + 0 + + + 3 + + + 9 + + + + + + 0 + 0 + + + + Qt::NoFocus + + + QFrame::NoFrame + + + QAbstractItemView::NoSelection + + + QAbstractItemView::ScrollPerPixel + + + false + + + true + + + true + + + 2 + + + false + + + 24 + + + 0 + + + 24 + + + false + + + 0 + + + + 1 + + + + + 2 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 0 + 0 + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + + + + 0 + 0 + + + + + 270 + 130 + + + + + + + + 0 + + + 3 + + + + + + 0 + 0 + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + 0 + 0 + + + + Qt::NoFocus + + + QFrame::NoFrame + + + QAbstractItemView::NoSelection + + + QAbstractItemView::ScrollPerPixel + + + false + + + true + + + true + + + 2 + + + false + + + 24 + + + 0 + + + 24 + + + false + + + 0 + + + + 1 + + + + + 2 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + - - - - - 0 - 0 - + + + + 6 - - Qt::NoFocus - - - QFrame::NoFrame - - - QAbstractItemView::NoSelection - - - QAbstractItemView::ScrollPerPixel - - - false - - - true - - - true - - - 2 - - - false - - - 24 - - - 0 - - - - 1 - - - - - 2 - - - - - - - - Qt::TabFocus - - - Manage Sessions... - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - - - 0 - - - 3 - - - 9 - - - - - - 0 - 0 - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - 0 - 0 - - - - Qt::NoFocus - - - QFrame::NoFrame - - - QAbstractItemView::NoSelection - - - QAbstractItemView::ScrollPerPixel - - - false - - - true - - - true - - - 2 - - - false - - - 24 - - - 0 - - - - 1 - - - - - 2 - - - - - - - - Qt::TabFocus - - - Create New Project... - - - false - - - - - - - Qt::Vertical - - - - 20 - 40 - - - + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 180 + 40 + + + + Qt::TabFocus + + + Manage Sessions... + + + + + + + + 180 + 40 + + + + Qt::TabFocus + + + Create Project... + + + + :/core/images/filenew.png:/core/images/filenew.png + + + false + + + + + + layoutWidget + horizontalSpacer_2 + horizontalSpacer_2 @@ -254,6 +343,8 @@
utils/welcomemodetreewidget.h
- + + + diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp index 3b479af45ce..305052d2a45 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp +++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp @@ -71,16 +71,12 @@ GettingStartedWelcomePageWidget::GettingStartedWelcomePageWidget(QWidget *parent connect(ui->tutorialTreeWidget, SIGNAL(activated(QString)), SLOT(slotOpenHelpPage(const QString&))); - ui->tutorialTreeWidget->addItem(tr("Qt Creator - A quick tour"), + ui->tutorialTreeWidget->addItem(tr("The Qt Creator User Interface"), QString("qthelp://com.nokia.qtcreator.%1%2/doc/index.html").arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR)); - ui->tutorialTreeWidget->addItem(tr("Creating an address book"), + ui->tutorialTreeWidget->addItem(tr("Creating a Qt C++ Application"), + QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-writing-program.html?view=split")); + ui->tutorialTreeWidget->addItem(tr("Creating a Qt Quick Application"), QLatin1String("qthelp://com.nokia.qtcreator/doc/tutorials-addressbook-sdk.html?view=split")); - ui->tutorialTreeWidget->addItem(tr("Understanding widgets"), - QLatin1String("qthelp://com.trolltech.qt/qdoc/widgets-tutorial.html?view=split")); - ui->tutorialTreeWidget->addItem(tr("Building with qmake"), - QLatin1String("qthelp://com.trolltech.qmake/qdoc/qmake-tutorial.html?view=split")); - ui->tutorialTreeWidget->addItem(tr("Writing test cases"), - QLatin1String("qthelp://com.trolltech.qt/qdoc/qtestlib-tutorial.html?view=split")); srand(QDateTime::currentDateTime().toTime_t()); QStringList tips = tipsOfTheDay(); @@ -93,7 +89,7 @@ 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())); } GettingStartedWelcomePageWidget::~GettingStartedWelcomePageWidget() @@ -278,6 +274,12 @@ void GettingStartedWelcomePageWidget::slotOpenContextHelpPage(const QString& url helpManager->handleHelpRequest(url % QLatin1String("?view=split")); } +void GettingStartedWelcomePageWidget::slotCreateNewProject() +{ + Core::ICore::instance()->showNewItemDialog(tr("New Project..."), + Core::IWizard::wizardsOfKind(Core::IWizard::ProjectWizard)); +} + void GettingStartedWelcomePageWidget::slotNextTip() { QStringList tips = tipsOfTheDay(); diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.h b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.h index a2e981c70f5..d3b59b62544 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.h +++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.h @@ -57,6 +57,7 @@ private slots: void slotOpenExample(); void slotNextTip(); void slotPrevTip(); + void slotCreateNewProject(); private: QStringList tipsOfTheDay(); diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui index facd533e3ac..5a47cbf4121 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui +++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui @@ -13,290 +13,373 @@ Form - - - - - - 0 - 0 - - - - - 400 - 16777215 - - + + + 2 + + + - + #contentframe{ + border: 1px solid #c9c9c9; + border-radius: 3px; + padding: 2px; + background: #f9f9f9; + margin: 1px; +} - + + QFrame::StyledPanel + + + QFrame::Raised + + - - - - 0 - 0 - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - 0 - 0 - - - - Qt::NoFocus - - - QFrame::NoFrame - - - QAbstractItemView::NoSelection - - - QAbstractItemView::ScrollPerPixel - - - false - - - true - - - true - - - 2 - - - false - - - 24 - - - 0 - - - 24 - - - false - - - 0 - - - - 1 - - - - - 2 - - - - - - - - - - - - 0 - 0 - - - - - 400 - 16777215 - - - - - - - - 8 - - - 0 - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - false - - - - 0 - 0 - - - - Examples not installed... - - - - - - - - - - - 0 - 0 - - - - - 400 - 16777215 - - - - - - - - 9 - - - - - - 0 - 0 - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Plain - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - true - - - - - - - 0 - - - - - Qt::Vertical + + + + + + 0 + 0 + - - QSizePolicy::Preferred - - + - 20 - 2 + 400 + 16777215 - - - - - QToolButton{ + + + + + 12 + + + + + + 0 + 0 + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + 0 + 0 + + + + Qt::NoFocus + + + QFrame::NoFrame + + + QAbstractItemView::NoSelection + + + QAbstractItemView::ScrollPerPixel + + + false + + + true + + + true + + + 2 + + + false + + + 24 + + + 0 + + + 24 + + + false + + + 0 + + + + 1 + + + + + 2 + + + + + + + + + + + + 0 + 0 + + + + + 400 + 16777215 + + + + + + + + 8 + + + 0 + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + false + + + + 0 + 0 + + + + + 0 + 30 + + + + Examples not installed... + + + + + + + + + + + 0 + 0 + + + + + 400 + 16777215 + + + + + + + + 12 + + + 9 + + + + + + 0 + 0 + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + 0 + + + + + Qt::Vertical + + + QSizePolicy::Preferred + + + + 20 + 2 + + + + + + + + QToolButton{ border-right:solid 0 px; height:16px; width:12px; } - - - - - - - :/welcome/images/arrow-left.png:/welcome/images/arrow-left.png - - - Qt::NoArrow - - - - - - - QToolButton{ + + + + + + + :/welcome/images/arrow-left.png:/welcome/images/arrow-left.png + + + Qt::NoArrow + + + + + + + QToolButton{ border-left:solid 0 px; height:16px; width:12px; } - - - - - - - :/welcome/images/arrow-right.png:/welcome/images/arrow-right.png - - - Qt::NoArrow - + + + + + + + :/welcome/images/arrow-right.png:/welcome/images/arrow-right.png + + + Qt::NoArrow + + + + + + + Qt::Vertical + + + + 20 + 2 + + + + + + + + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Plain + + + Qt::ScrollBarAlwaysOff + + + Qt::ScrollBarAlwaysOff + + + true + + + + - - + + + + + + 6 + + + - Qt::Vertical + Qt::Horizontal - 20 - 2 + 40 + 20 + + + + + 180 + 40 + + + + Qt::TabFocus + + + Create Project... + + + + :/core/images/filenew.png:/core/images/filenew.png + + + false + + + @@ -317,6 +400,7 @@ + diff --git a/src/plugins/welcome/images/background_center_frame.png b/src/plugins/welcome/images/background_center_frame.png index d1628e22c27..c69f1447283 100644 Binary files a/src/plugins/welcome/images/background_center_frame.png and b/src/plugins/welcome/images/background_center_frame.png differ diff --git a/src/plugins/welcome/welcomemode.cpp b/src/plugins/welcome/welcomemode.cpp index 01afc50316b..31ffc19be22 100644 --- a/src/plugins/welcome/welcomemode.cpp +++ b/src/plugins/welcome/welcomemode.cpp @@ -172,8 +172,6 @@ void WelcomeMode::initPlugins() if (debug) qDebug() << "WelcomeMode::initPlugins" << plugin->title(); } - m_d->buttonLayout->addSpacing(5); - QSettings *settings = Core::ICore::instance()->settings(); const int tabId = settings->value(QLatin1String(currentPageSettingsKeyC), 0).toInt(); diff --git a/src/plugins/welcome/welcomemode.ui b/src/plugins/welcome/welcomemode.ui index 648ed840292..14a1189a7ff 100644 --- a/src/plugins/welcome/welcomemode.ui +++ b/src/plugins/welcome/welcomemode.ui @@ -33,7 +33,6 @@ QToolButton, QPushButton, QComboBox { QComboBox::down-arrow { image: url(:/welcome/images/combobox_arrow.png); } - QComboBox:drop-down { subcontrol-origin: padding; @@ -54,6 +53,17 @@ QToolButton:disabled, QPushButton:disabled, QComboBox::disabled { QToolButton:pressed, QPushButton:pressed{ border-image: url(:/welcome/images/btn_26_pressed.png) 4; } + + QPushButton::menu-indicator{ + subcontrol-origin: margin; + subcontrol-position: center right; + right: 4px; + } + + QPushButton{ + outline: none; + margin: 2 + } @@ -66,13 +76,19 @@ QToolButton:pressed, QPushButton:pressed{ - #gradientWidget { + /* +#gradientWidget { background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(247, 247, 247, 255), stop:1 rgba(215, 215, 215, 255)); -} +} +*/ +#gradientWidget { + border-image: url(:/core/images/welcomebg.png) 4; +} + - 4 + 0 4 @@ -91,19 +107,21 @@ QToolButton:pressed, QPushButton:pressed{ 662 - 515 + 490 662 - 16777215 + 490 #mainFrame { - border-image: url(:/welcome/images/background_center_frame.png) 4; + border-image: url(:/welcome/images/background_center_frame.png); border-width: 4; + padding:-3; + padding-bottom:20 ; } @@ -255,29 +273,32 @@ QToolButton:pressed { + + 8 + + + 1 + - 20 + 13 - 17 + 10 - - - Qt::Horizontal + + + Qt::TabFocus - - - 40 - 20 - + + height:19px; - - - - - Help us make Qt Creator even better + Feedback + + + + :/welcome/images/feedback_arrow.png:/welcome/images/feedback_arrow.png @@ -298,22 +319,116 @@ QToolButton:pressed { - - - Qt::TabFocus - - - height:19px; + + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + - Feedback - - - - :/welcome/images/feedback_arrow.png:/welcome/images/feedback_arrow.png + Help us make Qt Creator even better + + + + Qt::Horizontal + + + + 40 + 20 + + + +