1
0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-07 03:13:49 +00:00

UI refresh: emulation tab condensed vertically

This commit is contained in:
Aquatakat 2019-07-15 22:24:10 -06:00 committed by Sergey Lipskiy
parent 54b825d957
commit 95cee96d15
2 changed files with 485 additions and 410 deletions

View File

@ -755,16 +755,12 @@ void ConfigDialog::on_frameBufferInfoLabel2_linkActivated(QString link)
void ConfigDialog::on_frameBufferCheckBox_toggled(bool checked)
{
if (!checked) {
ui->nativeRes2DFrame->setEnabled(true);
} else {
ui->nativeRes2DFrame->setEnabled(!ui->factor1xRadioButton->isChecked());
}
ui->readColorChunkCheckBox->setEnabled(checked && ui->fbInfoEnableCheckBox->isChecked());
ui->readDepthChunkCheckBox->setEnabled(checked && ui->fbInfoEnableCheckBox->isChecked());
if (!checked && ui->fxaaRadioButton->isChecked())
ui->noaaRadioButton->setChecked(true);
ui->frameBufferCheckBox->setStyleSheet("");
}

View File

@ -10,7 +10,7 @@
<x>0</x>
<y>0</y>
<width>559</width>
<height>603</height>
<height>685</height>
</rect>
</property>
<property name="windowTitle">
@ -29,10 +29,16 @@
</property>
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>590</height>
<height>530</height>
</size>
</property>
<property name="usesScrollButtons">
@ -941,8 +947,8 @@
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
@ -991,8 +997,8 @@
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
@ -1156,43 +1162,108 @@
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QCheckBox" name="enableShadersStorageCheckBox">
<layout class="QHBoxLayout" name="horizontalLayout_20">
<property name="spacing">
<number>16</number>
</property>
<item>
<widget class="QGroupBox" name="factorGroupBox">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use persistent storage for compiled shader programs.&lt;br/&gt;Each game uses a set of combiners. A combiner is an equation that defines how to build output color from various color inputs. GLideN64 translates shaders, and compiles shader programs on the fly. Shaders are large and complex. If the game uses several new combiners, compiling new shaders will take time and result in stuttering. When this option is checked, these shaders are saved so they're not recompiled the next time you run the game.&lt;/p&gt;&lt;p&gt;[Recommended: &lt;span style=&quot; font-style:italic;&quot;&gt;Checked&lt;/span&gt;]&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option sets the output render buffer size. By default, the render buffer is set to the &lt;span style=&quot; font-weight:600;&quot;&gt;Same as output resolution&lt;/span&gt;, but you can set it to the &lt;span style=&quot; font-weight:600;&quot;&gt;Original N64 resolution&lt;/span&gt; or a &lt;span style=&quot; font-weight:600;&quot;&gt;Multiple of N64 resolution&lt;/span&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="title">
<string>Internal resolution</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_56">
<property name="spacing">
<number>3</number>
</property>
<item>
<widget class="QRadioButton" name="factor0xRadioButton">
<property name="text">
<string>Store compiled shaders for performance (recommended)</string>
<string>Same as output resolution</string>
</property>
<property name="checked">
<bool>true</bool>
<attribute name="buttonGroup">
<string notr="true">factorButtonGroup</string>
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="factor1xRadioButton">
<property name="text">
<string>Original N64 resolution (most accurate)</string>
</property>
<attribute name="buttonGroup">
<string notr="true">factorButtonGroup</string>
</attribute>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_27">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="topMargin">
<number>2</number>
</property>
<item>
<widget class="QRadioButton" name="factorXxRadioButton">
<property name="text">
<string>Multiple of N64 resolution:</string>
</property>
<attribute name="buttonGroup">
<string notr="true">factorButtonGroup</string>
</attribute>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QSpinBox" name="resolutionFactorSpinBox">
<property name="suffix">
<string>x</string>
</property>
<property name="minimum">
<number>2</number>
</property>
<property name="maximum">
<number>16</number>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_7">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QFrame" name="gammaCorrectionFrame">
<widget class="QGroupBox" name="gammaCorrectionGroupBox">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Some N64 games use gamma correction to brighten the image. When the frame buffer is enabled, gamma correction is applied automatically for all games that use it on the N64. You can use your own gamma correction instead with this option. The default level, used on the N64, is 2.&lt;/p&gt;&lt;p&gt;[Recommended: &lt;span style=&quot; font-style:italic;&quot;&gt;Unchecked; 2.00&lt;/span&gt;]&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="title">
<string>Gamma</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_15">
<property name="spacing">
<number>4</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_12">
<item>
@ -1300,113 +1371,38 @@
</layout>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QFrame" name="factorFrame">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option sets the output render buffer size. By default, the render buffer is set to the &lt;span style=&quot; font-weight:600;&quot;&gt;Same as output resolution&lt;/span&gt;, but you can set it to the &lt;span style=&quot; font-weight:600;&quot;&gt;Original N64 resolution&lt;/span&gt; or a &lt;span style=&quot; font-weight:600;&quot;&gt;Multiple of N64 resolution&lt;/span&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_56">
<property name="spacing">
<number>3</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="factorLabel">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Internal resolution:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="factor0xRadioButton">
<property name="text">
<string>Same as output resolution</string>
</property>
<attribute name="buttonGroup">
<string notr="true">factorButtonGroup</string>
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="factor1xRadioButton">
<property name="text">
<string>Original N64 resolution (most accurate)</string>
</property>
<attribute name="buttonGroup">
<string notr="true">factorButtonGroup</string>
</attribute>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_27">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="topMargin">
<number>2</number>
</property>
<item>
<widget class="QRadioButton" name="factorXxRadioButton">
<property name="text">
<string>Multiple of N64 resolution:</string>
</property>
<attribute name="buttonGroup">
<string notr="true">factorButtonGroup</string>
</attribute>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QSpinBox" name="resolutionFactorSpinBox">
<property name="suffix">
<string>x</string>
</property>
<property name="minimum">
<number>2</number>
</property>
<property name="maximum">
<number>16</number>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_7">
<spacer name="verticalSpacer_15">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QFrame" name="nativeRes2DFrame">
<widget class="QGroupBox" name="nativeRes2DGroupBox">
<property name="title">
<string>2D elements</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_48">
<property name="spacing">
<number>18</number>
</property>
<item>
<layout class="QVBoxLayout" name="verticalLayout_31">
<property name="spacing">
<number>4</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
@ -1439,6 +1435,13 @@
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_15">
<property name="spacing">
<number>9</number>
</property>
<item>
<widget class="QFrame" name="fixTexrectFrame">
<property name="toolTip">
@ -1512,6 +1515,19 @@
</layout>
</widget>
</item>
<item>
<widget class="Line" name="line_2">
<property name="styleSheet">
<string notr="true">color: rgba(0, 0, 0, 15%);</string>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item>
<widget class="QFrame" name="bgModeFrame">
<property name="toolTip">
@ -1554,14 +1570,45 @@
</property>
</widget>
</item>
</layout>
</widget>
<item>
<spacer name="verticalSpacer_13">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="enableShadersStorageCheckBox">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use persistent storage for compiled shader programs.&lt;br/&gt;Each game uses a set of combiners. A combiner is an equation that defines how to build output color from various color inputs. GLideN64 translates shaders, and compiles shader programs on the fly. Shaders are large and complex. If the game uses several new combiners, compiling new shaders will take time and result in stuttering. When this option is checked, these shaders are saved so they're not recompiled the next time you run the game.&lt;/p&gt;&lt;p&gt;[Recommended: &lt;span style=&quot; font-style:italic;&quot;&gt;Checked&lt;/span&gt;]&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Store compiled shaders for performance (recommended)</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
@ -3630,8 +3677,8 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>360</x>
<y>629</y>
<x>369</x>
<y>675</y>
</hint>
<hint type="destinationlabel">
<x>343</x>
@ -3646,8 +3693,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>441</x>
<y>629</y>
<x>450</x>
<y>675</y>
</hint>
<hint type="destinationlabel">
<x>426</x>
@ -3698,8 +3745,8 @@
<y>41</y>
</hint>
<hint type="destinationlabel">
<x>134</x>
<y>534</y>
<x>145</x>
<y>525</y>
</hint>
</hints>
</connection>
@ -3710,12 +3757,12 @@
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>590</x>
<y>287</y>
<x>489</x>
<y>297</y>
</hint>
<hint type="destinationlabel">
<x>417</x>
<y>303</y>
<x>367</x>
<y>313</y>
</hint>
</hints>
</connection>
@ -3730,8 +3777,8 @@
<y>396</y>
</hint>
<hint type="destinationlabel">
<x>625</x>
<y>189</y>
<x>524</x>
<y>199</y>
</hint>
</hints>
</connection>
@ -3762,8 +3809,8 @@
<y>41</y>
</hint>
<hint type="destinationlabel">
<x>334</x>
<y>534</y>
<x>345</x>
<y>525</y>
</hint>
</hints>
</connection>
@ -3774,12 +3821,12 @@
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>106</x>
<y>294</y>
<x>128</x>
<y>343</y>
</hint>
<hint type="destinationlabel">
<x>130</x>
<y>317</y>
<x>152</x>
<y>463</y>
</hint>
</hints>
</connection>
@ -3854,44 +3901,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>608</x>
<y>335</y>
<x>525</x>
<y>341</y>
</hint>
<hint type="destinationlabel">
<x>608</x>
<y>253</y>
</hint>
</hints>
</connection>
<connection>
<sender>nativeRes2D_checkBox</sender>
<signal>toggled(bool)</signal>
<receiver>fixTexrectFrame</receiver>
<slot>setDisabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>74</x>
<y>350</y>
</hint>
<hint type="destinationlabel">
<x>73</x>
<y>441</y>
</hint>
</hints>
</connection>
<connection>
<sender>frameBufferCheckBox</sender>
<signal>toggled(bool)</signal>
<receiver>factorFrame</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>100</x>
<y>41</y>
</hint>
<hint type="destinationlabel">
<x>124</x>
<y>315</y>
<x>526</x>
<y>263</y>
</hint>
</hints>
</connection>
@ -3902,20 +3917,84 @@
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>74</x>
<y>187</y>
<x>378</x>
<y>194</y>
</hint>
<hint type="destinationlabel">
<x>42</x>
<y>213</y>
<x>405</x>
<y>219</y>
</hint>
</hints>
</connection>
<connection>
<sender>frameBufferCheckBox</sender>
<signal>toggled(bool)</signal>
<receiver>factorGroupBox</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>278</x>
<y>49</y>
</hint>
<hint type="destinationlabel">
<x>140</x>
<y>201</y>
</hint>
</hints>
</connection>
<connection>
<sender>nativeRes2D_checkBox</sender>
<signal>toggled(bool)</signal>
<receiver>fixTexrectFrame</receiver>
<slot>setDisabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>212</x>
<y>329</y>
</hint>
<hint type="destinationlabel">
<x>230</x>
<y>367</y>
</hint>
</hints>
</connection>
<connection>
<sender>frameBufferCheckBox</sender>
<signal>toggled(bool)</signal>
<receiver>overscanFrame</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>278</x>
<y>49</y>
</hint>
<hint type="destinationlabel">
<x>104</x>
<y>395</y>
</hint>
</hints>
</connection>
<connection>
<sender>frameBufferCheckBox</sender>
<signal>toggled(bool)</signal>
<receiver>fxaaRadioButton</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>278</x>
<y>49</y>
</hint>
<hint type="destinationlabel">
<x>369</x>
<y>93</y>
</hint>
</hints>
</connection>
</connections>
<buttongroups>
<buttongroup name="factorButtonGroup"/>
<buttongroup name="fixTexrectCoordsButtonGroup"/>
<buttongroup name="osdButtonGroup"/>
<buttongroup name="factorButtonGroup"/>
<buttongroup name="screenshotButtonGroup"/>
<buttongroup name="fixTexrectCoordsButtonGroup"/>
</buttongroups>
</ui>