From e07821855c2aa29cd48ff9b4cb419e02124f38fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Tue, 13 Apr 2010 14:04:15 +0200
Subject: [PATCH] Help mode: don't hide the frame for the open pages switcher
Also removed a superfluous elide mode setter.
Reviewed-by: kh1
---
src/plugins/help/openpagesmanager.cpp | 2 ++
src/plugins/help/openpagesswitcher.cpp | 1 -
src/plugins/help/openpageswidget.cpp | 1 -
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/help/openpagesmanager.cpp b/src/plugins/help/openpagesmanager.cpp
index 61a9e2a046c..5396f05aac2 100644
--- a/src/plugins/help/openpagesmanager.cpp
+++ b/src/plugins/help/openpagesmanager.cpp
@@ -62,6 +62,8 @@ OpenPagesManager::OpenPagesManager(QObject *parent)
m_model = new OpenPagesModel(this);
m_openPagesWidget = new OpenPagesWidget(m_model);
+ m_openPagesWidget->setFrameStyle(QFrame::NoFrame);
+
connect(m_openPagesWidget, SIGNAL(setCurrentPage(QModelIndex)), this,
SLOT(setCurrentPage(QModelIndex)));
connect(m_openPagesWidget, SIGNAL(closePage(QModelIndex)), this,
diff --git a/src/plugins/help/openpagesswitcher.cpp b/src/plugins/help/openpagesswitcher.cpp
index 65b1ad51bcf..3a5ba827993 100644
--- a/src/plugins/help/openpagesswitcher.cpp
+++ b/src/plugins/help/openpagesswitcher.cpp
@@ -53,7 +53,6 @@ OpenPagesSwitcher::OpenPagesSwitcher(OpenPagesModel *model)
m_openPagesWidget->allowContextMenu(false);
m_openPagesWidget->installEventFilter(this);
- m_openPagesWidget->setTextElideMode(Qt::ElideMiddle);
m_openPagesWidget->setGeometry(gMargin, gMargin, gWidth - 2 * gMargin,
gHeight - 2 * gMargin);
diff --git a/src/plugins/help/openpageswidget.cpp b/src/plugins/help/openpageswidget.cpp
index ae539224fef..985e7a956cb 100644
--- a/src/plugins/help/openpageswidget.cpp
+++ b/src/plugins/help/openpageswidget.cpp
@@ -90,7 +90,6 @@ OpenPagesWidget::OpenPagesWidget(OpenPagesModel *model, QWidget *parent)
setIndentation(0);
setItemDelegate((m_delegate = new OpenPagesDelegate(this)));
- setFrameStyle(QFrame::NoFrame);
setTextElideMode(Qt::ElideMiddle);
setAttribute(Qt::WA_MacShowFocusRect, false);
--
GitLab