ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Merge "Save" and "OK" buttons in shader options

This commit is contained in:
Vicki Pfau 2017-01-23 22:18:14 -08:00
parent 34b7bb2e1e
commit 2f14f58911
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -52,6 +52,7 @@ Misc:
- Feature: Support ImageMagick 7 - Feature: Support ImageMagick 7
- All: Move time.h include to common.h - All: Move time.h include to common.h
- CMake: Add ability to just print version string - CMake: Add ability to just print version string
- Qt: Merge "Save" and "OK" buttons in shader options
0.5.2: (2016-12-31) 0.5.2: (2016-12-31)
Bugfixes: Bugfixes:

3
src/platform/qt/ShaderSelector.cpp
View File

@ -264,9 +264,10 @@ void ShaderSelector::buttonPressed(QAbstractButton* button) {
case QDialogButtonBox::Reset: case QDialogButtonBox::Reset:
emit reset(); emit reset();
break; break;
case QDialogButtonBox::Save: case QDialogButtonBox::Ok:
m_config->setOption("shader", m_shaderPath); m_config->setOption("shader", m_shaderPath);
emit saved(); emit saved();
close();
break; break;
case QDialogButtonBox::RestoreDefaults: case QDialogButtonBox::RestoreDefaults:
emit resetToDefault(); emit resetToDefault();

21
src/platform/qt/ShaderSelector.ui
View File

@ -104,29 +104,12 @@
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="standardButtons"> <property name="standardButtons">
<set>QDialogButtonBox::Ok|QDialogButtonBox::Reset|QDialogButtonBox::RestoreDefaults|QDialogButtonBox::Save</set> <set>QDialogButtonBox::Ok|QDialogButtonBox::Reset|QDialogButtonBox::RestoreDefaults</set>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>
<connections> <connections/>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>ShaderSelector</receiver>
<slot>close()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui> </ui>