Fix double margins and set margins to zero for the panel layouts where it makes

sense. Spotted and original patch provided by Aurélien Gâteau
<agateau@kde.org>. Thanks!

CCMAIL:agateau@kde.org

svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=1226196
This commit is contained in:
Volker Lanz 2011-03-27 16:26:45 +00:00
parent 1771648ef4
commit fd3105a50a
10 changed files with 38 additions and 50 deletions

View File

@ -43,6 +43,7 @@ InfoPane::InfoPane(QWidget* parent) :
QWidget(parent),
m_GridLayout(new QGridLayout(this))
{
layout()->setMargin(0);
}
/** Clears the InfoPane, leaving it empty */

View File

@ -41,7 +41,7 @@ class InfoPane : public QWidget
Q_DISABLE_COPY(InfoPane)
public:
InfoPane(QWidget* parent);
InfoPane(QWidget* parent = NULL);
public:
void showPartition(Qt::DockWidgetArea area, const Partition& p);

View File

@ -42,7 +42,7 @@ class LIBPARTITIONMANAGERPRIVATE_EXPORT ListDevices : public QWidget, public Ui:
Q_DISABLE_COPY(ListDevices)
public:
ListDevices(QWidget* parent);
ListDevices(QWidget* parent = NULL);
signals:
void selectionChanged(const QString& device_node);

View File

@ -11,6 +11,9 @@
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QListWidget" name="m_ListDevices">
<property name="sizePolicy">

View File

@ -43,7 +43,7 @@ class LIBPARTITIONMANAGERPRIVATE_EXPORT ListOperations : public QWidget, public
Q_DISABLE_COPY(ListOperations)
public:
ListOperations(QWidget* parent);
ListOperations(QWidget* parent = NULL);
signals:
void contextMenuRequested(const QPoint&);

View File

@ -1,7 +1,8 @@
<ui version="4.0" >
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ListOperationsBase</class>
<widget class="QWidget" name="ListOperationsBase" >
<property name="geometry" >
<widget class="QWidget" name="ListOperationsBase">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@ -9,28 +10,31 @@
<height>300</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout" >
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QListWidget" name="m_ListOperations" >
<property name="contextMenuPolicy" >
<widget class="QListWidget" name="m_ListOperations">
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
<property name="horizontalScrollBarPolicy" >
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="autoScroll" >
<property name="autoScroll">
<bool>false</bool>
</property>
<property name="alternatingRowColors" >
<property name="alternatingRowColors">
<bool>true</bool>
</property>
<property name="selectionMode" >
<property name="selectionMode">
<enum>QAbstractItemView::NoSelection</enum>
</property>
<property name="resizeMode" >
<property name="resizeMode">
<enum>QListView::Adjust</enum>
</property>
<property name="wordWrap" >
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>

View File

@ -13,12 +13,8 @@
<property name="windowTitle">
<string comment="@title:window">KDE Partition Manager</string>
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="PartitionManagerWidget" name="m_PartitionManagerWidget" native="true"/>
</item>
</layout>
<widget class="PartitionManagerWidget" name="m_PartitionManagerWidget">
<layout class="QVBoxLayout" name="verticalLayout"/>
</widget>
<widget class="QDockWidget" name="m_DockDevices">
<property name="allowedAreas">
@ -30,12 +26,8 @@
<attribute name="dockWidgetArea">
<number>1</number>
</attribute>
<widget class="QWidget" name="m_DockDevicesContents">
<layout class="QVBoxLayout">
<item>
<widget class="ListDevices" name="m_ListDevices" native="true"/>
</item>
</layout>
<widget class="ListDevices" name="m_ListDevices">
<layout class="QVBoxLayout"/>
</widget>
</widget>
<widget class="QDockWidget" name="m_DockOperations">
@ -48,12 +40,8 @@
<attribute name="dockWidgetArea">
<number>8</number>
</attribute>
<widget class="QWidget" name="m_DockOperationsContents">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="ListOperations" name="m_ListOperations" native="true"/>
</item>
</layout>
<widget class="ListOperations" name="m_ListOperations">
<layout class="QVBoxLayout" name="verticalLayout_2"/>
</widget>
</widget>
<widget class="QDockWidget" name="m_DockInformation">
@ -63,12 +51,8 @@
<attribute name="dockWidgetArea">
<number>1</number>
</attribute>
<widget class="QWidget" name="m_DockInformationContents">
<layout class="QGridLayout" name="dockInformationLayout">
<item row="0" column="0">
<widget class="InfoPane" name="m_InfoPane" native="true"/>
</item>
</layout>
<widget class="InfoPane" name="m_InfoPane">
<layout class="QGridLayout" name="dockInformationLayout"/>
</widget>
</widget>
<widget class="QDockWidget" name="m_DockLog">
@ -81,12 +65,8 @@
<attribute name="dockWidgetArea">
<number>8</number>
</attribute>
<widget class="QWidget" name="dockWidgetContents">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="TreeLog" name="m_TreeLog" native="true"/>
</item>
</layout>
<widget class="TreeLog" name="m_TreeLog">
<layout class="QGridLayout" name="gridLayout"/>
</widget>
</widget>
</widget>

View File

@ -48,7 +48,7 @@ class LIBPARTITIONMANAGERPRIVATE_EXPORT PartitionManagerWidget : public QWidget,
Q_DISABLE_COPY(PartitionManagerWidget)
public:
PartitionManagerWidget(QWidget* parent);
PartitionManagerWidget(QWidget* parent = NULL);
virtual ~PartitionManagerWidget();
signals:

View File

@ -42,7 +42,7 @@ class LIBPARTITIONMANAGERPRIVATE_EXPORT TreeLog: public QWidget, public Ui::Tree
Q_DISABLE_COPY(TreeLog)
public:
TreeLog(QWidget* parent);
TreeLog(QWidget* parent = NULL);
~TreeLog();
signals:

View File

@ -11,6 +11,9 @@
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QTreeWidget" name="m_TreeLog">
<property name="contextMenuPolicy">
@ -46,9 +49,6 @@
<attribute name="headerVisible">
<bool>true</bool>
</attribute>
<attribute name="headerVisible">
<bool>true</bool>
</attribute>
<column>
<property name="text">
<string extracomment="@title:column Severity of a log entry / log level. Text must be very short.">Sev.</string>