summaryrefslogtreecommitdiff
path: root/src/citra_qt/configuration/configure.ui
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2017-08-26 20:15:15 -0400
committerGitHub <noreply@github.com>2017-08-26 20:15:15 -0400
commit22fc378fe9f3314b08d81ffaaf57fd8688e9e3cc (patch)
treed263eaca71ee08c3f9b81441b42bcd0e35977510 /src/citra_qt/configuration/configure.ui
parent3cdf854e44e7ff088fa0cbdcfa2bcc6e41822b2c (diff)
parent7698567fc9b9d0b009264d5d8ab5babc3ea197d8 (diff)
Merge pull request #2897 from bunnei/telemetry-ui
Telemetry UI and final touches
Diffstat (limited to 'src/citra_qt/configuration/configure.ui')
-rw-r--r--src/citra_qt/configuration/configure.ui15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/citra_qt/configuration/configure.ui b/src/citra_qt/configuration/configure.ui
index 85e206e42..6abd1917e 100644
--- a/src/citra_qt/configuration/configure.ui
+++ b/src/citra_qt/configuration/configure.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>441</width>
- <height>501</height>
+ <width>740</width>
+ <height>500</height>
</rect>
</property>
<property name="windowTitle">
@@ -49,6 +49,11 @@
<string>Debug</string>
</attribute>
</widget>
+ <widget class="ConfigureWeb" name="webTab">
+ <attribute name="title">
+ <string>Web</string>
+ </attribute>
+ </widget>
</widget>
</item>
<item>
@@ -97,6 +102,12 @@
<header>configuration/configure_graphics.h</header>
<container>1</container>
</customwidget>
+ <customwidget>
+ <class>ConfigureWeb</class>
+ <extends>QWidget</extends>
+ <header>configuration/configure_web.h</header>
+ <container>1</container>
+ </customwidget>
</customwidgets>
<resources/>
<connections>