Mercurial > parpg-source
diff gui/menus.py @ 167:b3b82c2aebee
Using fife settings module again instead of our own.
| author | Beliar <KarstenBock@gmx.net> |
|---|---|
| date | Mon, 20 Feb 2012 16:50:10 +0100 |
| parents | bf1dd9c24a7e |
| children |
line wrap: on
line diff
--- a/gui/menus.py Thu Jan 12 18:42:48 2012 +0100 +++ b/gui/menus.py Mon Feb 20 16:50:10 2012 +0100 @@ -77,9 +77,6 @@ self.engine = engine self.settings = settings - width = self.settings.fife.ScreenWidth - height = self.settings.fife.ScreenHeight - # available options screen_modes = self.engine.getDeviceCaps().getSupportedScreenModes() resolutions = list(set([(mode.getWidth(), mode.getHeight()) @@ -91,12 +88,12 @@ self.lighting_models = range(3) # selected options - self.resolution = "{0}x{1}".format(width, height) - self.render_backend = self.settings.fife.RenderBackend - self.lighting_model = self.settings.fife.Lighting - self.fullscreen = self.settings.fife.FullScreen - self.sound = self.settings.fife.EnableSound - self.scroll_speed = self.settings.parpg.ScrollSpeed + self.resolution = self.settings.get("FIFE", "ScreenResolution") + self.render_backend = self.settings.get("FIFE", "RenderBackend") + self.lighting_model = self.settings.get("FIFE", "Lighting") + self.fullscreen = self.settings.get("FIFE", "FullScreen") + self.sound = self.settings.get("FIFE", "PlaySounds") + self.scroll_speed = self.settings.get("parpg", "ScrollSpeed") xml_file = vfs.VFS.open('gui/settings_menu.xml') self.window = pychan.loadXML(xml_file) @@ -157,16 +154,13 @@ self.window.collectData('screen_resolution', 'render_backend', 'lighting_model', 'enable_fullscreen', 'enable_sound', 'scroll_speed') - - width, height = self.resolutions[resolution].split('x') - self.settings.fife.ScreenWidth = width - self.settings.fife.ScreenHeight = height - self.settings.fife.RenderBackend = self.render_backends[backend] - self.settings.fife.Lighting = self.lighting_models[lighting] - self.settings.fife.FullScreen = fullscreen - self.settings.fife.EnableSound = sound - self.settings.parpg.ScrollSpeed = scroll_speed - self.settings.write() + self.settings.set("FIFE", "ScreenResolution", self.resolutions[resolution]) + self.settings.set("FIFE", "RenderBackend", self.render_backends[backend]) + self.settings.set("FIFE", "Lighting", self.lighting_models[lighting]) + self.settings.set("FIFE", "FullScreen", fullscreen) + self.settings.set("FIFE", "EnableSound", sound) + self.settings.set("FIFE", "ScrollSpeed", scroll_speed) + self.settings.saveSettings("../settings.xml") self.restart_dialog.show() self.hide()