diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp index 12a04588c04..8137cb788c8 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp +++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp @@ -86,16 +86,29 @@ GettingStartedWelcomePageWidget::GettingStartedWelcomePageWidget(QWidget *parent connect(ui->tutorialTreeWidget, SIGNAL(activated(QString)), SLOT(slotOpenHelpPage(const QString&))); - ui->tutorialTreeWidget->addItem(tr("The Qt Creator User Interface"), - QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html")); - ui->tutorialTreeWidget->addItem(tr("Building and Running an Example"), - QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-build-example-application.html?view=split")); - 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 Mobile Application"), - QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-mobile-example.html?view=split")); - ui->tutorialTreeWidget->addItem(tr("Creating a Qt Quick Application"), - QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-qml-application.html?view=split")); + QFontMetrics fm = fontMetrics(); + const int margins = 30; + int width = ui->tutorialTreeWidget->minimumWidth() - margins; + + QString itemText = tr("The Qt Creator User Interface"); + QString url = QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html"); + ui->tutorialTreeWidget->addItem(fm.elidedText(itemText, Qt::ElideRight, width), url, itemText); + + itemText = tr("Building and Running an Example"); + url = QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-build-example-application.html?view=split"); + ui->tutorialTreeWidget->addItem(fm.elidedText(itemText, Qt::ElideRight, width), url, itemText); + + itemText = tr("Creating a Qt C++ Application"); + url = QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-writing-program.html?view=split"); + ui->tutorialTreeWidget->addItem(fm.elidedText(itemText, Qt::ElideRight, width), url, itemText); + + itemText = tr("Creating a Mobile Application"); + url = QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-mobile-example.html?view=split"); + ui->tutorialTreeWidget->addItem(fm.elidedText(itemText, Qt::ElideRight, width), url, itemText); + + itemText = tr("Creating a Qt Quick Application"); + url = QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-qml-application.html?view=split"); + ui->tutorialTreeWidget->addItem(fm.elidedText(itemText, Qt::ElideRight, width), url, itemText); srand(QDateTime::currentDateTime().toTime_t()); QStringList tips = tipsOfTheDay(); diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui index d04f47be194..788470bf477 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui +++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui @@ -52,7 +52,20 @@ - + + + + 260 + 0 + + + + + 260 + 16777215 + + + @@ -67,20 +80,26 @@ - 230 + 240 0 - - + + + 240 + 16777215 + + + 0 + + + 0 + 12 - - 9 - @@ -248,6 +267,9 @@ + + 0 + @@ -316,7 +338,7 @@ - + 6 @@ -368,22 +390,6 @@ - - - - Qt::Vertical - - - QSizePolicy::MinimumExpanding - - - - 20 - 40 - - - - @@ -457,28 +463,27 @@ border-bottom: 1px solid "#C9C9C9"; - - - - - Qt::Horizontal - - - - 24 - 38 - - - - - - - - - - - - + + + Qt::Vertical + + + + 20 + 6 + + + + + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + +