[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/sysadmin/partitionmanager/src/gui
From:       Volker Lanz <vl () fidra ! de>
Date:       2011-03-27 16:26:46
Message-ID: 20110327162646.6D8A0AC8CA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1226196 by vlanz:

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


 M  +1 -0      infopane.cpp  
 M  +1 -1      infopane.h  
 M  +1 -1      listdevices.h  
 M  +3 -0      listdevicesbase.ui  
 M  +1 -1      listoperations.h  
 M  +4 -0      listoperationsbase.ui  
 M  +10 -30    mainwindowbase.ui  
 M  +1 -1      partitionmanagerwidget.h  
 M  +1 -1      treelog.h  
 M  +3 -3      treelogbase.ui  


--- trunk/extragear/sysadmin/partitionmanager/src/gui/infopane.cpp #1226195:1226196
@@ -43,6 +43,7 @@
 	QWidget(parent),
 	m_GridLayout(new QGridLayout(this))
 {
+	layout()->setMargin(0);
 }
 
 /** Clears the InfoPane, leaving it empty */
--- trunk/extragear/sysadmin/partitionmanager/src/gui/infopane.h #1226195:1226196
@@ -41,7 +41,7 @@
 	Q_DISABLE_COPY(InfoPane)
 
 	public:
-		InfoPane(QWidget* parent);
+		InfoPane(QWidget* parent = NULL);
 
 	public:
 		void showPartition(Qt::DockWidgetArea area, const Partition& p);
--- trunk/extragear/sysadmin/partitionmanager/src/gui/listdevices.h #1226195:1226196
@@ -42,7 +42,7 @@
 	Q_DISABLE_COPY(ListDevices)
 
 	public:
-		ListDevices(QWidget* parent);
+		ListDevices(QWidget* parent = NULL);
 
 	signals:
 		void selectionChanged(const QString& device_node);
--- trunk/extragear/sysadmin/partitionmanager/src/gui/listdevicesbase.ui \
#1226195:1226196 @@ -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">
--- trunk/extragear/sysadmin/partitionmanager/src/gui/listoperations.h \
#1226195:1226196 @@ -43,7 +43,7 @@
 	Q_DISABLE_COPY(ListOperations)
 
 	public:
-		ListOperations(QWidget* parent);
+		ListOperations(QWidget* parent = NULL);
 
 	signals:
 		void contextMenuRequested(const QPoint&);
--- trunk/extragear/sysadmin/partitionmanager/src/gui/listoperationsbase.ui \
#1226195:1226196 @@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0" >
  <class>ListOperationsBase</class>
  <widget class="QWidget" name="ListOperationsBase" >
@@ -10,6 +11,9 @@
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout" >
+   <property name="margin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QListWidget" name="m_ListOperations" >
      <property name="contextMenuPolicy" >
--- trunk/extragear/sysadmin/partitionmanager/src/gui/mainwindowbase.ui \
#1226195:1226196 @@ -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>
--- trunk/extragear/sysadmin/partitionmanager/src/gui/partitionmanagerwidget.h \
#1226195:1226196 @@ -48,7 +48,7 @@
 	Q_DISABLE_COPY(PartitionManagerWidget)
 
 	public:
-		PartitionManagerWidget(QWidget* parent);
+		PartitionManagerWidget(QWidget* parent = NULL);
 		virtual ~PartitionManagerWidget();
 
 	signals:
--- trunk/extragear/sysadmin/partitionmanager/src/gui/treelog.h #1226195:1226196
@@ -42,7 +42,7 @@
 	Q_DISABLE_COPY(TreeLog)
 
 	public:
-		TreeLog(QWidget* parent);
+		TreeLog(QWidget* parent = NULL);
 		~TreeLog();
 
 	signals:
--- trunk/extragear/sysadmin/partitionmanager/src/gui/treelogbase.ui #1226195:1226196
@@ -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>


[prev in list] [next in list] [prev in thread] [next in thread]