diff options
| author | Lars Persson | 2008-12-16 22:54:38 +0000 |
|---|---|---|
| committer | Lars Persson | 2008-12-16 22:54:38 +0000 |
| commit | 4e2565ca1f37da47fed1a3596a7cba059b2707e8 (patch) | |
| tree | fd2c7d18e7967966a3ef80dbca04fbc5623d76be /gui | |
| parent | 662a38de89986ba8f4fca5e44dd9c3d5b77b5726 (diff) | |
| download | scummvm-rg350-4e2565ca1f37da47fed1a3596a7cba059b2707e8.tar.gz scummvm-rg350-4e2565ca1f37da47fed1a3596a7cba059b2707e8.tar.bz2 scummvm-rg350-4e2565ca1f37da47fed1a3596a7cba059b2707e8.zip | |
Set SMALL SCREEN DEVICE settings in ::open function with new UI framework
svn-id: r35404
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/options.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gui/options.cpp b/gui/options.cpp index 9b608e4adc..9f0bcfb48e 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -161,13 +161,17 @@ void OptionsDialog::open() { _renderModePopUp->setSelected(sel); } -#ifndef SMALL_SCREEN_DEVICE +#ifdef SMALL_SCREEN_DEVICE + _fullscreenCheckbox->setState(true); + _fullscreenCheckbox->setEnabled(false); + _aspectCheckbox->setEnabled(false); +#else // !SMALL_SCREEN_DEVICE // Fullscreen setting _fullscreenCheckbox->setState(ConfMan.getBool("fullscreen", _domain)); // Aspect ratio setting _aspectCheckbox->setState(ConfMan.getBool("aspect_ratio", _domain)); -#endif +#endif // SMALL_SCREEN_DEVICE } // Audio options @@ -533,12 +537,6 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const String &prefix) { // Aspect ratio checkbox _aspectCheckbox = new CheckboxWidget(boss, prefix + "grAspectCheckbox", "Aspect ratio correction", 0, 0); -#ifdef SMALL_SCREEN_DEVICE - _fullscreenCheckbox->setState(true); - _fullscreenCheckbox->setEnabled(false); - _aspectCheckbox->setEnabled(false); -#endif - _enableGraphicSettings = true; } @@ -723,7 +721,7 @@ GlobalOptionsDialog::GlobalOptionsDialog() #endif #ifdef SMALL_SCREEN_DEVICE - new ButtonWidget(tab, "GlobalOptions.KeysButton", "Keys", kChooseKeyMappingCmd, 0); + new ButtonWidget(tab, "GlobalOptions_Paths.KeysButton", "Keys", kChooseKeyMappingCmd, 0); #endif tab->addTab("Misc"); |