piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 00:59:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Last major UI change before release.

Browse Source 
- Moved display related options in the "Display" tab from the general config to the gfx config, renamed the tab to "Interface"
- Moved Wiimote related options in the "Wii" tab from the general config to the wiimote config
- Moved various other options to more appropriate places ("Set Console as NTSC-J", "Skip GC BIOS"
- Dropped "Window Size" adjustment
- Now displaying a warning if one tries to enable software rendering
- Other minor changes

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7577 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
NeoBrainX
2011-06-02 19:32:34 +00:00
parent 77a747fedb
commit 837375a13d
8 changed files with 515 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Source/Core/DolphinWX/Src/ConfigMain.h
View File

@ -67,22 +67,12 @@ private:
ID_ENABLECHEATS,
ID_FRAMELIMIT,
ID_FRAMELIMIT_USEFPSFORLIMITING,
ID_ALWAYS_HLE_BS2,
ID_ENABLE_OPENCL,
ID_CPUENGINE,
ID_LOCKTHREADS,
ID_DSPTHREAD,
ID_DISPLAY_FULLSCREENRES,
ID_DISPLAY_WINDOWWIDTH,
ID_DISPLAY_WINDOWHEIGHT,
ID_DISPLAY_AUTOSIZE,
ID_DISPLAY_FULLSCREEN,
ID_DISPLAY_HIDECURSOR,
ID_DISPLAY_RENDERTOMAIN,
ID_DISPLAY_PROGSCAN,
ID_DISPLAY_NTSCJ,
ID_NTSCJ,
// Audio Settings
ID_DSPENGINE,
@ -102,6 +92,7 @@ private:
ID_HOTKEY_CONFIG,
ID_GC_SRAM_LNG,
ID_GC_ALWAYS_HLE_BS2,
ID_GC_EXIDEVICE_SLOTA,
ID_GC_EXIDEVICE_SLOTA_PATH,
@ -114,12 +105,6 @@ private:
ID_GC_SIDEVICE3,
ID_WII_BT_BAR,
ID_WII_BT_SENS,
ID_WII_BT_SPKV,
ID_WII_BT_MOT,
ID_WII_WIIMOTE_RECONNECT,
ID_WII_IPL_SSV,
ID_WII_IPL_E60,
ID_WII_IPL_AR,
@ -139,11 +124,6 @@ private:
ID_APPLOADERPATH,
ID_NANDROOT,
ID_GRAPHIC_CB,
ID_GRAPHIC_CONFIG,
ID_GRAPHIC_ABOUT,
ID_DSP_CB,
ID_DSP_CONFIG,
ID_DSP_ABOUT,
@ -160,25 +140,16 @@ private:
wxCheckBox* UseFPSForLimiting;
// Advanced
wxCheckBox* AlwaysHLE_BS2;
wxCheckBox* EnableOpenCL;
wxRadioBox* CPUEngine;
wxCheckBox* DSPThread;
wxCheckBox* LockThreads;
wxCheckBox* _NTSCJ;
wxBoxSizer* sDisplayPage; // Display settings
wxStaticBoxSizer* sbDisplay, *sbInterface; // Display and Interface sections
wxStaticBoxSizer* sbInterface; // Display and Interface sections
// Display
wxChoice* FullscreenResolution;
wxSpinCtrl* WindowWidth, *WindowHeight;
wxCheckBox* WindowAutoSize;
wxCheckBox* Fullscreen;
wxCheckBox* HideCursor;
wxCheckBox* RenderToMain;
wxCheckBox* ProgressiveScan;
wxCheckBox* NTSCJ;
// Audio
wxBoxSizer* sAudioPage; // GC settings
@ -206,6 +177,7 @@ private:
// IPL
wxChoice* GCSystemLang;
wxCheckBox* GCAlwaysHLE_BS2;
// Device
wxChoice* GCEXIDevice[3];
@ -214,15 +186,8 @@ private:
wxBoxSizer* sWiiPage; // Wii settings
wxStaticBoxSizer* sbWiimoteSettings, *sbWiiIPLSettings, *sbWiiDeviceSettings; // Wiimote, Misc and Device sections
wxGridBagSizer* sWiimoteSettings, *sWiiIPLSettings;
// Wiimote
wxChoice* WiiSensBarPos;
wxSlider* WiiSensBarSens;
wxSlider* WiimoteSpkVolume;
wxCheckBox* WiimoteMotor;
wxCheckBox* WiimoteReconnectOnLoad;
wxStaticBoxSizer* /*sbWiimoteSettings, **/sbWiiIPLSettings, *sbWiiDeviceSettings; // Wiimote, Misc and Device sections
wxGridBagSizer* /*sWiimoteSettings, **/sWiiIPLSettings;
// Misc
wxCheckBox* WiiScreenSaver;
@ -282,7 +247,6 @@ private:
void CoreSettingsChanged(wxCommandEvent& event);
void DisplaySettingsChanged(wxCommandEvent& event);
void AddResolutions();
void OnSpin(wxSpinEvent& event);
void AudioSettingsChanged(wxCommandEvent& event);