From b54f88eddf1a9790dfc3e73c13c3b610fc3346e6 Mon Sep 17 00:00:00 2001
From: Raul Metsma <raul@metsma.ee>
Date: Fri, 23 Dec 2022 09:44:35 +0200
Subject: [PATCH] Use auto layout (#1138)

IB-7581

Signed-off-by: Raul Metsma <raul@metsma.ee>

Signed-off-by: Raul Metsma <raul@metsma.ee>
---
 .github/workflows/build.yml |   1 +
 client/dialogs/PinPopup.cpp |  16 +-
 client/dialogs/PinPopup.ui  | 378 +++++++++++++++++-------------------
 3 files changed, 181 insertions(+), 214 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4e3c3b3c6..30d8a3523 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -297,6 +297,7 @@ jobs:
       with:
         patterns: |
           -**/*autogen*/**
+          -**/common/qtsingleapplication/**
           -**:cpp/poorly-documented-function
         input: sarif-results/cpp.sarif
         output: sarif-results/cpp.sarif
diff --git a/client/dialogs/PinPopup.cpp b/client/dialogs/PinPopup.cpp
index 765242a90..3f3664a3c 100644
--- a/client/dialogs/PinPopup.cpp
+++ b/client/dialogs/PinPopup.cpp
@@ -23,15 +23,13 @@
 #include "SslCertificate.h"
 
 #include <QtCore/QTimeLine>
-#include <QtGui/QMovie>
 #include <QtGui/QRegularExpressionValidator>
+#include <QtGui/QTextDocument>
 #include <QtWidgets/QLineEdit>
 #include <QtWidgets/QProgressBar>
 #include <QtWidgets/QPushButton>
 #include <QSvgWidget>
 
-#include <QTextDocument>
-
 PinPopup::PinPopup(PinFlags flags, const SslCertificate &c, TokenFlags count, QWidget *parent)
 	: PinPopup(flags, c.toString(c.showCN() ? QStringLiteral("<b>CN,</b> serialNumber") : QStringLiteral("<b>GN SN,</b> serialNumber")), count, parent)
 {
@@ -49,18 +47,13 @@ PinPopup::PinPopup(PinFlags flags, const QString &title, TokenFlags count, QWidg
 {
 	ui->setupUi(this);
 	setWindowFlags( Qt::Dialog | Qt::FramelessWindowHint );
-	setFixedSize( size() );
 	for(QLineEdit *w: findChildren<QLineEdit*>())
 		w->setAttribute(Qt::WA_MacShowFocusRect, false);
 
-	QFont regular = Styles::font( Styles::Regular, 14 );
-	QFont condensed14 = Styles::font( Styles::Condensed, 14 );
-
 	ui->labelNameId->setFont(Styles::font(Styles::Regular, 20, QFont::DemiBold));
-	ui->label->setFont( regular );
-	ui->ok->setFont( condensed14 );
-	ui->cancel->setFont( condensed14 );
-	ui->ok->setEnabled( false );
+	ui->label->setFont(Styles::font(Styles::Regular, 14));
+	ui->ok->setFont(Styles::font(Styles::Condensed, 14));
+	ui->cancel->setFont(ui->ok->font());
 
 	connect( ui->ok, &QPushButton::clicked, this, &PinPopup::accept );
 	connect( ui->cancel, &QPushButton::clicked, this, &PinPopup::reject );
@@ -142,6 +135,7 @@ PinPopup::PinPopup(PinFlags flags, const QString &title, TokenFlags count, QWidg
 		ui->label->setBuddy( ui->pin );
 		ui->ok->setDisabled(true);
 	}
+	adjustSize();
 }
 
 PinPopup::~PinPopup()
diff --git a/client/dialogs/PinPopup.ui b/client/dialogs/PinPopup.ui
index f4c8ec00d..c0749b155 100644
--- a/client/dialogs/PinPopup.ui
+++ b/client/dialogs/PinPopup.ui
@@ -2,145 +2,102 @@
 <ui version="4.0">
  <class>PinPopup</class>
  <widget class="QDialog" name="PinPopup">
-  <property name="windowModality">
-   <enum>Qt::WindowModal</enum>
-  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>507</width>
-    <height>232</height>
+    <width>495</width>
+    <height>220</height>
    </rect>
   </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>507</width>
-    <height>232</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>507</width>
-    <height>300</height>
-   </size>
-  </property>
   <property name="styleSheet">
-   <string notr="true">QDialog
-{
+   <string notr="true">QDialog {
 border-radius: 2px;
 background-color: #FFFFFF;
 }</string>
   </property>
-  <widget class="QLabel" name="labelNameId">
-   <property name="geometry">
-    <rect>
-     <x>22</x>
-     <y>12</y>
-     <width>461</width>
-     <height>24</height>
-    </rect>
-   </property>
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>14</pointsize>
-    </font>
-   </property>
-   <property name="focusPolicy">
-    <enum>Qt::TabFocus</enum>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">color: #041E42; border: none;</string>
-   </property>
-   <property name="text">
-    <string notr="true">&lt;b&gt;Mari Maasikas,&lt;/b&gt; 48405050123</string>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignCenter</set>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label">
-   <property name="geometry">
-    <rect>
-     <x>25</x>
-     <y>49</y>
-     <width>456</width>
-     <height>51</height>
-    </rect>
-   </property>
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
-   <property name="minimumSize">
-    <size>
-     <width>456</width>
-     <height>35</height>
-    </size>
-   </property>
-   <property name="maximumSize">
-    <size>
-     <width>456</width>
-     <height>60</height>
-    </size>
-   </property>
-   <property name="focusPolicy">
-    <enum>Qt::TabFocus</enum>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">color: #000000;
+  <layout class="QVBoxLayout" name="PinPopupLayout" stretch="0,1,0,0">
+   <property name="spacing">
+    <number>20</number>
+   </property>
+   <property name="leftMargin">
+    <number>20</number>
+   </property>
+   <property name="topMargin">
+    <number>10</number>
+   </property>
+   <property name="rightMargin">
+    <number>20</number>
+   </property>
+   <property name="bottomMargin">
+    <number>30</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="labelNameId">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>24</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <pointsize>14</pointsize>
+      </font>
+     </property>
+     <property name="focusPolicy">
+      <enum>Qt::TabFocus</enum>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">color: #041E42; border: none;</string>
+     </property>
+     <property name="text">
+      <string notr="true">&lt;b&gt;Mari Maasikas,&lt;/b&gt; 48405050123</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="focusPolicy">
+      <enum>Qt::TabFocus</enum>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">color: #000000;
 line-height: 15px;
 border: none;</string>
-   </property>
-   <property name="text">
-    <string>You need to use a personal identification certificate for the selected activity. Enter PIN1 to use the certificate</string>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignCenter</set>
-   </property>
-   <property name="wordWrap">
-    <bool>true</bool>
-   </property>
-   <property name="buddy">
-    <cstring>pin</cstring>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="pin">
-   <property name="geometry">
-    <rect>
-     <x>182</x>
-     <y>122</y>
-     <width>141</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="minimumSize">
-    <size>
-     <width>123</width>
-     <height>30</height>
-    </size>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>11</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">QLineEdit
+     </property>
+     <property name="text">
+      <string>You need to use a personal identification certificate for the selected activity. Enter PIN1 to use the certificate</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+     <property name="buddy">
+      <cstring>pin</cstring>
+     </property>
+    </widget>
+   </item>
+   <item alignment="Qt::AlignHCenter">
+    <widget class="QLineEdit" name="pin">
+     <property name="minimumSize">
+      <size>
+       <width>141</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <pointsize>11</pointsize>
+      </font>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">QLineEdit
 {
 padding: 0px 10px;
 border: 1px solid #DEE4E9;
@@ -150,42 +107,53 @@ color: #000000;
 line-height: 9px;
 text-align: center;
 }</string>
-   </property>
-   <property name="echoMode">
-    <enum>QLineEdit::Password</enum>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignCenter</set>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="cancel">
-   <property name="geometry">
-    <rect>
-     <x>126</x>
-     <y>172</y>
-     <width>120</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="minimumSize">
-    <size>
-     <width>120</width>
-     <height>30</height>
-    </size>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>14</pointsize>
-    </font>
-   </property>
-   <property name="cursor">
-    <cursorShape>PointingHandCursor</cursorShape>
-   </property>
-   <property name="accessibleName">
-    <string extracomment="accessible">Cancel</string>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">QPushButton {
+     </property>
+     <property name="echoMode">
+      <enum>QLineEdit::Password</enum>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="buttonLayout">
+     <property name="spacing">
+      <number>15</number>
+     </property>
+     <property name="leftMargin">
+      <number>100</number>
+     </property>
+     <property name="rightMargin">
+      <number>100</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="cancel">
+       <property name="minimumSize">
+        <size>
+         <width>120</width>
+         <height>32</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <pointsize>14</pointsize>
+        </font>
+       </property>
+       <property name="cursor">
+        <cursorShape>PointingHandCursor</cursorShape>
+       </property>
+       <property name="accessibleName">
+        <string extracomment="accessible">Cancel</string>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">QPushButton {
 	border-radius: 2px; 
 	border: none;
 	color: #ffffff;
@@ -197,39 +165,39 @@ QPushButton:pressed {
 QPushButton:hover:!pressed {
 	background-color: #CD2541;
 }</string>
-   </property>
-   <property name="text">
-    <string>CANCEL</string>
-   </property>
-   <property name="autoDefault">
-    <bool>false</bool>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="ok">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="geometry">
-    <rect>
-     <x>261</x>
-     <y>172</y>
-     <width>120</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="minimumSize">
-    <size>
-     <width>120</width>
-     <height>30</height>
-    </size>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>14</pointsize>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">QPushButton {
+       </property>
+       <property name="text">
+        <string>CANCEL</string>
+       </property>
+       <property name="autoDefault">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="ok">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>120</width>
+         <height>32</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <pointsize>14</pointsize>
+        </font>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">QPushButton {
 	border-radius: 2px; 
 	border: none;
 	color: #ffffff;
@@ -244,14 +212,18 @@ QPushButton:hover:!pressed {
 QPushButton:disabled {
 	background-color: #BEDBED;
 }</string>
-   </property>
-   <property name="text">
-    <string>OK</string>
-   </property>
-   <property name="default">
-    <bool>true</bool>
-   </property>
-  </widget>
+       </property>
+       <property name="text">
+        <string>OK</string>
+       </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
  </widget>
  <resources/>
  <connections/>