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

ConfigKeys - Added Copyright info 

DeSmuME.dev - Added FirmConfig.h and FirmConfig.c
main.c - Added menu option for Firmware Settings
resources.rc - Added menu option and dialog for Firmware Settings
This commit is contained in:
normmatt234 2007-03-27 05:00:00 +00:00
parent 03a7ac37da
commit 1e76bf083e
6 changed files with 105 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
desmume/src/windows/ConfigKeys.c
View File

@ -1,3 +1,23 @@
/*
Copyright (C) 2006-2007 Normmatt
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>

19
desmume/src/windows/ConfigKeys.h
View File

@ -1,3 +1,22 @@
/*
Copyright (C) 2006-2007 Normmatt
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 CONFIGKEYS_H
#define CONFIGKEYS_H

24
desmume/src/windows/DeSmuME.dev
View File

@ -1,7 +1,7 @@
[Project]
FileName=DeSmuME.dev
Name=DeSmuME
UnitCount=77
UnitCount=79
Type=0
Ver=1
ObjFiles=
@ -27,7 +27,7 @@ CustomMakefile=
IncludeVersionInfo=1
SupportXPThemes=1
CompilerSet=0
CompilerSettings=0000000001001001000100
CompilerSettings=0000000001001000000100
[Unit1]
FileName=..\ROMReader.c
@ -816,3 +816,23 @@ Priority=1000
OverrideBuildCmd=0
BuildCmd=
[Unit78]
FileName=FirmConfig.c
CompileCpp=0
Folder=DeSmuME
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
[Unit79]
FileName=FirmConfig.h
CompileCpp=0
Folder=DeSmuME
Compile=1
Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=

10
desmume/src/windows/main.c
View File

@ -47,6 +47,7 @@
#include "oamView.h"
#include "mapview.h"
#include "ConfigKeys.h"
#include "FirmConfig.h"
#include "OGLRender.h"
#include "../render3D.h"
@ -1291,6 +1292,15 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
}
return 0;
case IDM_FIRMSETTINGS:
{
cwindow_struct FirmConfig;
if (CWindow_Init2(&FirmConfig, hAppInst, HWND_DESKTOP, "Configure Controls", IDD_FIRMSETTINGS, FirmConfig_Proc) == 0)
CWindow_Show(&FirmConfig);
}
return 0;
case IDC_FRAMESKIPAUTO:
case IDC_FRAMESKIP0:
case IDC_FRAMESKIP1:

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

@ -23,7 +23,7 @@
#define RESOURCE_H
#if 0
#include "../NDSSystem.hpp"
#include "../NDSSystem.h"
extern NDSSystem nds;
extern BOOL execute;
@ -234,4 +234,9 @@ void refreshAll();
#define IDC_WINDOW3X 1012
#define IDC_WINDOW4X 1013
#define IDM_FIRMSETTINGS 1100
#define IDD_FIRMSETTINGS 1101
#define IDC_EDIT1 1102
#define IDC_EDIT2 1103
#endif

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

@ -390,6 +390,7 @@ MENU_PRINCIPAL MENU
}
MENUITEM "Control Config", IDM_CONFIG
MENUITEM "Sound Settings", IDM_SOUNDSETTINGS
MENUITEM "Firmware Settings", IDM_FIRMSETTINGS
POPUP "&Frame Skip"
{
MENUITEM "Auto", IDC_FRAMESKIPAUTO
@ -709,6 +710,33 @@ BEGIN
PUSHBUTTON "&Cancel",IDCANCEL,127,78,40,14
END
IDD_FIRMSETTINGS DIALOG DISCARDABLE 0, 0, 161, 145
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Firmware Settings"
FONT 8, "MS Sans Serif"
BEGIN
DEFPUSHBUTTON "&OK",IDOK,7,124,50,14
PUSHBUTTON "&Cancel",IDCANCEL,104,124,50,14
CONTROL "Favourite Color:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP |
WS_GROUP,9,55,52,12
COMBOBOX IDC_COMBO1,66,53,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
CONTROL "Birth Month:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP |
WS_GROUP,9,72,52,12
COMBOBOX IDC_COMBO2,66,71,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
CONTROL "Birthday:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP |
WS_GROUP,9,90,52,12
COMBOBOX IDC_COMBO3,66,88,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
CONTROL "Language:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP |
WS_GROUP,9,106,52,12
COMBOBOX IDC_COMBO4,66,105,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
CONTROL "Nickname:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP |
WS_GROUP,9,17,52,12
EDITTEXT IDC_EDIT1,66,14,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP
CONTROL "Message:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP |
WS_GROUP,9,36,52,12
EDITTEXT IDC_EDIT2,66,33,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP
END
IDR_MAIN_ACCEL ACCELERATORS DISCARDABLE
BEGIN
VK_F1, IDM_STATE_SAVE_F1, VIRTKEY, SHIFT, NOINVERT