[Scummvm-cvs-logs] SF.net SVN: scummvm:[35404] scummvm/trunk/gui/options.cpp

anotherguest at users.sourceforge.net anotherguest at users.sourceforge.net
Tue Dec 16 23:54:39 CET 2008


Revision: 35404
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35404&view=rev
Author:   anotherguest
Date:     2008-12-16 22:54:38 +0000 (Tue, 16 Dec 2008)

Log Message:
-----------
Set SMALL SCREEN DEVICE settings in ::open function with new UI framework

Modified Paths:
--------------
    scummvm/trunk/gui/options.cpp

Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp	2008-12-16 22:15:08 UTC (rev 35403)
+++ scummvm/trunk/gui/options.cpp	2008-12-16 22:54:38 UTC (rev 35404)
@@ -161,13 +161,17 @@
 			_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 @@
 	// 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 @@
 #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");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list