From ed27cffc028513a46017c0782397912426b306a0 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Wed, 21 Apr 2010 16:21:42 +0200
Subject: [PATCH] Revert "Welcome mode: Base on QScrollArea."
No need for scrolling after my last commit.
This reverts commit 577057d2a96edc48ad28a1f62285928616bf3d56.
---
src/libs/utils/welcomemodetreewidget.cpp | 15 +++------------
src/libs/utils/welcomemodetreewidget.h | 4 ++--
.../projectexplorer/projectwelcomepagewidget.ui | 2 +-
.../gettingstartedwelcomepagewidget.ui | 2 +-
src/plugins/welcome/communitywelcomepagewidget.ui | 2 +-
5 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/src/libs/utils/welcomemodetreewidget.cpp b/src/libs/utils/welcomemodetreewidget.cpp
index fb0d6ee83cd..a750aa0b1f1 100644
--- a/src/libs/utils/welcomemodetreewidget.cpp
+++ b/src/libs/utils/welcomemodetreewidget.cpp
@@ -35,6 +35,7 @@
#include <QtGui/QVBoxLayout>
#include <QtGui/QMouseEvent>
#include <QtGui/QResizeEvent>
+#include <QtGui/QImage>
enum { leftContentsMargin = 2,
topContentsMargin = 2,
@@ -240,24 +241,14 @@ WelcomeModeTreeWidgetPrivate::WelcomeModeTreeWidgetPrivate() :
itemLayout(new QVBoxLayout)
{
layout->setMargin(0);
- itemLayout->setMargin(0);
}
WelcomeModeTreeWidget::WelcomeModeTreeWidget(QWidget *parent) :
- QScrollArea(parent), m_d(new WelcomeModeTreeWidgetPrivate)
+ QWidget(parent), m_d(new WelcomeModeTreeWidgetPrivate)
{
+ setLayout(m_d->layout);
m_d->layout->addLayout(m_d->itemLayout);
m_d->layout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding));
- QWidget *contents = new QWidget;
- contents->setLayout(m_d->layout);
- viewport()->setBackgroundRole(QPalette::Base); // Bright background.
- setWidget(contents);
- setWidgetResizable(true);
- setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
- setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- setFrameStyle(QFrame::NoFrame);
- setFrameShadow(QFrame::Plain);
- setContentsMargins(0, 0, 0, 0);
}
WelcomeModeTreeWidget::~WelcomeModeTreeWidget()
diff --git a/src/libs/utils/welcomemodetreewidget.h b/src/libs/utils/welcomemodetreewidget.h
index b3f211bcb06..eae57ade97a 100644
--- a/src/libs/utils/welcomemodetreewidget.h
+++ b/src/libs/utils/welcomemodetreewidget.h
@@ -32,7 +32,7 @@
#include "utils_global.h"
-#include <QtGui/QScrollArea>
+#include <QtGui/QTreeWidget>
#include <QtGui/QLabel>
namespace Utils {
@@ -53,7 +53,7 @@ private:
};
// WelcomeModeTreeWidget: Show an itemized list with arrows and emits a signal on click.
-class QTCREATOR_UTILS_EXPORT WelcomeModeTreeWidget : public QScrollArea
+class QTCREATOR_UTILS_EXPORT WelcomeModeTreeWidget : public QWidget
{
Q_OBJECT
public:
diff --git a/src/plugins/projectexplorer/projectwelcomepagewidget.ui b/src/plugins/projectexplorer/projectwelcomepagewidget.ui
index 83d58c58f6e..ca0818e9555 100644
--- a/src/plugins/projectexplorer/projectwelcomepagewidget.ui
+++ b/src/plugins/projectexplorer/projectwelcomepagewidget.ui
@@ -159,7 +159,7 @@
<customwidgets>
<customwidget>
<class>Utils::WelcomeModeTreeWidget</class>
- <extends>QScrollArea</extends>
+ <extends>QWidget</extends>
<header location="global">utils/welcomemodetreewidget.h</header>
<container>1</container>
</customwidget>
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
index be470d6e593..c62a653e6fe 100644
--- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
+++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
@@ -340,7 +340,7 @@
<customwidgets>
<customwidget>
<class>Utils::WelcomeModeTreeWidget</class>
- <extends>QScrollArea</extends>
+ <extends>QWidget</extends>
<header location="global">utils/welcomemodetreewidget.h</header>
</customwidget>
<customwidget>
diff --git a/src/plugins/welcome/communitywelcomepagewidget.ui b/src/plugins/welcome/communitywelcomepagewidget.ui
index 390d16b7143..488119ca4ab 100644
--- a/src/plugins/welcome/communitywelcomepagewidget.ui
+++ b/src/plugins/welcome/communitywelcomepagewidget.ui
@@ -105,7 +105,7 @@
<customwidgets>
<customwidget>
<class>Utils::WelcomeModeTreeWidget</class>
- <extends>QScrollArea</extends>
+ <extends>QWidget</extends>
<header location="global">utils/welcomemodetreewidget.h</header>
</customwidget>
<customwidget>
--
GitLab