[Desmume-cvs] desmume/src/windows ConfigKeys.c, 1.8, 1.9 ConfigKeys.h, 1.5, 1.6 DeSmuME.dev, 1.16, 1.17 main.c, 1.45, 1.46 resource.h, 1.18, 1.19 resources.rc, 1.23, 1.24

[Normmatt <nor...@us...>]

Update of /cvsroot/desmume/desmume/src/windows
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv19195

Modified Files:
	ConfigKeys.c ConfigKeys.h DeSmuME.dev main.c resource.h 
	resources.rc 
Log Message:
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

Index: resource.h
===================================================================
RCS file: /cvsroot/desmume/desmume/src/windows/resource.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- resource.h	10 Feb 2007 02:13:09 -0000	1.18
+++ resource.h	27 Mar 2007 05:00:00 -0000	1.19
@@ -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 @@
 #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

Index: DeSmuME.dev
===================================================================
RCS file: /cvsroot/desmume/desmume/src/windows/DeSmuME.dev,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- DeSmuME.dev	25 Mar 2007 04:42:46 -0000	1.16
+++ DeSmuME.dev	27 Mar 2007 05:00:00 -0000	1.17
@@ -1,7 +1,7 @@
 [Project]
 FileName=DeSmuME.dev
 Name=DeSmuME
-UnitCount=77
+UnitCount=79
 Type=0
 Ver=1
 ObjFiles=
@@ -27,7 +27,7 @@
 IncludeVersionInfo=1
 SupportXPThemes=1
 CompilerSet=0
-CompilerSettings=0000000001001001000100
+CompilerSettings=0000000001001000000100
 
 [Unit1]
 FileName=..\ROMReader.c
@@ -816,3 +816,23 @@
 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=
+

Index: ConfigKeys.h
===================================================================
RCS file: /cvsroot/desmume/desmume/src/windows/ConfigKeys.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ConfigKeys.h	12 Feb 2007 20:09:26 -0000	1.5
+++ ConfigKeys.h	27 Mar 2007 05:00:00 -0000	1.6
@@ -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

Index: resources.rc
===================================================================
RCS file: /cvsroot/desmume/desmume/src/windows/resources.rc,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- resources.rc	10 Feb 2007 02:13:09 -0000	1.23
+++ resources.rc	27 Mar 2007 05:00:00 -0000	1.24
@@ -390,6 +390,7 @@
   }
   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 @@
     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

Index: ConfigKeys.c
===================================================================
RCS file: /cvsroot/desmume/desmume/src/windows/ConfigKeys.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ConfigKeys.c	25 Mar 2007 04:42:46 -0000	1.8
+++ ConfigKeys.c	27 Mar 2007 05:00:00 -0000	1.9
@@ -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>

Index: main.c
===================================================================
RCS file: /cvsroot/desmume/desmume/src/windows/main.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- main.c	27 Mar 2007 02:54:13 -0000	1.45
+++ main.c	27 Mar 2007 05:00:00 -0000	1.46
@@ -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 @@
 
                        }
                   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: