ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

winport: 

- reorganize about dialog, again :)
- remove "view 3D" from menu;
- fix slot1 dialog OK button;
This commit is contained in:
mtabachenko 2013-08-26 20:20:26 +00:00
parent 04b78849b7
commit 31a9cb55de
7 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
desmume/src/version.cpp
View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2009-2012 DeSmuME team
Copyright (C) 2009-2013 DeSmuME team
This file is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -121,5 +121,6 @@
u32 EMU_DESMUME_VERSION_NUMERIC() { return DESMUME_VERSION_NUMERIC; }
const char* EMU_DESMUME_VERSION_STRING() { return DESMUME_VERSION_STRING; }
const char* EMU_DESMUME_SUBVERSION_STRING() { return DESMUME_SUBVERSION_STRING; }
const char* EMU_DESMUME_NAME_AND_VERSION() { return DESMUME_NAME_AND_VERSION; }
const char* EMU_DESMUME_COMPILER_DETAIL() { return DESMUME_COMPILER_DETAIL; }

3
desmume/src/version.h
View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2009-2011 DeSmuME team
Copyright (C) 2009-2013 DeSmuME team
This file is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -20,5 +20,6 @@
u32 EMU_DESMUME_VERSION_NUMERIC();
const char* EMU_DESMUME_VERSION_STRING();
const char* EMU_DESMUME_SUBVERSION_STRING();
const char* EMU_DESMUME_NAME_AND_VERSION();
const char* EMU_DESMUME_COMPILER_DETAIL();

33
desmume/src/windows/AboutBox.cpp
View File

@ -24,7 +24,10 @@
#include "resource.h"
#define ABOUT_TIMER_ID 110222
const char *team[] = {
const char *team[] = {
"Original author\1",
"yopyop",
"",
"Current Team\1",
"Guillaume Duhamel",
"Normmatt",
@ -85,9 +88,10 @@ BOOL CALLBACK ListProc(HWND Dlg, UINT msg,WPARAM wparam,LPARAM lparam)
HDC hdcMem = CreateCompatibleDC(hDC);
HBITMAP hbmMem = CreateCompatibleBitmap(hDC, gRc.right, gRc.bottom);
HANDLE hOld = SelectObject(hdcMem, hbmMem);
SetBkMode(hdcMem, TRANSPARENT);
SetTextAlign(hdcMem, TA_CENTER);
u32 x = gRc.right / 2;
FillRect(hdcMem, &gRc, (HBRUSH)GetStockObject(WHITE_BRUSH));
FillRect(hdcMem, &gRc, (HBRUSH)COLOR_WINDOW);
SetTextColor(hdcMem, RGB(255, 0, 0));
for (u32 i = 0; i < size; i++)
{
@ -105,7 +109,6 @@ BOOL CALLBACK ListProc(HWND Dlg, UINT msg,WPARAM wparam,LPARAM lparam)
}
if ((i == size-1) && (pos < (s32)(gRc.top - 20))) gPosY = gRc.bottom;
}
FrameRect(hdcMem, &gRc, (HBRUSH)GetStockObject(BLACK_BRUSH));
BitBlt(hDC, 0, 0, gRc.right, gRc.bottom, hdcMem, 0, 0, SRCCOPY);
SelectObject(hdcMem, hOld);
@ -124,29 +127,19 @@ BOOL CALLBACK AboutBox_Proc (HWND dialog, UINT message,WPARAM wparam,LPARAM lpar
{
case WM_INITDIALOG:
{
// Support Unicode text display
wchar_t wstr[256];
wchar_t wstr1[256];
wchar_t wstr2[256];
GetDlgItemTextW(dialog, IDC_TXT_VERSION, wstr,256);
MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, EMU_DESMUME_VERSION_STRING(), -1, wstr1, 255);
MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, EMU_DESMUME_COMPILER_DETAIL(), -1, wstr2, 255);
wcscat(wstr, wcscat(wstr1, wstr2));
SetDlgItemTextW(dialog, IDC_TXT_VERSION, wstr);
GetDlgItemTextW(dialog, IDC_TXT_COMPILED, wstr,256);
MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, __DATE__, -1, wstr1, 255);
MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, __TIME__, -1, wstr2, 255);
wcscat(wstr, wcscat(wcscat(wstr1, L" "), wstr2));
SetDlgItemTextW(dialog, IDC_TXT_COMPILED, wstr);
char buf[256] = {0};
memset(&buf[0], 0, sizeof(buf));
sprintf(buf, "DeSmuME%s", EMU_DESMUME_VERSION_STRING());
SetDlgItemText(dialog, IDC_TXT_VERSION, buf);
sprintf(buf, "compiled %s - %s %s", __DATE__, __TIME__, EMU_DESMUME_COMPILER_DETAIL());
SetDlgItemText(dialog, IDC_TXT_COMPILED, buf);
gList = GetDlgItem(dialog, IDC_AUTHORS_LIST);
SetWindowLongPtr(gList, GWLP_WNDPROC, (LONG_PTR)ListProc);
GetClientRect(gList, &gRc);
gPosY = gRc.bottom;
SetTimer(dialog, ABOUT_TIMER_ID, 10, (TIMERPROC) NULL);
SetTimer(dialog, ABOUT_TIMER_ID, 20, (TIMERPROC) NULL);
break;
}

2
desmume/src/windows/main.cpp
View File

@ -5576,6 +5576,7 @@ DOKEYDOWN:
OpenToolWindow(new CMemView());
return 0;
#if 0
case IDM_VIEW3D:
#ifdef HAVE_WX
driver->VIEW3D_Init();
@ -5584,6 +5585,7 @@ DOKEYDOWN:
MessageBox(hwnd, "Sorry to get your hopes up; 3d viewer isn't finished yet.\r\nBut because of all these languages, it is too much trouble to remove from all the menus...", "DeSmuME", MB_OK);
#endif
return 0;
#endif
case IDM_SOUND_VIEW:
if(!SoundView_IsOpened()) SoundView_DlgOpen(HWND_DESKTOP);
return 0;

1
desmume/src/windows/resource.h
View File

@ -883,7 +883,6 @@
#define IDM_CHEATS_DISABLE 40062
#define IDM_CHEATS_SEARCH 40063
#define ID_RAMSEARCH_CAPTIONTEXT 40064
#define IDM_VIEW3D 40065
#define IDM_LOCKDOWN 40066
#define IDM_SHOWTOOLBAR 40069
#define ID_CONFIG_DISPLAYMETHOD 40070

BIN
desmume/src/windows/resources.rc
View File

Binary file not shown.

22
desmume/src/windows/slot1_config.cpp
View File

@ -26,7 +26,7 @@
HWND wndConfigSlot1 = NULL;
NDS_SLOT1_TYPE temp_type_slot1 = NDS_SLOT1_NONE;
u8 last_type_slot1 = 0;
NDS_SLOT1_TYPE last_type_slot1 = NDS_SLOT1_NONE;
char tmp_fat_path[MAX_PATH] = {0};
HWND OKbutton_slot1 = NULL;
bool _OKbutton_slot1 = false;
@ -95,15 +95,17 @@ INT_PTR CALLBACK Slot1R4(HWND dialog, UINT msg,WPARAM wparam,LPARAM lparam)
u32 Slot1_IDDs[NDS_SLOT1_COUNT] = {
IDD_SLOT1_NONE,
IDD_SLOT1_NONE,
IDD_SLOT1_R4,
IDD_SLOT1_NONE
IDD_SLOT1_NONE, // NDS_SLOT1_RETAIL_AUTO - autodetect which kind of retail card to use
IDD_SLOT1_R4, // NDS_SLOT1_R4, - R4 flash card
IDD_SLOT1_NONE, // NDS_SLOT1_RETAIL_NAND - Made in Ore/WarioWare D.I.Y.
IDD_SLOT1_NONE, // NDS_SLOT1_RETAIL_MCROM - a standard MC (eeprom, flash, fram)
};
DLGPROC Slot1_Procs[NDS_SLOT1_COUNT] = {
Slot1None,
Slot1None,
Slot1R4,
Slot1None, // NDS_SLOT1_RETAIL_AUTO - autodetect which kind of retail card to use
Slot1None, // NDS_SLOT1_R4, - R4 flash card
Slot1R4, // NDS_SLOT1_RETAIL_NAND - Made in Ore/WarioWare D.I.Y.
Slot1None, // NDS_SLOT1_RETAIL_MCROM - a standard MC (eeprom, flash, fram)
Slot1None
};
@ -165,7 +167,11 @@ BOOL CALLBACK Slot1Box_Proc(HWND dialog, UINT msg,WPARAM wparam,LPARAM lparam)
temp_type_slot1 = (NDS_SLOT1_TYPE)ComboBox_GetCurSel(GetDlgItem(dialog, IDC_ADDONS_LIST));
if (temp_type_slot1 != last_type_slot1)
{
if (wndConfigSlot1) DestroyWindow(wndConfigSlot1);
if (wndConfigSlot1)
{
DestroyWindow(wndConfigSlot1);
wndConfigSlot1 = NULL;
}
_OKbutton_slot1 = false;
wndConfigSlot1=CreateDialogW(hAppInst,
MAKEINTRESOURCEW(Slot1_IDDs[temp_type_slot1]), dialog,