Menu
▾
▴
[Desmume-cvs] desmume/src/windows AboutBox.c, NONE, 1.1 AboutBox.h, NONE, 1.1 DeSmuME.vcproj, 1.25, 1.26 main.c, 1.56, 1.57 resource.h, 1.22, 1.23 resources.rc, 1.30, 1.31
|
From: shash <sha...@us...> - 2008-03-03 00:11:41
|
Update of /cvsroot/desmume/desmume/src/windows In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv27109 Modified Files: DeSmuME.vcproj main.c resource.h resources.rc Added Files: AboutBox.c AboutBox.h Log Message: - Added an about box with the author list Index: DeSmuME.vcproj =================================================================== RCS file: /cvsroot/desmume/desmume/src/windows/DeSmuME.vcproj,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- DeSmuME.vcproj 12 Nov 2007 00:41:51 -0000 1.25 +++ DeSmuME.vcproj 3 Mar 2008 00:11:34 -0000 1.26 @@ -115,6 +115,9 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> <File + RelativePath=".\AboutBox.c"> + </File> + <File RelativePath="..\arm_instructions.c"> </File> <File @@ -234,6 +237,9 @@ Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> <File + RelativePath=".\AboutBox.h"> + </File> + <File RelativePath="..\ARM9.h"> </File> <File --- NEW FILE: AboutBox.h --- /* Copyright (C) 2008 shash This file is part of DeSmuME DeSmuME is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. DeSmuME is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with DeSmuME; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef ABOUTBOX_H #define ABOUTBOX_H BOOL CALLBACK AboutBox_Proc(HWND dialog,UINT komunikat,WPARAM wparam,LPARAM lparam); #endif Index: main.c =================================================================== RCS file: /cvsroot/desmume/desmume/src/windows/main.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- main.c 19 Nov 2007 09:22:45 -0000 1.56 +++ main.c 3 Mar 2008 00:11:34 -0000 1.57 @@ -48,6 +48,7 @@ #include "lightview.h" #include "ConfigKeys.h" #include "FirmConfig.h" +#include "AboutBox.h" #include "OGLRender.h" #include "../render3D.h" #include "../gdbstub.h" @@ -1575,6 +1576,16 @@ case IDM_FORUM: ShellExecute(NULL, "open", "http://forums.desmume.org/index.php", NULL, NULL, SW_SHOWNORMAL); return 0; + + case IDM_ABOUT: + { + cwindow_struct aboutBox; + + if (CWindow_Init2(&aboutBox, hAppInst, HWND_DESKTOP, "About desmume...", IDD_ABOUT_BOX, AboutBox_Proc) == 0) + CWindow_Show(&aboutBox); + + break; + } case IDM_SUBMITBUGREPORT: ShellExecute(NULL, "open", "http://sourceforge.net/tracker/?func=add&group_id=164579&atid=832291", NULL, NULL, SW_SHOWNORMAL); return 0; Index: resources.rc =================================================================== RCS file: /cvsroot/desmume/desmume/src/windows/resources.rc,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- resources.rc 28 Oct 2007 17:33:28 -0000 1.30 +++ resources.rc 3 Mar 2008 00:11:34 -0000 1.31 @@ -1,5 +1,7 @@ // Microsoft Visual C++ generated resource script. // +#include "resrc1.h" + #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // @@ -56,7 +58,7 @@ ///////////////////////////////////////////////////////////////////////////// -// Danish resources +// Danés resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DAN) #ifdef _WIN32 @@ -532,12 +534,12 @@ WS_GROUP END -#endif // Danish resources +#endif // Danés resources ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// -// German (Germany) resources +// Alemán (Alemania) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) #ifdef _WIN32 @@ -643,12 +645,12 @@ END #endif // APSTUDIO_INVOKED -#endif // German (Germany) resources +#endif // Alemán (Alemania) resources ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources +// Inglés (Estados Unidos) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 @@ -793,6 +795,7 @@ MENUITEM "&Website", IDM_WEBSITE MENUITEM "&Forums", IDM_FORUM MENUITEM "&Submit a bug report", IDM_SUBMITBUGREPORT + MENUITEM "&About", IDM_ABOUT END END @@ -1270,6 +1273,16 @@ ES_AUTOHSCROLL | ES_READONLY END +IDD_ABOUT_BOX DIALOGEX 0, 0, 126, 246 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU +CAPTION "About desmume..." +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Aceptar",IDC_FERMER,38,225,50,14 + CTEXT "",IDC_AUTHORS_LIST,7,7,112,216,0,WS_EX_CLIENTEDGE +END + ///////////////////////////////////////////////////////////////////////////// // @@ -1286,15 +1299,23 @@ TOPMARGIN, 7 BOTTOMMARGIN, 170 END + + IDD_ABOUT_BOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 119 + TOPMARGIN, 7 + BOTTOMMARGIN, 239 + END END #endif // APSTUDIO_INVOKED -#endif // English (U.S.) resources +#endif // Inglés (Estados Unidos) resources ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// -// French (France) resources +// Francés (Francia) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA) #ifdef _WIN32 @@ -1671,7 +1692,7 @@ PUSHBUTTON "&Fermer",IDC_FERMER,50,134,50,14 END -#endif // French (France) resources +#endif // Francés (Francia) resources ///////////////////////////////////////////////////////////////////////////// Index: resource.h =================================================================== RCS file: /cvsroot/desmume/desmume/src/windows/resource.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- resource.h 28 Oct 2007 17:01:41 -0000 1.22 +++ resource.h 3 Mar 2008 00:11:34 -0000 1.23 @@ -243,6 +243,9 @@ #define IDC_EDIT1 1102 #define IDC_EDIT2 1103 +#define IDD_ABOUT_BOX 1301 +#define IDM_ABOUT 40003 +#define IDC_AUTHORS_LIST 1302 // ============================================================================ // Matrix Viewer ID's (1200 to 1299) --- NEW FILE: AboutBox.c --- /* Copyright (C) 2008 shash This file is part of DeSmuME DeSmuME is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. DeSmuME is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with DeSmuME; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <stdio.h> #include <stdlib.h> #include <windows.h> #include <mmsystem.h> #include <COMMDLG.H> #include <string.h> #include "CWindow.h" #include "AboutBox.h" #include "resource.h" BOOL CALLBACK AboutBox_Proc (HWND dialog, UINT message,WPARAM wparam,LPARAM lparam) { switch(message) { case WM_INITDIALOG: { SetDlgItemText(dialog, IDC_AUTHORS_LIST, "Original author\n---------------\nyopyop\n\nCurrent team\n------------\nAllustar\namponzi\nape\ndelfare\nGuillaume Duhamel\nNormmatt\nRomain Vallet\nshash\nTheo Berkau\nthoduv\nTim Seidel (Mighty Max)\nDamien Nozay (damdoum)\nPascal Giard (evilynux)\nBen Jaques (masscat)\nJeff Bland\n\nContributors\n------------\nAnthony Molinaro\nsnkmad"); break; } case WM_COMMAND: { if((HIWORD(wparam) == BN_CLICKED)&&(((int)LOWORD(wparam)) == IDC_FERMER)) { EndDialog(dialog,0); return 1; } break; } } return 0; } |