From c67417aa62b608df323c7767fe66c84647f9933d Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Sat, 10 May 2008 13:37:06 +0000 Subject: [PATCH] Don't (mis)use MenuItem::Separator for the information bar, as Oxygen is able to style KSeperator quite some time already. BUG: 161860 svn path=/trunk/KDE/kdebase/apps/; revision=806201 --- src/infosidebarpage.cpp | 38 +++----------------------------------- 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp index e258068ae8..a6d8a0916c 100644 --- a/src/infosidebarpage.cpp +++ b/src/infosidebarpage.cpp @@ -39,7 +39,6 @@ #include #include #include -#include #include #include @@ -48,37 +47,6 @@ #include "metatextlabel.h" #include "pixmapviewer.h" -class InfoSeparator : public QWidget -{ -public: - InfoSeparator(QWidget* parent); - virtual ~InfoSeparator(); - -protected: - virtual void paintEvent(QPaintEvent* event); -}; - -InfoSeparator::InfoSeparator(QWidget* parent) : - QWidget(parent) -{ - setMinimumSize(0, 8); -} - -InfoSeparator::~InfoSeparator() -{ -} - -void InfoSeparator::paintEvent(QPaintEvent* event) -{ - Q_UNUSED(event); - QPainter painter(this); - - QStyleOptionMenuItem option; - option.initFrom(this); - option.menuItemType = QStyleOptionMenuItem::Separator; - style()->drawControl(QStyle::CE_MenuItem, &option, &painter, this); -} - InfoSidebarPage::InfoSidebarPage(QWidget* parent) : SidebarPage(parent), m_pendingPreview(false), @@ -123,12 +91,12 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) : m_metaTextLabel->setMinimumWidth(spacing); layout->addWidget(m_nameLabel); - layout->addWidget(new InfoSeparator(this)); + layout->addWidget(new KSeparator(this)); layout->addWidget(m_preview); - layout->addWidget(new InfoSeparator(this)); + layout->addWidget(new KSeparator(this)); if (m_metaDataWidget != 0) { layout->addWidget(m_metaDataWidget); - layout->addWidget(new InfoSeparator(this)); + layout->addWidget(new KSeparator(this)); } layout->addWidget(m_metaTextLabel);