From e957b26848c38cab976dd72815b3b08c70ffde63 Mon Sep 17 00:00:00 2001
From: ChrisHal <chalaszovich@gmail.com>
Date: Fri, 6 Dec 2024 21:40:21 +0100
Subject: [PATCH] make some dialog nicer on macOS

---
 QtPMbrowser/DlgExportMetadata.ui | 14 +++---
 QtPMbrowser/DlgPreferences.ui    | 85 +++++++++++++++++---------------
 2 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/QtPMbrowser/DlgExportMetadata.ui b/QtPMbrowser/DlgExportMetadata.ui
index f01fc95..976dce5 100644
--- a/QtPMbrowser/DlgExportMetadata.ui
+++ b/QtPMbrowser/DlgExportMetadata.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>307</width>
-    <height>198</height>
+    <width>358</width>
+    <height>252</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -24,7 +24,7 @@
    <item row="6" column="1" colspan="3">
     <spacer name="verticalSpacer">
      <property name="orientation">
-      <enum>Qt::Vertical</enum>
+      <enum>Qt::Orientation::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
@@ -37,10 +37,10 @@
    <item row="7" column="1" colspan="3">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Orientation::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
+      <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Save</set>
      </property>
      <property name="centerButtons">
       <bool>false</bool>
@@ -74,7 +74,7 @@
    <item row="0" column="0" colspan="4">
     <widget class="QLabel" name="label_2">
      <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;About to export tab delimited file. Only parameters marked &amp;quot;export&amp;quot;will be included in export.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;About to export tab delimited file. Only parameters marked &lt;span style=&quot; font-style:italic;&quot;&gt;export&lt;/span&gt; in the &lt;span style=&quot; font-style:italic;&quot;&gt;Select Parameters&lt;/span&gt; dialog will be included in export.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="scaledContents">
       <bool>false</bool>
@@ -91,7 +91,7 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2">
+   <item row="3" column="0" colspan="3">
     <widget class="QCheckBox" name="checkBoxSystemLocale">
      <property name="text">
       <string>use system default formatting</string>
diff --git a/QtPMbrowser/DlgPreferences.ui b/QtPMbrowser/DlgPreferences.ui
index b36e1fd..8e10c25 100644
--- a/QtPMbrowser/DlgPreferences.ui
+++ b/QtPMbrowser/DlgPreferences.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>284</height>
+    <width>453</width>
+    <height>321</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,23 +17,46 @@
    <locale language="English" country="UnitedStates"/>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="1">
+   <item row="2" column="0" colspan="3">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Orientation::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
-      <enum>Qt::Vertical</enum>
+      <enum>Qt::Orientation::Vertical</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
      </property>
     </widget>
    </item>
-   <item row="0" column="0" rowspan="2">
+   <item row="0" column="1">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Auto-naming for Imon / Vmon traces</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
-      <item row="3" column="0" colspan="2">
+      <item row="7" column="0">
+       <layout class="QVBoxLayout" name="verticalLayout"/>
+      </item>
+      <item row="8" column="0">
+       <widget class="QRadioButton" name="radioButtonExtFromFile">
+        <property name="text">
+         <string>use tracename from DAT file</string>
+        </property>
+       </widget>
+      </item>
+      <item row="11" column="0">
        <widget class="QGroupBox" name="groupBox_2">
         <property name="title">
          <string>custom extensions</string>
@@ -62,14 +85,7 @@
         </layout>
        </widget>
       </item>
-      <item row="1" column="0" colspan="2">
-       <widget class="QRadioButton" name="radioButtonExtFromFile">
-        <property name="text">
-         <string>use tracename from DAT file</string>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0" colspan="2">
+      <item row="12" column="0">
        <widget class="QLabel" name="label_3">
         <property name="text">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:700;&quot;&gt;Note:&lt;/span&gt; files written by very old &lt;span style=&quot; font-style:italic;&quot;&gt;PatchMaster&lt;/span&gt; versions might not provide tracenames and / or might not mark traces as Imon or Vmon traces. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -79,20 +95,10 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="0" colspan="2">
-       <widget class="QRadioButton" name="radioButtonDefaultExt">
-        <property name="text">
-         <string>use default (Imon, Vmon)</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="7" column="0" colspan="2">
+      <item row="13" column="0" colspan="2">
        <spacer name="verticalSpacer_2">
         <property name="orientation">
-         <enum>Qt::Vertical</enum>
+         <enum>Qt::Orientation::Vertical</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
@@ -102,7 +108,17 @@
         </property>
        </spacer>
       </item>
-      <item row="2" column="0">
+      <item row="9" column="0">
+       <widget class="QRadioButton" name="radioButtonDefaultExt">
+        <property name="text">
+         <string>use default (Imon, Vmon)</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="10" column="0" colspan="2">
        <widget class="QRadioButton" name="radioButtonCustomExt">
         <property name="text">
          <string>use custom extension for Imon and Vmon:</string>
@@ -112,19 +128,6 @@
      </layout>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <resources/>