From b75d89ad16d7e931304093b9d28d3e58df14b8a4 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 21 Feb 2023 16:45:36 +0100
Subject: [PATCH] gui: make spacing more consistent

Change-Id: I5bb44c440b33cb0b5de0f5e2457c9226afe74a50
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30489
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
---
 frappy/gui/collapsible.py   |  2 ++
 frappy/gui/nodewidget.py    |  4 +++-
 frappy/gui/ui/console.ui    | 38 ++++++++++++++++++++++++-------------
 frappy/gui/ui/nodewidget.ui |  8 +++++++-
 4 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/frappy/gui/collapsible.py b/frappy/gui/collapsible.py
index 7382708..5de877d 100644
--- a/frappy/gui/collapsible.py
+++ b/frappy/gui/collapsible.py
@@ -18,6 +18,7 @@ class CollapsibleWidget(QWidget):
         line.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Maximum)
 
         l = QVBoxLayout()
+        l.setContentsMargins(0, 0, 0, 0)
         l.addWidget(self.widget)
         self.widgetContainer.setLayout(l)
         self.widgetContainer.setMaximumHeight(0)
@@ -26,6 +27,7 @@ class CollapsibleWidget(QWidget):
         layout.addWidget(self.button, 0, 0, Qt.AlignLeft)
         layout.addWidget(line, 0, 1, 1, 1)
         layout.addWidget(self.widgetContainer, 1, 0, -1, -1)
+        layout.setContentsMargins(0, 6, 0, 0)
         self.setLayout(layout)
 
     def _collapse(self, expand):
diff --git a/frappy/gui/nodewidget.py b/frappy/gui/nodewidget.py
index 155d916..71eb91a 100644
--- a/frappy/gui/nodewidget.py
+++ b/frappy/gui/nodewidget.py
@@ -161,13 +161,15 @@ class NodeWidget(QWidget):
     def _initNodeInfo(self):
         self.tree = ModuleOverview(self._node)
         infolayout = QVBoxLayout()
+        infolayout.setContentsMargins(0, 0, 0, 0)
         infolayout.addWidget(self.tree)
         self.infotree.setLayout(infolayout)
         # disabled until i find a way to deselect and go back to overview
         self.tree.itemChanged.connect(self.changeViewContent)
         self.tree.customContextMenuRequested.connect(self._treeContextMenu)
 
-        self._description = QPlainTextEdit(self._node.properties.get('description','no description available'))
+        self._description = QPlainTextEdit(
+            self._node.properties.get('description','no description available'))
         self._description_label = QLabel('Description:')
         self._description.setReadOnly(True)
         self._host = QLabel(self._node.conn.uri)
diff --git a/frappy/gui/ui/console.ui b/frappy/gui/ui/console.ui
index ca34ee1..bf7722d 100644
--- a/frappy/gui/ui/console.ui
+++ b/frappy/gui/ui/console.ui
@@ -20,6 +20,18 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QTextBrowser" name="logTextBrowser">
      <property name="sizePolicy">
@@ -44,25 +56,25 @@ p, li { white-space: pre-wrap; }
     </widget>
    </item>
    <item>
-    <layout class="QGridLayout" name="gridLayout">
-     <item row="0" column="2">
-      <widget class="QPushButton" name="clearPushButton">
-       <property name="text">
-        <string>Clear</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QLineEdit" name="msgLineEdit"/>
-     </item>
-     <item row="0" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
       <widget class="QLabel" name="label_4">
        <property name="text">
         <string>&gt;&gt;&gt;</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="3">
+     <item>
+      <widget class="QLineEdit" name="msgLineEdit"/>
+     </item>
+     <item>
+      <widget class="QPushButton" name="clearPushButton">
+       <property name="text">
+        <string>Clear</string>
+       </property>
+      </widget>
+     </item>
+     <item>
       <widget class="QPushButton" name="sendPushButton">
        <property name="text">
         <string>Send</string>
diff --git a/frappy/gui/ui/nodewidget.ui b/frappy/gui/ui/nodewidget.ui
index 75fa0c2..83c9a91 100644
--- a/frappy/gui/ui/nodewidget.ui
+++ b/frappy/gui/ui/nodewidget.ui
@@ -28,6 +28,9 @@
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
+     <property name="handleWidth">
+      <number>6</number>
+     </property>
      <property name="childrenCollapsible">
       <bool>false</bool>
      </property>
@@ -50,6 +53,9 @@
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
+         <property name="handleWidth">
+          <number>6</number>
+         </property>
          <widget class="QWidget" name="infotree" native="true"/>
          <widget class="QGroupBox" name="nodeinfo">
           <property name="sizePolicy">
@@ -91,7 +97,7 @@
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>93</width>
+          <width>92</width>
           <height>176</height>
          </rect>
         </property>