minor layout improvements for the Information Panel:

* use the KStyle for drawing separators
* remove frame from general meta data box

CCMAIL: sebastian@trueg.de

svn path=/trunk/KDE/kdebase/apps/; revision=788834

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index 301920a9442f29426dbd204e255dbf631e2d9fe5..38f832a2de66b01b0875044fcc8d9e489d7ea10c 100644 (file)
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -35,8 +35,10 @@
 #include <QEvent>
 #include <QInputDialog>
 #include <QLabel>
 #include <QEvent>
 #include <QInputDialog>
 #include <QLabel>

+#include <QPainter>

 #include <QPixmap>
 #include <QResizeEvent>
 #include <QPixmap>
 #include <QResizeEvent>

+#include <QStyleOptionMenuItem>

 #include <QTimer>
 #include <QVBoxLayout>
 
 #include <QTimer>
 #include <QVBoxLayout>
 


@@ -45,6 +47,37 @@
 #include "metatextlabel.h"
 #include "pixmapviewer.h"
 
 #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),
 InfoSidebarPage::InfoSidebarPage(QWidget* parent) :
     SidebarPage(parent),
     m_pendingPreview(false),


@@ -90,8 +123,10 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) :
 
     layout->addWidget(m_nameLabel);
     layout->addWidget(m_preview);
 
     layout->addWidget(m_nameLabel);
     layout->addWidget(m_preview);

+    layout->addWidget(new InfoSeparator(this));

     if (m_metaDataWidget != 0) {
         layout->addWidget(m_metaDataWidget);
     if (m_metaDataWidget != 0) {
         layout->addWidget(m_metaDataWidget);

+        layout->addWidget(new InfoSeparator(this));

     }
     layout->addWidget(m_metaTextLabel);
 
     }
     layout->addWidget(m_metaTextLabel);
 

diff --git a/src/metatextlabel.cpp b/src/metatextlabel.cpp
index 594c408fcca2242f924b6986eb7be58d85460109..b1ec664ec046920f5a219203d31f66dac90f6e31 100644 (file)
--- a/src/metatextlabel.cpp
+++ b/src/metatextlabel.cpp
@@ -27,7 +27,7 @@
 #include <QLabel>
 
 MetaTextLabel::MetaTextLabel(QWidget* parent) :
 #include <QLabel>
 
 MetaTextLabel::MetaTextLabel(QWidget* parent) :

-    QGroupBox(i18nc("@title:group General metadata", "General"), parent),
+    QWidget(parent),

     m_lines(0),
     m_layout(0)
 {
     m_lines(0),
     m_layout(0)
 {

diff --git a/src/metatextlabel.h b/src/metatextlabel.h
index 856bc85c263534747f69eca23707fce38d98a074..316f0de5c9f2eb44391a26a9c3e5d8c3a5cf2e0b 100644 (file)
--- a/src/metatextlabel.h
+++ b/src/metatextlabel.h
@@ -20,7 +20,7 @@
 #ifndef METATEXTLABEL_H
 #define METATEXTLABEL_H
 
 #ifndef METATEXTLABEL_H
 #define METATEXTLABEL_H
 

-#include <QGroupBox>
+#include <QWidget>

 
 class KVBox;
 class QHBoxLayout;
 
 class KVBox;
 class QHBoxLayout;


@@ -30,7 +30,7 @@ class QHBoxLayout;
  *
  * Each line contains a label and the the meta information.
  */
  *
  * Each line contains a label and the the meta information.
  */

-class MetaTextLabel : public QGroupBox
+class MetaTextLabel : public QWidget

 {
     Q_OBJECT
 
 {
     Q_OBJECT