From b1a7a1fb26f17312a3aacfd0d2678c86d1e9236f Mon Sep 17 00:00:00 2001
From: Stelios Tsampas <loathingkernel@gmail.com>
Date: Fri, 30 Apr 2021 00:08:28 +0300
Subject: [PATCH] Align the labels with the the text widget of PathEdit

---
 rare/components/tabs/settings/linux_ui.py     | 28 ++++++++-------
 .../ui/components/tabs/settings/linux.ui      | 34 +++++++++++--------
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/rare/components/tabs/settings/linux_ui.py b/rare/components/tabs/settings/linux_ui.py
index 1a8c6ea7..c7d89e08 100644
--- a/rare/components/tabs/settings/linux_ui.py
+++ b/rare/components/tabs/settings/linux_ui.py
@@ -25,24 +25,26 @@ class Ui_LinuxSettings(object):
         self.wine_layout.setObjectName("wine_layout")
         self.exec_label = QtWidgets.QLabel(self.wine_groupbox)
         self.exec_label.setObjectName("exec_label")
-        self.wine_layout.addWidget(self.exec_label, 1, 0, 1, 1, QtCore.Qt.AlignRight)
+        self.wine_layout.addWidget(self.exec_label, 2, 0, 1, 1, QtCore.Qt.AlignRight)
         self.prefix_label = QtWidgets.QLabel(self.wine_groupbox)
         self.prefix_label.setObjectName("prefix_label")
         self.wine_layout.addWidget(self.prefix_label, 0, 0, 1, 1, QtCore.Qt.AlignRight)
-        self.prefix_frame = QtWidgets.QFrame(self.wine_groupbox)
-        self.prefix_frame.setFrameShape(QtWidgets.QFrame.StyledPanel)
-        self.prefix_frame.setFrameShadow(QtWidgets.QFrame.Sunken)
-        self.prefix_frame.setObjectName("prefix_frame")
-        self.prefix_layout = QtWidgets.QVBoxLayout(self.prefix_frame)
+        self.prefix_alignment_label = QtWidgets.QLabel(self.wine_groupbox)
+        self.prefix_alignment_label.setEnabled(False)
+        self.prefix_alignment_label.setText("")
+        self.prefix_alignment_label.setObjectName("prefix_alignment_label")
+        self.wine_layout.addWidget(self.prefix_alignment_label, 1, 0, 1, 1)
+        self.exec_alignment_label = QtWidgets.QLabel(self.wine_groupbox)
+        self.exec_alignment_label.setEnabled(False)
+        self.exec_alignment_label.setText("")
+        self.exec_alignment_label.setObjectName("exec_alignment_label")
+        self.wine_layout.addWidget(self.exec_alignment_label, 3, 0, 1, 1)
+        self.prefix_layout = QtWidgets.QVBoxLayout()
         self.prefix_layout.setObjectName("prefix_layout")
-        self.wine_layout.addWidget(self.prefix_frame, 0, 1, 1, 1)
-        self.exec_frame = QtWidgets.QFrame(self.wine_groupbox)
-        self.exec_frame.setFrameShape(QtWidgets.QFrame.StyledPanel)
-        self.exec_frame.setFrameShadow(QtWidgets.QFrame.Sunken)
-        self.exec_frame.setObjectName("exec_frame")
-        self.exec_layout = QtWidgets.QVBoxLayout(self.exec_frame)
+        self.wine_layout.addLayout(self.prefix_layout, 0, 1, 2, 1)
+        self.exec_layout = QtWidgets.QVBoxLayout()
         self.exec_layout.setObjectName("exec_layout")
-        self.wine_layout.addWidget(self.exec_frame, 1, 1, 1, 1)
+        self.wine_layout.addLayout(self.exec_layout, 2, 1, 2, 1)
         self.linux_layout.addWidget(self.wine_groupbox, 0, 0, 1, 1)
         self.dxvk_layout = QtWidgets.QVBoxLayout()
         self.dxvk_layout.setObjectName("dxvk_layout")
diff --git a/resources/ui/components/tabs/settings/linux.ui b/resources/ui/components/tabs/settings/linux.ui
index cb013d92..d3e1a209 100644
--- a/resources/ui/components/tabs/settings/linux.ui
+++ b/resources/ui/components/tabs/settings/linux.ui
@@ -33,7 +33,7 @@
       <string>Wine Settings</string>
      </property>
      <layout class="QGridLayout" name="wine_layout">
-      <item row="1" column="0" alignment="Qt::AlignRight">
+      <item row="2" column="0" alignment="Qt::AlignRight">
        <widget class="QLabel" name="exec_label">
         <property name="text">
          <string>Wine executable:</string>
@@ -47,28 +47,32 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QFrame" name="prefix_frame">
-        <property name="frameShape">
-         <enum>QFrame::StyledPanel</enum>
+      <item row="1" column="0">
+       <widget class="QLabel" name="prefix_alignment_label">
+        <property name="enabled">
+         <bool>false</bool>
         </property>
-        <property name="frameShadow">
-         <enum>QFrame::Sunken</enum>
+        <property name="text">
+         <string notr="true"/>
         </property>
-        <layout class="QVBoxLayout" name="prefix_layout"/>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QFrame" name="exec_frame">
-        <property name="frameShape">
-         <enum>QFrame::StyledPanel</enum>
+      <item row="3" column="0">
+       <widget class="QLabel" name="exec_alignment_label">
+        <property name="enabled">
+         <bool>false</bool>
         </property>
-        <property name="frameShadow">
-         <enum>QFrame::Sunken</enum>
+        <property name="text">
+         <string notr="true"/>
         </property>
-        <layout class="QVBoxLayout" name="exec_layout"/>
        </widget>
       </item>
+      <item row="0" column="1" rowspan="2">
+       <layout class="QVBoxLayout" name="prefix_layout"/>
+      </item>
+      <item row="2" column="1" rowspan="2">
+       <layout class="QVBoxLayout" name="exec_layout"/>
+      </item>
      </layout>
     </widget>
    </item>