[Scummvm-cvs-logs] SF.net SVN: scummvm: [27347] scummvm/branches/branch-0-10-0/gui

sev at users.sourceforge.net sev at users.sourceforge.net
Mon Jun 11 10:04:12 CEST 2007


Revision: 27347
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27347&view=rev
Author:   sev
Date:     2007-06-11 01:04:11 -0700 (Mon, 11 Jun 2007)

Log Message:
-----------
Backport fix for bugs #1709323 and #1677997

Modified Paths:
--------------
    scummvm/branches/branch-0-10-0/gui/launcher.cpp
    scummvm/branches/branch-0-10-0/gui/options.cpp
    scummvm/branches/branch-0-10-0/gui/theme-config.cpp
    scummvm/branches/branch-0-10-0/gui/theme.h
    scummvm/branches/branch-0-10-0/gui/themes/classic080.ini
    scummvm/branches/branch-0-10-0/gui/themes/modern.ini

Property Changed:
----------------
    scummvm/branches/branch-0-10-0/gui/themes/classic080.ini

Modified: scummvm/branches/branch-0-10-0/gui/launcher.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/gui/launcher.cpp	2007-06-11 08:00:35 UTC (rev 27346)
+++ scummvm/branches/branch-0-10-0/gui/launcher.cpp	2007-06-11 08:04:11 UTC (rev 27347)
@@ -218,16 +218,10 @@
 	//
 	// 5) The volume tab
 	//
-	int volControlPos = g_gui.evaluator()->getVar("volumeControlsInAudio", true);
+	tab->addTab("Volume");
 
-	if (!volControlPos) {
-		tab->addTab("Volume");
+	_globalVolumeOverride = new CheckboxWidget(tab, "gameoptions_volumeCheckbox", "Override global volume settings", kCmdGlobalVolumeOverride, 0);
 
-		_globalVolumeOverride = new CheckboxWidget(tab, "gameoptions_volumeCheckbox", "Override global volume settings", kCmdGlobalVolumeOverride, 0);
-	} else {
-		_globalVolumeOverride = NULL;
-	}
-
 	addVolumeControls(tab, "gameoptions_");
 
 	//
@@ -288,7 +282,7 @@
 	OptionsDialog::open();
 
 	int sel, i;
-	bool e, f;
+	bool e;
 
 	// En-/disable dialog items depending on whether overrides are active or not.
 
@@ -302,18 +296,13 @@
 		ConfMan.hasKey("output_rate", _domain) ||
 		ConfMan.hasKey("subtitles", _domain) ||
 		ConfMan.hasKey("talkspeed", _domain);
+	_globalAudioOverride->setState(e);
 
-	f = ConfMan.hasKey("music_volume", _domain) ||
+	e = ConfMan.hasKey("music_volume", _domain) ||
 		ConfMan.hasKey("sfx_volume", _domain) ||
 		ConfMan.hasKey("speech_volume", _domain);
+	_globalVolumeOverride->setState(e);
 
-	if (_globalVolumeOverride) {
-		_globalAudioOverride->setState(e);
-		_globalVolumeOverride->setState(f);
-	} else {
-		_globalAudioOverride->setState(e || f);
-	}
-
 	e = ConfMan.hasKey("soundfont", _domain) ||
 		ConfMan.hasKey("multi_midi", _domain) ||
 		ConfMan.hasKey("native_mt32", _domain) ||

Modified: scummvm/branches/branch-0-10-0/gui/options.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/gui/options.cpp	2007-06-11 08:00:35 UTC (rev 27346)
+++ scummvm/branches/branch-0-10-0/gui/options.cpp	2007-06-11 08:04:11 UTC (rev 27347)
@@ -675,18 +675,10 @@
 	//
 	tab->addTab("Audio");
 	addAudioControls(tab, "globaloptions_");
-
-	int volControlPos = g_gui.evaluator()->getVar("volumeControlsInAudio", true);
-
-	if (volControlPos)
-		addVolumeControls(tab, "globaloptions_");
-
 	addSubtitleControls(tab, "globaloptions_");
 
-	if (!volControlPos) {
-		tab->addTab("Volume");
-		addVolumeControls(tab, "globaloptions_");
-	}
+	tab->addTab("Volume");
+	addVolumeControls(tab, "globaloptions_");
 
 	// TODO: cd drive setting
 

Modified: scummvm/branches/branch-0-10-0/gui/theme-config.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/gui/theme-config.cpp	2007-06-11 08:00:35 UTC (rev 27346)
+++ scummvm/branches/branch-0-10-0/gui/theme-config.cpp	2007-06-11 08:04:11 UTC (rev 27347)
@@ -193,9 +193,12 @@
 "# audio tab\n"
 "opYoffset=vBorder\n"
 "useWithPrefix=audioControls globaloptions_\n"
-"useWithPrefix=volumeControls globaloptions_\n"
 "useWithPrefix=subtitleControls globaloptions_\n"
 "\n"
+"# volume tab\n"
+"opYoffset=vBorder\n"
+"useWithPrefix=volumeControls globaloptions_\n"
+"\n"
 "# MIDI tab\n"
 "opYoffset=vBorder\n"
 "useWithPrefix=midiControls globaloptions_\n"
@@ -274,9 +277,14 @@
 "gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight\n"
 "opYoffset=(opYoffset + buttonHeight)\n"
 "useWithPrefix=audioControls gameoptions_\n"
-"useWithPrefix=volumeControls gameoptions_\n"
 "useWithPrefix=subtitleControls gameoptions_\n"
 "\n"
+"# volume tab\n"
+"opYoffset=vBorder\n"
+"gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 190) buttonHeight\n"
+"opYoffset=(opYoffset + buttonHeight)\n"
+"useWithPrefix=volumeControls gameoptions_\n"
+"\n"
 "# midi tab\n"
 "opYoffset=vBorder\n"
 "gameoptions_midiCheckbox=gox opYoffset (kFontHeight + 10 + 174) buttonHeight\n"
@@ -480,7 +488,6 @@
 "def_insetH=(h - 13 - insetY)\n"
 "def_launcherVersionX=50\n"
 "def_launcherVersionY=5\n"
-"def_volumeControlsInAudio=false\n"
 "def_midiControlsSpacing=2\n"
 "def_gameOptionsOverrideVPad=10\n"
 "def_aboutXOff=3\n"
@@ -488,32 +495,6 @@
 "def_aboutOuterBorder=10\n"
 "\n"
 "use=XxY\n"
-"\n"
-"# Override audio tab\n"
-"set_parent=gameoptions\n"
-"vBorder=5\n"
-"\n"
-"# audio tab\n"
-"opYoffset=vBorder\n"
-"useWithPrefix=audioControls globaloptions_\n"
-"useWithPrefix=subtitleControls globaloptions_\n"
-"\n"
-"# volume tab\n"
-"opYoffset=vBorder\n"
-"useWithPrefix=volumeControls globaloptions_\n"
-"\n"
-"# audio tab\n"
-"opYoffset=vBorder\n"
-"gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight\n"
-"opYoffset=(opYoffset + buttonHeight + 6)\n"
-"useWithPrefix=audioControls gameoptions_\n"
-"useWithPrefix=subtitleControls gameoptions_\n"
-"\n"
-"# volume tab\n"
-"opYoffset=vBorder\n"
-"gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 190) buttonHeight\n"
-"opYoffset=(opYoffset + buttonHeight + 6)\n"
-"useWithPrefix=volumeControls gameoptions_\n"
 "";
 
 using Common::String;

Modified: scummvm/branches/branch-0-10-0/gui/theme.h
===================================================================
--- scummvm/branches/branch-0-10-0/gui/theme.h	2007-06-11 08:00:35 UTC (rev 27346)
+++ scummvm/branches/branch-0-10-0/gui/theme.h	2007-06-11 08:04:11 UTC (rev 27347)
@@ -35,7 +35,7 @@
 #include "graphics/surface.h"
 #include "graphics/fontman.h"
 
-#define THEME_VERSION 21
+#define THEME_VERSION 22
 
 namespace GUI {
 

Modified: scummvm/branches/branch-0-10-0/gui/themes/classic080.ini
===================================================================
--- scummvm/branches/branch-0-10-0/gui/themes/classic080.ini	2007-06-11 08:00:35 UTC (rev 27346)
+++ scummvm/branches/branch-0-10-0/gui/themes/classic080.ini	2007-06-11 08:04:11 UTC (rev 27347)
@@ -1,7 +1,7 @@
 # $URL$
 # $Id$
 [theme]
-version=21
+version=22
 type=classic
 name=Classic (ScummVM 0.8.0)
 
@@ -112,9 +112,12 @@
 # audio tab
 opYoffset=vBorder
 useWithPrefix=audioControls globaloptions_
-useWithPrefix=volumeControls globaloptions_
 useWithPrefix=subtitleControls globaloptions_
 
+# volume tab
+opYoffset=vBorder
+useWithPrefix=volumeControls globaloptions_
+
 # MIDI tab
 opYoffset=vBorder
 useWithPrefix=midiControls globaloptions_
@@ -193,9 +196,14 @@
 gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
 opYoffset=(opYoffset + buttonHeight)
 useWithPrefix=audioControls gameoptions_
-useWithPrefix=volumeControls gameoptions_
 useWithPrefix=subtitleControls gameoptions_
 
+# volume tab
+opYoffset=vBorder
+gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 190) buttonHeight
+opYoffset=(opYoffset + buttonHeight)
+useWithPrefix=volumeControls gameoptions_
+
 # midi tab
 opYoffset=vBorder
 gameoptions_midiCheckbox=gox opYoffset (kFontHeight + 10 + 174) buttonHeight
@@ -430,7 +438,6 @@
 scummsaveload_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
 scummsaveload_choose=(prev.x2 + 10) prev.y prev.w prev.h
 scummsaveload_extinfo.visible=false
-def_volumeControlsInAudio=false
 
 # MM NES resolution
 [256x240]
@@ -446,7 +453,6 @@
 def_insetH=(h - 13 - insetY)
 def_launcherVersionX=50
 def_launcherVersionY=5
-def_volumeControlsInAudio=false
 def_midiControlsSpacing=2
 def_gameOptionsOverrideVPad=10
 def_aboutXOff=3
@@ -454,30 +460,3 @@
 def_aboutOuterBorder=10
 
 use=XxY
-
-# Override audio tab
-set_parent=gameoptions
-vBorder=5
-
-# audio tab
-opYoffset=vBorder
-useWithPrefix=audioControls globaloptions_
-useWithPrefix=subtitleControls globaloptions_
-
-# volume tab
-opYoffset=vBorder
-useWithPrefix=volumeControls globaloptions_
-
-# audio tab
-opYoffset=vBorder
-gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
-opYoffset=(opYoffset + buttonHeight + 6)
-useWithPrefix=audioControls gameoptions_
-useWithPrefix=subtitleControls gameoptions_
-
-# volume tab
-opYoffset=vBorder
-gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 190) buttonHeight
-opYoffset=(opYoffset + buttonHeight + 6)
-useWithPrefix=volumeControls gameoptions_
-


Property changes on: scummvm/branches/branch-0-10-0/gui/themes/classic080.ini
___________________________________________________________________
Name: svn:keywords
   + Date Rev Author URL Id

Modified: scummvm/branches/branch-0-10-0/gui/themes/modern.ini
===================================================================
--- scummvm/branches/branch-0-10-0/gui/themes/modern.ini	2007-06-11 08:00:35 UTC (rev 27346)
+++ scummvm/branches/branch-0-10-0/gui/themes/modern.ini	2007-06-11 08:04:11 UTC (rev 27347)
@@ -1,7 +1,7 @@
 # $URL$
 # $Id$
 [theme]
-version=21
+version=22
 type=modern
 name=Modern Style
 
@@ -223,7 +223,7 @@
 Console.rightPadding=5
 Console.topPadding=5
 Console.bottomPadding=5
-TabWidget.tabWidth=85
+TabWidget.tabWidth=75
 TabWidget.tabHeight=27
 TabWidget.titleVPad=8
 TabWidget.navButtonRightPad=3
@@ -278,9 +278,12 @@
 # audio tab
 opYoffset=vBorder
 useWithPrefix=audioControls globaloptions_
-useWithPrefix=volumeControls globaloptions_
 useWithPrefix=subtitleControls globaloptions_
 
+# volume tab
+opYoffset=vBorder
+useWithPrefix=volumeControls globaloptions_
+
 # MIDI tab
 opYoffset=vBorder
 useWithPrefix=midiControls globaloptions_
@@ -359,9 +362,14 @@
 gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
 opYoffset=(opYoffset + buttonHeight + 6)
 useWithPrefix=audioControls gameoptions_
-useWithPrefix=volumeControls gameoptions_
 useWithPrefix=subtitleControls gameoptions_
 
+# volume tab
+opYoffset=vBorder
+gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
+opYoffset=(opYoffset + buttonHeight + 6)
+useWithPrefix=volumeControls gameoptions_
+
 # midi tab
 opYoffset=vBorder
 gameoptions_midiCheckbox=gox opYoffset (kFontHeight + 10 + 174) buttonHeight
@@ -566,7 +574,6 @@
 pix_checkbox_empty="checkbox_empty320.bmp"
 pix_checkbox_checked="checkbox_checked320.bmp"
 pix_cursor_image="cursor320.bmp"
-def_volumeControlsInAudio=false
 
 # NES resoltuion
 [256x240]
@@ -582,7 +589,6 @@
 def_insetH=(h - 13 - insetY)
 def_launcherVersionX=50
 def_launcherVersionY=5
-def_volumeControlsInAudio=false
 def_midiControlsSpacing=2
 def_gameOptionsOverrideVPad=10
 def_aboutXOff=3
@@ -602,29 +608,3 @@
 
 # Override extras
 inactive_dialog_shading=kShadingNone
-
-# Override audio tab
-set_parent=gameoptions
-vBorder=10
-
-# audio tab
-opYoffset=vBorder
-useWithPrefix=audioControls globaloptions_
-useWithPrefix=subtitleControls globaloptions_
-
-# volume tab
-opYoffset=vBorder
-useWithPrefix=volumeControls globaloptions_
-
-# audio tab
-opYoffset=vBorder
-gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
-opYoffset=(opYoffset + buttonHeight + 6)
-useWithPrefix=audioControls gameoptions_
-useWithPrefix=subtitleControls gameoptions_
-
-# volume tab
-opYoffset=vBorder
-gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
-opYoffset=(opYoffset + buttonHeight + 6)
-useWithPrefix=volumeControls gameoptions_


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