actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

make dialogs localizable

Browse Source 
adjust control to fit longer text
This commit is contained in:
Chris Danford
2006-02-07 04:38:51 +00:00
parent f904f05fcc
commit b46e53e27b
6 changed files with 87 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/StepMania-net2003.vcproj
+9
View File
@@ -1602,6 +1602,12 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
<File <File
RelativePath=".\archutils\Win32\DebugInfoHunt.h"> RelativePath=".\archutils\Win32\DebugInfoHunt.h">
</File> </File>
<File
RelativePath=".\archutils\Win32\DialogUtil.cpp">
</File>
<File
RelativePath=".\archutils\Win32\DialogUtil.h">
</File>
<File <File
RelativePath="archutils\Win32\GetFileInformation.cpp"> RelativePath="archutils\Win32\GetFileInformation.cpp">
</File> </File>
@@ -3021,6 +3027,9 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
<File <File
RelativePath="archutils\Win32\DialogErrorHeader.bmp"> RelativePath="archutils\Win32\DialogErrorHeader.bmp">
</File> </File>
<File
RelativePath=".\archutils\Win32\header.bmp">
</File>
<File <File
RelativePath="StepMania.xpm"> RelativePath="StepMania.xpm">
</File> </File>
stepmania/src/arch/Dialog/DialogDriver_Win32.cpp
+8
View File
@@ -14,6 +14,7 @@
#include "archutils/win32/WindowsResources.h" #include "archutils/win32/WindowsResources.h"
#include "archutils/win32/GraphicsWindow.h" #include "archutils/win32/GraphicsWindow.h"
#endif #endif
#include "archutils/win32/DialogUtil.h"
static bool g_bHush; static bool g_bHush;
static RString g_sMessage; static RString g_sMessage;
@@ -29,6 +30,8 @@ static BOOL CALLBACK OKWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara
// Disable the parent window, like a modal MessageBox does. // Disable the parent window, like a modal MessageBox does.
EnableWindow( GetParent(hWnd), FALSE ); EnableWindow( GetParent(hWnd), FALSE );
DialogUtil::LocalizeDialogAndContents( hWnd );
// Hide or display "Don't show this message." // Hide or display "Don't show this message."
g_bHush = false; g_bHush = false;
HWND hHushButton = GetDlgItem( hWnd, IDC_HUSH ); HWND hHushButton = GetDlgItem( hWnd, IDC_HUSH );
@@ -118,6 +121,9 @@ static BOOL CALLBACK ErrorWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lP
RString sMessage = g_sErrorString; RString sMessage = g_sErrorString;
sMessage.Replace( "\n", "\r\n" ); sMessage.Replace( "\n", "\r\n" );
SetWindowText( GetDlgItem(hWnd, IDC_EDIT_ERROR), sMessage ); SetWindowText( GetDlgItem(hWnd, IDC_EDIT_ERROR), sMessage );
DialogUtil::LocalizeDialogAndContents( hWnd );
DialogUtil::SetHeaderFont( hWnd, IDC_STATIC_HEADER_TEXT );
} }
break; break;
case WM_COMMAND: case WM_COMMAND:
@@ -171,6 +177,8 @@ void DialogDriver_Win32::Error( RString sError, RString sID )
// throw up a pretty error dialog // throw up a pretty error dialog
AppInstance handle; AppInstance handle;
DialogBox( handle.Get(), MAKEINTRESOURCE(IDD_ERROR_DIALOG), NULL, ErrorWndProc ); DialogBox( handle.Get(), MAKEINTRESOURCE(IDD_ERROR_DIALOG), NULL, ErrorWndProc );
#else
::MessageBox( ::GetHwnd(), ConvertUTF8ToACP(sError).c_str(), ConvertUTF8ToACP(::GetWindowTitle()).c_str(), MB_OK );
#endif #endif
} }
stepmania/src/archutils/Win32/Crash.cpp
+5 -1
View File
@@ -12,7 +12,7 @@
#include "archutils/Win32/WindowsResources.h" #include "archutils/Win32/WindowsResources.h"
#include "crash.h" #include "crash.h"
#include "ProductInfo.h" #include "ProductInfo.h"
#include "archutils/win32/DialogUtil.h"
#include "RageLog.h" /* for RageLog::GetAdditionalLog and Flush */ #include "RageLog.h" /* for RageLog::GetAdditionalLog and Flush */
#include "RageThreads.h" /* for GetCheckpointLogs */ #include "RageThreads.h" /* for GetCheckpointLogs */
#include "PrefsManager.h" /* for g_bAutoRestart */ #include "PrefsManager.h" /* for g_bAutoRestart */
@@ -877,7 +877,11 @@ BOOL APIENTRY CrashDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
HWND hwndReason = GetDlgItem(hDlg, IDC_STATIC_BOMBREASON); HWND hwndReason = GetDlgItem(hDlg, IDC_STATIC_BOMBREASON);
if (hFontMono) if (hFontMono)
{
SendMessage(hwndList, WM_SETFONT, (WPARAM)hFontMono, MAKELPARAM(TRUE, 0)); SendMessage(hwndList, WM_SETFONT, (WPARAM)hFontMono, MAKELPARAM(TRUE, 0));
SendMessage(hwndReason, WM_SETFONT, (WPARAM)hFontMono, MAKELPARAM(TRUE, 0));
}
DialogUtil::SetHeaderFont( hDlg, IDC_STATIC_HEADER_TEXT );
ReportReason( hwndReason, NULL, &g_CrashInfo ); ReportReason( hwndReason, NULL, &g_CrashInfo );
s_bHaveCallstack = ReportCallStack( hwndList, NULL, g_CrashInfo.m_BacktracePointers ); s_bHaveCallstack = ReportCallStack( hwndList, NULL, g_CrashInfo.m_BacktracePointers );
stepmania/src/archutils/Win32/DialogUtil.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ void DialogUtil::LocalizeDialogAndContents( HWND hdlg )
{ {
::GetWindowText( hdlg, szTemp, ARRAYSIZE(szTemp) ); ::GetWindowText( hdlg, szTemp, ARRAYSIZE(szTemp) );
RString s = szTemp; RString s = szTemp;
sGroup = "Tools-"+s; sGroup = "Dialog-"+s;
s = THEME->GetString( sGroup, s ); s = THEME->GetString( sGroup, s );
::SetWindowText( hdlg, ConvertUTF8ToACP(s).c_str() ); ::SetWindowText( hdlg, ConvertUTF8ToACP(s).c_str() );
} }
stepmania/src/archutils/Win32/WindowsResources.h
+4 -3
View File
@@ -1,5 +1,5 @@
//{{NO_DEPENDENCIES}} //{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file. // Microsoft Visual C++ generated include file.
// Used by WindowsResources.rc // Used by WindowsResources.rc
// //
#define IDC_CRASH_SAVE 16 #define IDC_CRASH_SAVE 16
@@ -7,7 +7,6 @@
#define IDD_LOADING_DIALOG 116 #define IDD_LOADING_DIALOG 116
#define BITMAP_LOADING 117 #define BITMAP_LOADING 117
#define IDD_OK 118 #define IDD_OK 118
#define IDD_DRIVER 119
#define IDD_DISASM_CRASH 120 #define IDD_DISASM_CRASH 120
#define BITMAP_CRASH 121 #define BITMAP_CRASH 121
#define BITMAP_ERROR 129 #define BITMAP_ERROR 129
@@ -35,9 +34,11 @@
#define IDC_MESSAGE 1017 #define IDC_MESSAGE 1017
#define IDC_CHECK2 1019 #define IDC_CHECK2 1019
#define IDC_SPLASH 1020 #define IDC_SPLASH 1020
#define IDC_STATIC_HEADER_TEXT 1021
#define IDC_ASMBOX 1133 #define IDC_ASMBOX 1133
#define IDC_REGDUMP 1283 #define IDC_REGDUMP 1283
#define IDC_STATIC_BOMBREASON 1284 #define IDC_STATIC_BOMBREASON 1284
#define IDC_STATIC_BOMBREASON2 1285
#define IDC_CALL_STACK 1310 #define IDC_CALL_STACK 1310
#define IDM_EXIT 40003 #define IDM_EXIT 40003
@@ -47,7 +48,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 132 #define _APS_NEXT_RESOURCE_VALUE 132
#define _APS_NEXT_COMMAND_VALUE 40009 #define _APS_NEXT_COMMAND_VALUE 40009
#define _APS_NEXT_CONTROL_VALUE 1021 #define _APS_NEXT_CONTROL_VALUE 1022
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101
#endif #endif
#endif #endif
stepmania/src/archutils/Win32/WindowsResources.rc
+57 -79
View File
@@ -1,4 +1,4 @@
//Microsoft Developer Studio generated resource script. // Microsoft Visual C++ generated resource script.
// //
#include "WindowsResources.h" #include "WindowsResources.h"
@@ -26,24 +26,25 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// Dialog // Dialog
// //
IDD_ERROR_DIALOG DIALOG DISCARDABLE 0, 0, 332, 234 IDD_ERROR_DIALOG DIALOGEX 0, 0, 332, 234
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
CAPTION "Error" CAPTION "Fatal Error"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN BEGIN
DEFPUSHBUTTON "Close",IDOK,265,215,60,15 DEFPUSHBUTTON "Close",IDOK,265,215,60,15
EDITTEXT IDC_EDIT_ERROR,5,80,320,130,ES_MULTILINE | ES_READONLY | EDITTEXT IDC_EDIT_ERROR,5,59,320,151,ES_MULTILINE | ES_READONLY |
WS_VSCROLL | NOT WS_TABSTOP WS_VSCROLL | NOT WS_TABSTOP
PUSHBUTTON "View Log",IDC_BUTTON_VIEW_LOG,8,215,74,15 PUSHBUTTON "View Log",IDC_BUTTON_VIEW_LOG,8,215,74,15
PUSHBUTTON "Report the Error",IDC_BUTTON_REPORT,90,215,76,15 PUSHBUTTON "Report Error",IDC_BUTTON_REPORT,90,215,76,15
PUSHBUTTON "Restart Game",IDC_BUTTON_RESTART,175,215,80,15 PUSHBUTTON "Restart Game",IDC_BUTTON_RESTART,175,215,80,15
CONTROL 131,IDC_STATIC,"Static",SS_BITMAP,0,0,332,38 CONTROL 131,IDC_STATIC,"Static",SS_BITMAP,0,0,332,38
LTEXT "Sorry! A fatal error has occurred.\r\n\r\nSpecific details about the error may be shown in the box below:", LTEXT "Specific details about the error are shown in the box below:",
IDC_STATIC,7,46,298,28 IDC_STATIC,7,45,319,11
LTEXT "Fatal Error",IDC_STATIC_HEADER_TEXT,5,5,249,23
END END
IDD_LOADING_DIALOG DIALOG DISCARDABLE 0, 0, 312, 82 IDD_LOADING_DIALOG DIALOG 0, 0, 312, 82
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
BEGIN BEGIN
CTEXT "line1",IDC_STATIC_MESSAGE1,0,41,310,10,SS_NOPREFIX | CTEXT "line1",IDC_STATIC_MESSAGE1,0,41,310,10,SS_NOPREFIX |
@@ -55,53 +56,41 @@ BEGIN
CONTROL "",IDC_SPLASH,"Static",SS_BITMAP,0,0,310,25 CONTROL "",IDC_SPLASH,"Static",SS_BITMAP,0,0,310,25
END END
IDD_DISASM_CRASH DIALOG DISCARDABLE 0, 0, 399, 151 IDD_DISASM_CRASH DIALOGEX 0, 0, 332, 210
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
CAPTION "Error" CAPTION "Program Crash"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN BEGIN
CONTROL 131,IDC_STATIC,"Static",SS_BITMAP,1,0,332,38 CONTROL 131,IDC_STATIC,"Static",SS_BITMAP,0,0,332,38
CONTROL 131,IDC_STATIC,"Static",SS_BITMAP,66,0,332,38 PUSHBUTTON "&View Crash Info",IDC_CRASH_SAVE,29,169,94,15
PUSHBUTTON "&View crash dump",IDC_CRASH_SAVE,1,135,70,15 PUSHBUTTON "View &Log",IDC_VIEW_LOG,128,169,63,15
PUSHBUTTON "View &Log",IDC_VIEW_LOG,75,135,70,15 PUSHBUTTON "Report the &Error",IDC_BUTTON_REPORT,196,169,89,15
PUSHBUTTON "Report the &Error",IDC_BUTTON_REPORT,210,135,76,15 PUSHBUTTON "&Close",IDC_BUTTON_CLOSE,278,191,50,15
PUSHBUTTON "&Close",IDC_BUTTON_CLOSE,348,135,50,15 PUSHBUTTON "&Restart Game",IDC_BUTTON_RESTART,193,191,78,15
PUSHBUTTON "&Restart",IDC_BUTTON_RESTART,348,118,50,15 LISTBOX IDC_CALL_STACK,6,96,316,65,LBS_NOINTEGRALHEIGHT |
LISTBOX IDC_CALL_STACK,7,76,391,38,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP WS_VSCROLL | WS_TABSTOP
LTEXT "crash reason: programmer needs good whack on head", LTEXT "A crash has occurred. Diagnostic information has been saved to a file called ""crashinfo.txt"" in the game program directory.",
IDC_STATIC_BOMBREASON,8,120,219,8 IDC_STATIC,8,41,312,19
LTEXT "A fatal error has occurred. Diagnostic information has been saved to a file called ""crashinfo.txt"" in the game program directory. Hit ""View crash dump"" to view it. Please include this file in all bug reports.", LTEXT "Estimated call stack",IDC_STATIC,6,85,155,10
IDC_STATIC,8,41,382,19 LTEXT "Program Crash",IDC_STATIC_HEADER_TEXT,6,5,276,22
LTEXT "Estimated call stack",IDC_STATIC,7,64,64,8 LTEXT "Crash reason:",IDC_STATIC,7,64,219,8
CTEXT "crash reason here",IDC_STATIC_BOMBREASON,6,72,322,11
END END
IDD_OK DIALOG DISCARDABLE 0, 0, 318, 87 IDD_OK DIALOGEX 0, 0, 336, 98
STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP |
WS_CAPTION
CAPTION "Prompt" CAPTION "Prompt"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
DEFPUSHBUTTON "OK",IDOK,131,66,50,14 DEFPUSHBUTTON "OK",IDOK,143,77,50,14
CONTROL "&Don't display this message",IDC_HUSH,"Button", CONTROL "&Don't display this message again",IDC_HUSH,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,211,67,100,10 BS_AUTOCHECKBOX | WS_TABSTOP,7,63,181,10
EDITTEXT IDC_MESSAGE,7,7,304,55,ES_CENTER | ES_MULTILINE | EDITTEXT IDC_MESSAGE,7,7,322,55,ES_CENTER | ES_MULTILINE |
ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER |
WS_VSCROLL WS_VSCROLL
END END
IDD_DRIVER DIALOGEX 0, 0, 286, 125
STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION |
WS_SYSMENU
CAPTION "Outdated Drivers"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "Download new drivers",IDOK,37,104,82,14
PUSHBUTTON "Play anyway",IDCANCEL,125,104,50,14
CTEXT "Static",IDC_MESSAGE,7,34,272,29
CONTROL "&Don't display this message",IDC_HUSH,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,183,108,96,10
END
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
@@ -109,7 +98,7 @@ END
// //
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO MOVEABLE PURE GUIDELINES DESIGNINFO
BEGIN BEGIN
IDD_LOADING_DIALOG, DIALOG IDD_LOADING_DIALOG, DIALOG
BEGIN BEGIN
@@ -121,26 +110,18 @@ BEGIN
IDD_DISASM_CRASH, DIALOG IDD_DISASM_CRASH, DIALOG
BEGIN BEGIN
LEFTMARGIN, 1 RIGHTMARGIN, 328
RIGHTMARGIN, 398 VERTGUIDE, 6
VERTGUIDE, 286 BOTTOMMARGIN, 206
BOTTOMMARGIN, 150 HORZGUIDE, 169
END END
IDD_OK, DIALOG IDD_OK, DIALOG
BEGIN BEGIN
LEFTMARGIN, 7 LEFTMARGIN, 7
RIGHTMARGIN, 311 RIGHTMARGIN, 329
TOPMARGIN, 7 TOPMARGIN, 7
BOTTOMMARGIN, 80 BOTTOMMARGIN, 91
END
IDD_DRIVER, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 279
TOPMARGIN, 7
BOTTOMMARGIN, 118
END END
END END
#endif // APSTUDIO_INVOKED #endif // APSTUDIO_INVOKED
@@ -152,18 +133,18 @@ END
// TEXTINCLUDE // TEXTINCLUDE
// //
1 TEXTINCLUDE MOVEABLE PURE 1 TEXTINCLUDE
BEGIN BEGIN
"WindowsResources.h\0" "WindowsResources.h\0"
END END
2 TEXTINCLUDE MOVEABLE PURE 2 TEXTINCLUDE
BEGIN BEGIN
"#include ""afxres.h""\r\n" "#include ""afxres.h""\r\n"
"\0" "\0"
END END
3 TEXTINCLUDE MOVEABLE PURE 3 TEXTINCLUDE
BEGIN BEGIN
"\r\n" "\r\n"
"\0" "\0"
@@ -179,9 +160,8 @@ END
// Icon with lowest ID value placed first to ensure application icon // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems. // remains consistent on all systems.
IDI_ICON ICON DISCARDABLE "StepMania.ICO" IDI_ICON ICON "StepMania.ICO"
#ifndef _MAC
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// Version // Version
@@ -204,14 +184,14 @@ BEGIN
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "CompanyName", "http://www.stepmania.com\0" VALUE "CompanyName", "http://www.stepmania.com"
VALUE "FileDescription", "StepMania\0" VALUE "FileDescription", "StepMania"
VALUE "FileVersion", "1, 0, 0, 1\0" VALUE "FileVersion", "1, 0, 0, 1"
VALUE "InternalName", "StepMania\0" VALUE "InternalName", "StepMania"
VALUE "LegalCopyright", "Copyright © 2001-2002\0" VALUE "LegalCopyright", "Copyright © 2001-2002"
VALUE "OriginalFilename", "StepMania.exe\0" VALUE "OriginalFilename", "StepMania.exe"
VALUE "ProductName", " StepMania\0" VALUE "ProductName", " StepMania"
VALUE "ProductVersion", "1, 0, 0, 1\0" VALUE "ProductVersion", "1, 0, 0, 1"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
@@ -220,15 +200,13 @@ BEGIN
END END
END END
#endif // !_MAC
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// Bitmap // Bitmap
// //
IDB_HEADER BITMAP DISCARDABLE "header.bmp" IDB_HEADER BITMAP "header.bmp"
#endif // English (U.S.) resources #endif // English (U.S.) resources
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////