revised options dialog

svn-id: r5130

1 files changed, 20 insertions, 38 deletions

diff --git a/scumm/dialogs.h b/scumm/dialogs.h
index f6f925b988..8f3f752148 100644
--- a/scumm/dialogs.h
+++ b/scumm/dialogs.h
@@ -67,50 +67,14 @@ public:
 class OptionsDialog : public ScummDialog {
 protected:
 	Dialog		*_aboutDialog;
-	Dialog		*_soundDialog;
+#ifdef _WIN32_WCE
 	Dialog		*_keysDialog;
-	Dialog		*_miscDialog;
+#endif
 
 public:
 	OptionsDialog(NewGui *gui, Scumm *scumm);
 	~OptionsDialog();
 
-	virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
-};
-
-class PauseDialog : public ScummDialog {
-public:
-	PauseDialog(NewGui *gui, Scumm *scumm);
-
-	virtual void handleMouseDown(int x, int y, int button, int clickCount)
-		{ close(); }
-	virtual void handleKeyDown(char key, int modifiers)
-		{
-			if (key == 32)
-				close();
-			else
-				Dialog::handleKeyDown(key, modifiers);
-		}
-
-	// Enforce no transparency!
-	virtual void	setupScreenBuf() {}
-	virtual void	teardownScreenBuf() {}
-
-};
-
-
-class SoundDialog : public ScummDialog {
-public:
-	SoundDialog(NewGui *gui, Scumm *scumm);
-
-	enum {
-		kMasterVolumeChanged	= 'mavc',
-		kMusicVolumeChanged		= 'muvc',
-		kSfxVolumeChanged		= 'sfvc',
-		kOKCmd					= 'ok  ',
-		kCancelCmd				= 'cncl',
-	};
-
 	virtual void open();
 
 	virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
@@ -128,6 +92,24 @@ protected:
 	StaticTextWidget *masterVolumeLabel;
 	StaticTextWidget *musicVolumeLabel;
 	StaticTextWidget *sfxVolumeLabel;
+	
+	CheckboxWidget *subtitlesCheckbox;
+	CheckboxWidget *amigaPalCheckbox;
+};
+
+class PauseDialog : public ScummDialog {
+public:
+	PauseDialog(NewGui *gui, Scumm *scumm);
+
+	virtual void handleMouseDown(int x, int y, int button, int clickCount)
+		{ close(); }
+	virtual void handleKeyDown(char key, int modifiers)
+		{
+			if (key == ' ')  // Close pause dialog if space key is pressed
+				close();
+			else
+				ScummDialog::handleKeyDown(key, modifiers);
+		}
 };