[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.62,1.63 dialogs.h,1.19,1.20

Max Horn fingolfin at users.sourceforge.net
Tue Jul 22 09:07:22 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv17913/scumm

Modified Files:
	dialogs.cpp dialogs.h 
Log Message:
made about dialog global (so that it can be used from the launcher and from sky/simon; also added our copyright to it

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- dialogs.cpp	15 Jul 2003 21:30:53 -0000	1.62
+++ dialogs.cpp	22 Jul 2003 16:05:51 -0000	1.63
@@ -258,7 +258,7 @@
 	//
 	// Create the sub dialog(s)
 	//
-	_aboutDialog = new AboutDialog(gui, scumm);
+	_aboutDialog = new AboutDialog(gui);
 #ifndef DISABLE_HELP
 	_helpDialog = new HelpDialog(gui, scumm);
 #endif
@@ -575,20 +575,6 @@
 	default:
 		ScummDialog::handleCommand(sender, cmd, data);
 	}
-}
-
-#pragma mark -
-
-AboutDialog::AboutDialog(NewGui *gui, Scumm *scumm)
-	: ScummDialog(gui, scumm, 30, 20, 260, 124) {
-	addButton((_w - kButtonWidth)/2, 100, queryCustomString(23), kCloseCmd, 'C');	// Close dialog - FIXME
-	new StaticTextWidget(this, 10, 10, 240, 16, gScummVMFullVersion, kTextAlignCenter);
-//	new StaticTextWidget(this, 10, 20, 240, 16, "(built on " __DATE__ ")", kTextAlignCenter);
-
-	new StaticTextWidget(this, 10, 30, 240, 16, "http://www.scummvm.org", kTextAlignCenter);
-	new StaticTextWidget(this, 10, 50, 240, 16, "SCUMM Games (c) LucasArts", kTextAlignCenter);
-	new StaticTextWidget(this, 10, 64, 240, 16, "Simon the Sorcerer (c) Adventuresoft", kTextAlignCenter);
-	new StaticTextWidget(this, 10, 78, 240, 16, "Beneath a Steel Sky (c) Revolution", kTextAlignCenter);
 }
 
 #ifndef DISABLE_HELP

Index: dialogs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- dialogs.h	7 Jul 2003 22:33:07 -0000	1.19
+++ dialogs.h	22 Jul 2003 16:05:51 -0000	1.20
@@ -22,6 +22,7 @@
 #define SCUMM_DIALOGS_H
 
 #include "common/str.h"
+#include "gui/about.h"
 #include "gui/dialog.h"
 
 #ifndef DISABLE_HELP
@@ -77,11 +78,6 @@
 	void load();
 	void switchToSaveMode();
 	void switchToLoadMode();
-};
-
-class AboutDialog : public ScummDialog {
-public:
-	AboutDialog(NewGui *gui, Scumm *scumm);
 };
 
 #ifndef DISABLE_HELP





More information about the Scummvm-git-logs mailing list