From b8379a99bcb39926e44b2d52d11389f4ff712319 Mon Sep 17 00:00:00 2001 From: spacy51 Date: Tue, 29 Jan 2008 13:11:02 +0000 Subject: [PATCH] ADDED compile date to about box REDESIGNED about box a little --- src/win32/AboutDialog.cpp | 16 +++++------ src/win32/AboutDialog.h | 59 +++++++++++---------------------------- src/win32/VBA.rc | 56 +++++++++++++++++++++++++++++-------- src/win32/resource.h | 2 ++ 4 files changed, 71 insertions(+), 62 deletions(-) diff --git a/src/win32/AboutDialog.cpp b/src/win32/AboutDialog.cpp index d741f16b..c1e7349f 100644 --- a/src/win32/AboutDialog.cpp +++ b/src/win32/AboutDialog.cpp @@ -36,19 +36,19 @@ static char THIS_FILE[] = __FILE__; AboutDialog::AboutDialog(CWnd* pParent /*=NULL*/) : CDialog(AboutDialog::IDD, pParent) { - //{{AFX_DATA_INIT(AboutDialog) - m_version = _T(VERSION); - //}}AFX_DATA_INIT + m_version = _T(VERSION); + m_date = _T(__DATE__); } void AboutDialog::DoDataExchange(CDataExchange* pDX) { - CDialog::DoDataExchange(pDX); - //{{AFX_DATA_MAP(AboutDialog) - DDX_Text(pDX, IDC_VERSION, m_version); - DDX_Control(pDX, IDC_URL, m_link); - //}}AFX_DATA_MAP + CDialog::DoDataExchange(pDX); + //{{AFX_DATA_MAP(AboutDialog) + DDX_Text(pDX, IDC_VERSION, m_version); + DDX_Control(pDX, IDC_URL, m_link); + //}}AFX_DATA_MAP + DDX_Text(pDX, IDC_DATE, m_date); } diff --git a/src/win32/AboutDialog.h b/src/win32/AboutDialog.h index aacc74d8..c262b100 100644 --- a/src/win32/AboutDialog.h +++ b/src/win32/AboutDialog.h @@ -2,6 +2,8 @@ // VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator. // Copyright (C) 1999-2003 Forgotten // Copyright (C) 2004 Forgotten and the VBA development team +// Copyright (C) 2008 VBA-M development team + // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -17,56 +19,27 @@ // along with this program; if not, write to the Free Software Foundation, // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#if !defined(AFX_ABOUTDIALOG_H__48D787B2_0699_4F03_827D_404EC70DDDB2__INCLUDED_) -#define AFX_ABOUTDIALOG_H__48D787B2_0699_4F03_827D_404EC70DDDB2__INCLUDED_ - -#if _MSC_VER > 1000 #pragma once -#endif // _MSC_VER > 1000 -// AboutDialog.h : header file -// + #include "stdafx.h" #include "Hyperlink.h" #include "resource.h" -///////////////////////////////////////////////////////////////////////////// -// AboutDialog dialog class AboutDialog : public CDialog { - Hyperlink m_link; - Hyperlink m_translator; - // Construction - public: - AboutDialog(CWnd* pParent = NULL); // standard constructor +public: + AboutDialog(CWnd* pParent = NULL); + enum { IDD = IDD_ABOUT }; - // Dialog Data - //{{AFX_DATA(AboutDialog) - enum { IDD = IDD_ABOUT }; - CString m_version; - //}}AFX_DATA +protected: + virtual void DoDataExchange(CDataExchange* pDX); + virtual BOOL OnInitDialog(); + DECLARE_MESSAGE_MAP() - - // Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(AboutDialog) - protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - //}}AFX_VIRTUAL - - // Implementation - protected: - - // Generated message map functions - //{{AFX_MSG(AboutDialog) - virtual BOOL OnInitDialog(); - //}}AFX_MSG - - - DECLARE_MESSAGE_MAP() - }; - - //{{AFX_INSERT_LOCATION}} - // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_ABOUTDIALOG_H__48D787B2_0699_4F03_827D_404EC70DDDB2__INCLUDED_) +private: + Hyperlink m_link; + Hyperlink m_translator; + CString m_version; + CString m_date; +}; diff --git a/src/win32/VBA.rc b/src/win32/VBA.rc index 7af434fd..152b2bbc 100644 --- a/src/win32/VBA.rc +++ b/src/win32/VBA.rc @@ -12,6 +12,37 @@ ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// German (Germany) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) +#ifdef _WIN32 +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.\0" +END + + +3 TEXTINCLUDE +BEGIN + "\r\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // German (Germany) resources +///////////////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources @@ -183,21 +214,24 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,90,102,50,14,WS_GROUP END -IDD_ABOUT DIALOGEX 0, 0, 179, 143 +IDD_ABOUT DIALOGEX 0, 0, 179, 153 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_TOOLWINDOW CAPTION "About" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - ICON IDI_MAINICON,IDC_STATIC,6,6,16,16 - CTEXT "VisualBoyAdvance Emulator",IDC_STATIC,34,7,120,8 - CTEXT "Copyright © 2008 VBA development team",IDC_STATIC,16,36,144,8 - CTEXT "https://vbam.bountysource.com",IDC_URL,6,126,165,8 - CTEXT "Contributions by Costis and original VBA Team",IDC_STATIC,7,49,165,8 - CTEXT "Version",IDC_STATIC,47,17,27,8 - CTEXT "",IDC_VERSION,80,18,60,8,SS_NOPREFIX - GROUPBOX "VBA Development Team",IDC_STATIC,7,61,165,59 - LTEXT "mudlord\nNach\nJonas Quinn\nDJRobX\nSpacy",IDC_STATIC,15,70,143,44 + ICON IDI_MAINICON,IDC_STATIC,6,6,21,20 + CTEXT "VisualBoyAdvance Emulator",IDC_STATIC,36,6,138,8 + CTEXT "Copyright © 2008 VBA-M development team",IDC_STATIC,6,48,168,8 + CTEXT "https://vbam.bountysource.com",IDC_URL,6,138,168,8 + RTEXT "Version:",IDC_STATIC,36,18,54,8 + LTEXT "",IDC_VERSION,96,18,78,8,SS_NOPREFIX + GROUPBOX "VBA-M dev team:",IDC_STATIC,6,72,90,60 + CTEXT "mudlord\nNach\nJonas Quinn\nDJRobX\nSpacy",IDC_STATIC,12,84,78,42 + RTEXT "Date compiled:",IDC_STATIC,36,30,54,8 + LTEXT "",IDC_DATE,96,30,78,8,SS_NOPREFIX + GROUPBOX "Thanks go to:",IDC_STATIC,102,72,72,60 + CTEXT "Orig. VBA team\nCostis",IDC_STATIC,108,84,60,42 END IDD_DIRECTORIES DIALOGEX 0, 0, 222, 270 @@ -1173,7 +1207,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 172 TOPMARGIN, 7 - BOTTOMMARGIN, 136 + BOTTOMMARGIN, 146 END IDD_DIRECTORIES, DIALOG diff --git a/src/win32/resource.h b/src/win32/resource.h index f44a5062..f4d1bd06 100644 --- a/src/win32/resource.h +++ b/src/win32/resource.h @@ -459,6 +459,8 @@ #define IDC_PORT 1217 #define IDC_VSCROLL 1218 #define IDC_VERSION 1219 +#define IDC_VERSION2 1220 +#define IDC_DATE 1220 #define IDC_VERBOSE_SWI 1223 #define IDC_VERBOSE_UNALIGNED_ACCESS 1224 #define IDC_VERBOSE_ILLEGAL_WRITE 1225