From c97ff4460c87cc79977d3bd2448ba1cf79fefa1d Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Mon, 26 Mar 2018 22:25:13 -0400
Subject: qt: Add config option for is_docked.

---
 src/yuzu/configuration/configure_general.ui | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'src/yuzu/configuration/configure_general.ui')

diff --git a/src/yuzu/configuration/configure_general.ui b/src/yuzu/configuration/configure_general.ui
index 573c4cb0e..35d3b26ad 100644
--- a/src/yuzu/configuration/configure_general.ui
+++ b/src/yuzu/configuration/configure_general.ui
@@ -70,6 +70,26 @@
          </layout>
        </widget>
      </item>
+     <item>
+      <widget class="QGroupBox" name="groupBox_4">
+       <property name="title">
+        <string>Emulation</string>
+       </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_8">
+          <item>
+            <layout class="QVBoxLayout" name="verticalLayout_6">
+              <item>
+                <widget class="QCheckBox" name="is_docked">
+                  <property name="text">
+                    <string>Enable docked mode</string>
+                  </property>
+                </widget>
+              </item>
+            </layout>
+          </item>
+        </layout>
+      </widget>
+     </item>
      <item>
       <widget class="QGroupBox" name="groupBox_3">
        <property name="title">
-- 
cgit v1.2.3


From f1423fcbc1f9a912a43cd31ba4b36733a2858713 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Mon, 26 Mar 2018 22:29:15 -0400
Subject: configure_general: Cleanup naming.

---
 src/yuzu/configuration/configure_general.ui | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/yuzu/configuration/configure_general.ui')

diff --git a/src/yuzu/configuration/configure_general.ui b/src/yuzu/configuration/configure_general.ui
index 35d3b26ad..b0684f0c1 100644
--- a/src/yuzu/configuration/configure_general.ui
+++ b/src/yuzu/configuration/configure_general.ui
@@ -13,17 +13,17 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
+  <layout class="QHBoxLayout" name="HorizontalLayout">
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout">
+    <layout class="QVBoxLayout" name="VerticalLayout">
      <item>
-      <widget class="QGroupBox" name="groupBox">
+      <widget class="QGroupBox" name="GeneralGroupBox">
        <property name="title">
         <string>General</string>
        </property>
-       <layout class="QHBoxLayout" name="horizontalLayout_3">
+       <layout class="QHBoxLayout" name="GeneralHorizontalLayout">
         <item>
-         <layout class="QVBoxLayout" name="verticalLayout_2">
+         <layout class="QVBoxLayout" name="GeneralVerticalLayout">
           <item>
            <widget class="QCheckBox" name="toggle_deepscan">
             <property name="text">
@@ -44,13 +44,13 @@
       </widget>
      </item>
      <item>
-       <widget class="QGroupBox" name="groupBox_2">
+       <widget class="QGroupBox" name="CpuCoreGroupBox">
          <property name="title">
            <string>CPU Core</string>
          </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_7">
+         <layout class="QHBoxLayout" name="CpuCoreHorizontalLayout">
            <item>
-             <layout class="QVBoxLayout" name="verticalLayout_5">
+             <layout class="QVBoxLayout" name="CpuCoreVerticalLayout">
                <item>
                  <widget class="QComboBox" name="cpu_core_combobox">
                   <item>
@@ -71,13 +71,13 @@
        </widget>
      </item>
      <item>
-      <widget class="QGroupBox" name="groupBox_4">
+      <widget class="QGroupBox" name="EmulationGroupBox">
        <property name="title">
         <string>Emulation</string>
        </property>
-        <layout class="QHBoxLayout" name="horizontalLayout_8">
+        <layout class="QHBoxLayout" name="EmulationHorizontalLayout">
           <item>
-            <layout class="QVBoxLayout" name="verticalLayout_6">
+            <layout class="QVBoxLayout" name="EmulationVerticalLayout">
               <item>
                 <widget class="QCheckBox" name="is_docked">
                   <property name="text">
@@ -91,13 +91,13 @@
       </widget>
      </item>
      <item>
-      <widget class="QGroupBox" name="groupBox_3">
+      <widget class="QGroupBox" name="HotKeysGroupBox">
        <property name="title">
         <string>Hotkeys</string>
        </property>
-       <layout class="QHBoxLayout" name="horizontalLayout_4">
+       <layout class="QHBoxLayout" name="HotKeysHorizontalLayout">
         <item>
-         <layout class="QVBoxLayout" name="verticalLayout_4">
+         <layout class="QVBoxLayout" name="HotKeysVerticalLayout">
           <item>
            <widget class="GHotkeysDialog" name="widget" native="true"/>
           </item>
-- 
cgit v1.2.3


From 5ecf152c8ee1bb6f8f050d16dda56c1b115e0ff3 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Mon, 26 Mar 2018 22:59:18 -0400
Subject: config: Rename is_docked to use_docked_mode to be consistent with
 other config bools.

---
 src/yuzu/configuration/configure_general.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/yuzu/configuration/configure_general.ui')

diff --git a/src/yuzu/configuration/configure_general.ui b/src/yuzu/configuration/configure_general.ui
index b0684f0c1..717b1b474 100644
--- a/src/yuzu/configuration/configure_general.ui
+++ b/src/yuzu/configuration/configure_general.ui
@@ -79,7 +79,7 @@
           <item>
             <layout class="QVBoxLayout" name="EmulationVerticalLayout">
               <item>
-                <widget class="QCheckBox" name="is_docked">
+                <widget class="QCheckBox" name="use_docked_mode">
                   <property name="text">
                     <string>Enable docked mode</string>
                   </property>
-- 
cgit v1.2.3


From 94f4009c3be4c7f69eda8af1cb0139dccd5bffa5 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Mon, 26 Mar 2018 23:01:40 -0400
Subject: config: Use simplified checkbox (from Citra) for CPU JIT.

---
 src/yuzu/configuration/configure_general.ui | 41 ++++++++++++-----------------
 1 file changed, 17 insertions(+), 24 deletions(-)

(limited to 'src/yuzu/configuration/configure_general.ui')

diff --git a/src/yuzu/configuration/configure_general.ui b/src/yuzu/configuration/configure_general.ui
index 717b1b474..5ff68f079 100644
--- a/src/yuzu/configuration/configure_general.ui
+++ b/src/yuzu/configuration/configure_general.ui
@@ -44,31 +44,24 @@
       </widget>
      </item>
      <item>
-       <widget class="QGroupBox" name="CpuCoreGroupBox">
-         <property name="title">
-           <string>CPU Core</string>
-         </property>
-         <layout class="QHBoxLayout" name="CpuCoreHorizontalLayout">
-           <item>
-             <layout class="QVBoxLayout" name="CpuCoreVerticalLayout">
-               <item>
-                 <widget class="QComboBox" name="cpu_core_combobox">
-                  <item>
-                   <property name="text">
-                    <string>Unicorn</string>
-                   </property>
-                  </item>
-                  <item>
-                   <property name="text">
-                    <string>Dynarmic</string>
-                   </property>
-                  </item>
-                 </widget>
-               </item>
-             </layout>
-           </item>
+      <widget class="QGroupBox" name="PerformanceGroupBox">
+       <property name="title">
+        <string>Performance</string>
+       </property>
+       <layout class="QHBoxLayout" name="PerformanceHorizontalLayout">
+        <item>
+         <layout class="QVBoxLayout" name="PerformanceVerticalLayout">
+          <item>
+           <widget class="QCheckBox" name="use_cpu_jit">
+            <property name="text">
+             <string>Enable CPU JIT</string>
+            </property>
+           </widget>
+          </item>
          </layout>
-       </widget>
+        </item>
+       </layout>
+      </widget>
      </item>
      <item>
       <widget class="QGroupBox" name="EmulationGroupBox">
-- 
cgit v1.2.3