mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-19 16:31:21 +00:00
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
This commit is contained in:
parent
fe1c747e4f
commit
c67417aa62
|
@ -39,7 +39,6 @@
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
#include <QPixmap>
|
#include <QPixmap>
|
||||||
#include <QResizeEvent>
|
#include <QResizeEvent>
|
||||||
#include <QStyleOptionMenuItem>
|
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
#include <QVBoxLayout>
|
#include <QVBoxLayout>
|
||||||
|
|
||||||
|
@ -48,37 +47,6 @@
|
||||||
#include "metatextlabel.h"
|
#include "metatextlabel.h"
|
||||||
#include "pixmapviewer.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) :
|
InfoSidebarPage::InfoSidebarPage(QWidget* parent) :
|
||||||
SidebarPage(parent),
|
SidebarPage(parent),
|
||||||
m_pendingPreview(false),
|
m_pendingPreview(false),
|
||||||
|
@ -123,12 +91,12 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) :
|
||||||
m_metaTextLabel->setMinimumWidth(spacing);
|
m_metaTextLabel->setMinimumWidth(spacing);
|
||||||
|
|
||||||
layout->addWidget(m_nameLabel);
|
layout->addWidget(m_nameLabel);
|
||||||
layout->addWidget(new InfoSeparator(this));
|
layout->addWidget(new KSeparator(this));
|
||||||
layout->addWidget(m_preview);
|
layout->addWidget(m_preview);
|
||||||
layout->addWidget(new InfoSeparator(this));
|
layout->addWidget(new KSeparator(this));
|
||||||
if (m_metaDataWidget != 0) {
|
if (m_metaDataWidget != 0) {
|
||||||
layout->addWidget(m_metaDataWidget);
|
layout->addWidget(m_metaDataWidget);
|
||||||
layout->addWidget(new InfoSeparator(this));
|
layout->addWidget(new KSeparator(this));
|
||||||
}
|
}
|
||||||
layout->addWidget(m_metaTextLabel);
|
layout->addWidget(m_metaTextLabel);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue