From fb5c5a6c6d18c53727d014b7e9e473cea2144be5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Gl=C3=A4=C3=9Fer?= <tobimensch@yahoo.de>
Date: Sun, 12 Jun 2016 18:49:30 +0200
Subject: [PATCH] Fix for Settings Widgets list getting too small in some
 themes. Small changes (mostly automatically induced by qt-designer).

---
 src/Embedded_Display/vncview.cpp |  4 +--
 src/First_Start_Wizard.cpp       |  4 +++
 src/Main_Window.cpp              |  1 -
 src/Main_Window.ui               | 45 --------------------------------
 src/Settings_Widget.cpp          |  5 ++++
 src/VM_Wizard_Window.ui          | 24 ++++++++++++++---
 6 files changed, 31 insertions(+), 52 deletions(-)

diff --git a/src/Embedded_Display/vncview.cpp b/src/Embedded_Display/vncview.cpp
index 8faef72..bdbd44a 100644
--- a/src/Embedded_Display/vncview.cpp
+++ b/src/Embedded_Display/vncview.cpp
@@ -502,8 +502,8 @@ void VncView::enterEvent( QEvent* event )
 {
     auto enter = static_cast<QEnterEvent*>(event);
 
-    int x = enter->globalX();
-    int y = enter->globalY();
+    //int x = enter->globalX();
+    //int y = enter->globalY();
     int mx = enter->x();
     int my = enter->y();
 
diff --git a/src/First_Start_Wizard.cpp b/src/First_Start_Wizard.cpp
index 26862f7..5b36767 100644
--- a/src/First_Start_Wizard.cpp
+++ b/src/First_Start_Wizard.cpp
@@ -71,9 +71,13 @@ void First_Start_Wizard::on_Button_Back_clicked()
 
 	if( ui.All_Pages->currentWidget() == ui.Find_Emulators_Page ||
 		ui.All_Pages->currentWidget() == ui.Add_Emulator_Page )
+    {
 		ui.All_Pages->setCurrentWidget( ui.General_Settings_Page );
+    }
 	else
+    {
 		ui.All_Pages->setCurrentIndex( ui.All_Pages->currentIndex() -1 );
+    }
 
 	ui.Button_Next->setEnabled( true );
 }
diff --git a/src/Main_Window.cpp b/src/Main_Window.cpp
index 642c400..1fecc0a 100644
--- a/src/Main_Window.cpp
+++ b/src/Main_Window.cpp
@@ -227,7 +227,6 @@ Main_Window::Main_Window( QWidget *parent )
 		}
 	}
 
-
     Settings_Widget::syncGroupIconSizes("Main");
 }
 
diff --git a/src/Main_Window.ui b/src/Main_Window.ui
index ede8806..783426a 100644
--- a/src/Main_Window.ui
+++ b/src/Main_Window.ui
@@ -355,9 +355,6 @@
                    <property name="text">
                     <string>Architecture</string>
                    </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
                   </widget>
                  </item>
                  <item row="3" column="0">
@@ -371,9 +368,6 @@
                    <property name="text">
                     <string>CP&amp;Us:</string>
                    </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
                    <property name="buddy">
                     <cstring>CB_CPU_Count</cstring>
                    </property>
@@ -428,9 +422,6 @@
                    <property name="text">
                     <string>Accelerator:</string>
                    </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
                   </widget>
                  </item>
                  <item row="1" column="2">
@@ -455,9 +446,6 @@
                    <property name="text">
                     <string>&amp;Name:</string>
                    </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
                    <property name="buddy">
                     <cstring>Edit_Machine_Name</cstring>
                    </property>
@@ -503,9 +491,6 @@
                    <property name="text">
                     <string/>
                    </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
                   </widget>
                  </item>
                  <item row="1" column="0">
@@ -519,9 +504,6 @@
                    <property name="text">
                     <string>&amp;Boot:</string>
                    </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
                    <property name="textInteractionFlags">
                     <set>Qt::LinksAccessibleByMouse</set>
                    </property>
@@ -585,9 +567,6 @@
                    <property name="text">
                     <string>&amp;Graphics:</string>
                    </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
                    <property name="buddy">
                     <cstring>CB_Video_Card</cstring>
                    </property>
@@ -623,9 +602,6 @@
                    <property name="text">
                     <string>&amp;Keyboard:</string>
                    </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
                    <property name="buddy">
                     <cstring>CB_Keyboard_Layout</cstring>
                    </property>
@@ -1463,9 +1439,6 @@
                      <property name="text">
                       <string>&amp;Kernel bzImage file:</string>
                      </property>
-                     <property name="alignment">
-                      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                     </property>
                      <property name="buddy">
                       <cstring>Edit_Linux_bzImage_Path</cstring>
                      </property>
@@ -1489,9 +1462,6 @@
                      <property name="text">
                       <string>&amp;Initrd file:</string>
                      </property>
-                     <property name="alignment">
-                      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                     </property>
                      <property name="buddy">
                       <cstring>Edit_Linux_Initrd_Path</cstring>
                      </property>
@@ -1505,9 +1475,6 @@
                      <property name="text">
                       <string>A&amp;ppend command line:</string>
                      </property>
-                     <property name="alignment">
-                      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                     </property>
                      <property name="buddy">
                       <cstring>Edit_Linux_Command_Line</cstring>
                      </property>
@@ -1956,9 +1923,6 @@
                         <property name="toolTip">
                          <string>For Connection Use Port 5900 + VNC Display Number</string>
                         </property>
-                        <property name="alignment">
-                         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                        </property>
                         <property name="minimum">
                          <number>1</number>
                         </property>
@@ -2880,9 +2844,6 @@
                     <property name="text">
                      <string>TFTP folder:</string>
                     </property>
-                    <property name="alignment">
-                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                    </property>
                     <property name="buddy">
                      <cstring>Edit_TFTP_Prefix</cstring>
                     </property>
@@ -2903,9 +2864,6 @@
                     <property name="text">
                      <string>Allow &amp;SMB access to:</string>
                     </property>
-                    <property name="alignment">
-                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                    </property>
                     <property name="buddy">
                      <cstring>Edit_SMB_Folder</cstring>
                     </property>
@@ -3004,9 +2962,6 @@
             <property name="text">
              <string/>
             </property>
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
            </widget>
           </item>
           <item>
diff --git a/src/Settings_Widget.cpp b/src/Settings_Widget.cpp
index 7cc17a9..bf11064 100644
--- a/src/Settings_Widget.cpp
+++ b/src/Settings_Widget.cpp
@@ -228,6 +228,11 @@ void Settings_Widget::syncGroupIconSizes(QString g)
         min_total_list_width += max_width.at(j) +5;
     }
 
+    if ( max_list_height > 0  && max_list_height <= 58 )
+    {
+        max_list_height = 68;
+    }
+
     //then apply max_width to all
     for( int i = 0; i < list.count(); i++ )
     {
diff --git a/src/VM_Wizard_Window.ui b/src/VM_Wizard_Window.ui
index dc7f663..fa8b46a 100644
--- a/src/VM_Wizard_Window.ui
+++ b/src/VM_Wizard_Window.ui
@@ -166,7 +166,7 @@
    <item row="1" column="0">
     <widget class="QStackedWidget" name="Wizard_Pages">
      <property name="currentIndex">
-      <number>3</number>
+      <number>7</number>
      </property>
      <widget class="QWidget" name="Wizard_Mode_Page">
       <layout class="QGridLayout" name="gridLayout_4">
@@ -678,7 +678,15 @@
          <property name="currentIndex">
           <number>1</number>
          </property>
-         <widget class="QWidget" name="toolBox_accelInfoPage2" native="true">
+         <widget class="QWidget" name="toolBox_accelInfoPage2">
+          <property name="geometry">
+           <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>108</width>
+            <height>380</height>
+           </rect>
+          </property>
           <attribute name="label">
            <string>TCG (for Tiny Code Generator)</string>
           </attribute>
@@ -707,7 +715,15 @@
            </item>
           </layout>
          </widget>
-         <widget class="QWidget" name="toolBox_accelInfoPage1" native="true">
+         <widget class="QWidget" name="toolBox_accelInfoPage1">
+          <property name="geometry">
+           <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>578</width>
+            <height>122</height>
+           </rect>
+          </property>
           <attribute name="label">
            <string>KVM (for Kernel-based Virtual Machine)</string>
           </attribute>
@@ -759,7 +775,7 @@
             <item>
              <widget class="QRadioButton" name="RB_Emulator_QEMU">
               <property name="text">
-               <string>TCG (Choose this if the &amp;guest or host isn't x86)</string>
+               <string>TCG (Choose this if the guest or host isn't &amp;x86)</string>
               </property>
              </widget>
             </item>