From 58cb9544e413a940ddb5bbcc38528572763f3be2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustavo=20I=C3=B1iguez=20Goia?= <gooffy1@gmail.com>
Date: Wed, 26 Feb 2025 21:25:48 +0100
Subject: [PATCH] ui: popups layuout improvements

 - Removed hardcoded sizes for buttons.
 - Buttons horizontal layout adjusted to properly show the countdown
   (#1274).

Note:
 'Maximum' vertical policy does not seem to work with qt-material
 and QToolButton, the button height is resized to 0. 'Preferred' seems
 to work as expected.
---
 ui/opensnitch/res/prompt.ui | 154 +++++++-----------------------------
 1 file changed, 30 insertions(+), 124 deletions(-)

diff --git a/ui/opensnitch/res/prompt.ui b/ui/opensnitch/res/prompt.ui
index 4a12a8e7..5e2efe4e 100644
--- a/ui/opensnitch/res/prompt.ui
+++ b/ui/opensnitch/res/prompt.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>563</width>
-    <height>339</height>
+    <width>560</width>
+    <height>316</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -36,12 +36,12 @@
     <number>3</number>
    </property>
    <item row="1" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout" stretch="3,2,1,1,0">
+    <layout class="QHBoxLayout" name="horizontalLayout" stretch="3,2,2,1,0">
      <property name="spacing">
-      <number>6</number>
+      <number>3</number>
      </property>
      <property name="topMargin">
-      <number>4</number>
+      <number>3</number>
      </property>
      <item>
       <widget class="QComboBox" name="whatCombo">
@@ -51,18 +51,6 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="minimumSize">
-        <size>
-         <width>97</width>
-         <height>26</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>204</width>
-         <height>30</height>
-        </size>
-       </property>
        <item>
         <property name="text">
          <string>from this executable</string>
@@ -103,18 +91,6 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="minimumSize">
-        <size>
-         <width>97</width>
-         <height>26</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>204</width>
-         <height>30</height>
-        </size>
-       </property>
        <property name="currentText">
         <string>once</string>
        </property>
@@ -163,23 +139,11 @@
      <item>
       <widget class="QToolButton" name="actionButton">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="minimumSize">
-        <size>
-         <width>97</width>
-         <height>26</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>204</width>
-         <height>30</height>
-        </size>
-       </property>
        <property name="styleSheet">
         <string notr="true"/>
        </property>
@@ -206,18 +170,6 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="minimumSize">
-        <size>
-         <width>97</width>
-         <height>26</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>204</width>
-         <height>30</height>
-        </size>
-       </property>
        <property name="text">
         <string>Allow</string>
        </property>
@@ -230,21 +182,15 @@
      <item>
       <widget class="QPushButton" name="checkAdvanced">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+        <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="minimumSize">
-        <size>
-         <width>26</width>
-         <height>26</height>
-        </size>
-       </property>
        <property name="maximumSize">
         <size>
-         <width>40</width>
-         <height>30</height>
+         <width>35</width>
+         <height>16777215</height>
         </size>
        </property>
        <property name="text">
@@ -469,7 +415,7 @@
        <item row="3" column="0">
         <widget class="QLabel" name="messageLabel">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+          <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -484,7 +430,7 @@
           <bool>true</bool>
          </property>
          <property name="margin">
-          <number>5</number>
+          <number>2</number>
          </property>
          <property name="textInteractionFlags">
           <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@@ -601,7 +547,7 @@
              </property>
              <property name="font">
               <font>
-               <pointsize>16</pointsize>
+               <pointsize>12</pointsize>
                <weight>75</weight>
                <bold>true</bold>
                <kerning>true</kerning>
@@ -727,7 +673,7 @@
          <item row="0" column="1">
           <widget class="QLabel" name="label_2">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
@@ -754,6 +700,12 @@
          </item>
          <item row="7" column="3">
           <widget class="QLabel" name="checksumLabel">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="font">
             <font>
              <pointsize>10</pointsize>
@@ -781,23 +733,10 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="2">
-          <spacer name="horizontalSpacer">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
          <item row="6" column="1">
           <widget class="QLabel" name="label_6">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
@@ -825,7 +764,7 @@
          <item row="2" column="1">
           <widget class="QLabel" name="label_3">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
@@ -846,17 +785,11 @@
          <item row="2" column="3">
           <widget class="QLabel" name="destIPLabel">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+            <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
-           <property name="minimumSize">
-            <size>
-             <width>90</width>
-             <height>0</height>
-            </size>
-           </property>
            <property name="font">
             <font>
              <pointsize>10</pointsize>
@@ -895,17 +828,11 @@
          <item row="0" column="3">
           <widget class="QLabel" name="cwdLabel">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+            <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
-           <property name="minimumSize">
-            <size>
-             <width>90</width>
-             <height>0</height>
-            </size>
-           </property>
            <property name="font">
             <font>
              <pointsize>10</pointsize>
@@ -922,24 +849,18 @@
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="textInteractionFlags">
-            <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+            <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
            </property>
           </widget>
          </item>
          <item row="6" column="3">
           <widget class="QLabel" name="uidLabel">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+            <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
-           <property name="minimumSize">
-            <size>
-             <width>90</width>
-             <height>0</height>
-            </size>
-           </property>
            <property name="font">
             <font>
              <pointsize>10</pointsize>
@@ -963,14 +884,11 @@
          <item row="2" column="2">
           <widget class="QComboBox" name="whatIPCombo">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
-           <property name="minimumContentsLength">
-            <number>0</number>
-           </property>
           </widget>
          </item>
          <item row="2" column="0">
@@ -983,7 +901,7 @@
          <item row="5" column="1">
           <widget class="QLabel" name="destPortLabel_1">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
@@ -1004,17 +922,11 @@
          <item row="5" column="3">
           <widget class="QLabel" name="destPortLabel">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+            <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
-           <property name="minimumSize">
-            <size>
-             <width>90</width>
-             <height>0</height>
-            </size>
-           </property>
            <property name="font">
             <font>
              <pointsize>10</pointsize>
@@ -1038,7 +950,7 @@
          <item row="1" column="1">
           <widget class="QLabel" name="label">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
@@ -1059,17 +971,11 @@
          <item row="1" column="3">
           <widget class="QLabel" name="sourceIPLabel">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+            <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
-           <property name="minimumSize">
-            <size>
-             <width>90</width>
-             <height>0</height>
-            </size>
-           </property>
            <property name="font">
             <font>
              <pointsize>10</pointsize>