From 783edb2e39759fa72007f01b3204115660fde3f9 Mon Sep 17 00:00:00 2001 From: yabause Date: Wed, 31 Dec 2008 14:43:28 +0000 Subject: [PATCH] Merged revision 1335 to 1337 --- AUTHORS | 3 +- ChangeLog | 170 +++--- src/arm_instructions.cpp | 5 - src/thumb_instructions.cpp | 12 +- src/windows/AboutBox.cpp | 3 +- src/windows/resources.rc | 1129 +++++++++++++----------------------- 6 files changed, 487 insertions(+), 835 deletions(-) diff --git a/AUTHORS b/AUTHORS index 50824c95e..8411b7a99 100644 --- a/AUTHORS +++ b/AUTHORS @@ -15,8 +15,9 @@ Jeff Bland Andres Delikat Riccardo Magliocchetti Max Tabachenko (CrazyMax/mtabachenko) -Zeromus +zeromus Luigi__ +adelikat Contributors ------------ diff --git a/ChangeLog b/ChangeLog index cd984fd92..36fccb2e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,85 +1,95 @@ 0.8 -> 0.9 There have been so many changes that this list can hardly be considered complete. - The savestate system is totally changed and incompatible with old savestates. - General/Core: - - Convert to c++! - - Added "high-level" check for DMAs and Timer for minor (really minor) speed up [shash] - - Changed instruction execution to 16 at a time blocks (tested and stable) [shash] - - Really minor memory access speed up (mainly added for clarity) [shash] - - Fixes in IPC FIFO [CrazyMax] - - Add Geometry FIFO simulation (New SMB and others games not freeze now) [CrazyMax] - - Add cosine interpolation in the SPU (conditionally compiled) [zeromus,luigi__] - - Experiment: always one silent SPU core at 44.1khz synched with emu for more precision. - The audible core runs with the host, causing music to slow down but not tear or pitch bend. [zeromus] - - Change savestate code to support loosely bound chunks and more easily other parts of the emu (GE, GPU). - The savestate format is changed, but from now on it is in principle more resilient - (though it will continue to break as we tinker with the internals) [zeromus] - - Remove 16MB of WRAM at 0x01****** from arm9. Mapped to unused instead. What was this? [zeromus] - - Add RTC implementations (not fully) [CrazyMax] - - Add a GUI hud system; start adding some HUD elements - - Add functions for a lid open/close. Holding key (default "Backspace" in Windows port) while game is freeze/non freeze. [CrazyMax] - - Added a bunch of crazy templates to the cpu and mmu for minor speed boosts [zeromus] - - Add secure area decryption from ndstool [zeromus] - - change backupmem autodetection to catch more cases of unusual usage patterns [zeromus] - - Fixed Thumb LDMIA (fixes ingame Dead'n'Furious) [shash] - - Fix repeating DMA (fixes NSMB parallax BG) [zeromus] - Graphics: - - Added gfx3d module which emulates the whole GE as part of the core emu. [zeromus] - - Moved the windows/cocoa OGLRender to the emu core and replace ogl_collector. - Now every platform shares the same 3d code. [zeromus] - - Reorganize 3d code to defer rendering to after 3d vblank. eliminates tearing, and texturing artifacts. [zeromus] - - Add optional fragment shading pipeline for more precision [luigi__] - - Many tweaks and improvements to 3d precision [zeromus, CrazyMax, luigi__] - - Rewrite VRAM mapping control and rendering [CrazyMax, luigi__] - - Improvements to 2d/3d compositing aiming at better NSMB rendering; still imperfect [zeromus] - - Fix in capture display (many games with both 3D screen not blinking now) [CrazyMax] - - Fix in master brightness (this is fix games with black screens) [CrazyMax] - - Added SSE2 version for some matrix routines [CrazyMax] - - Make matrix 4x4 multiply routines use W-coordinate. [zeromus] - - Add many matrix and vector functions to matrix.cpp [zeromus] - - Added transparency and fixed material alpha support and alpha testing on the 3D core [shash] - - Changed how depth initial values are calculated (fixes SM64DS skybox) [shash] - - Some fixes in 3D core OGL (fixed textures) [CrazyMax] - - Added texture caching (speedup 3D core) [CrazyMax] - - Render shadow volumes [zeromus, luigi__] - - Toon shading system [luigi__] - - Carry w=1 from vertex() through pipeline (this will be necessary for software 3d rendering) [zeromus] - - Fix clear depth (ex. Castlevania now doesnt flip) [lugi__] - - Make GE matrix mult and load commands clear out unused rows and cols to identity correctly [zeromus] - - Fix errors in matrix operations regarding projection mode and pos-vector mode [zeromus] - - Fix error in command unpacking which caused some display lists to totally blow up [zeromus] - - Convert alpha and material values from [0,31], [0,7] etc ranges to opengl [0,maxint] ranges in a more precise way [zeromus] - - Add opengl state caching. This is of dubious performance assistance, but it is easy to take out so I am leaving it for now. [zeromus] - - Add MMU->GPU signal for when vram mappings change, which allows it to assume textures are unchanged unless vram has changed [zeromus] - - Move lighting model to software instead of using opengl for more precision [zeromus] - - Fix a bug in texture transformation mode 1 [zeromus] - - Add 3d layer h-scrolling [zeromus] - - Removed some serious inefficiencies from sprite window code [zeromus] - Mac OS X port: - - Fixed: Filenames and paths with unicode characters now work. [Jeff] - - Fixed: Load state from file button works again. [Jeff] - - Save State panel now pauses emulation while the file selection box is open. [Jeff] - - Fixed: Frozen video output (and/or messed 3d emulation) after loading a state. [Jeff] - - Added option to load the most recent file upon launching the program. [Jeff] - - Added French translation (thanks to Pierre Rudloff). [Jeff] - - Added basic key mapping configuration to application preferences (thanks to Julio GorgŽ). [Jeff] - - Added keyboard shortcuts for Execute, Pause and Reset command (thanks to Julio GorgŽ). [Jeff] - - Default key mappings are no longer case sensitive. [Jeff] - - Added ability to limit speed. [Jeff] - - Fixed: Video output should work on software-only 3D renderers. [Jeff] - Windows port: - - Removed the bug report link with a define, to avoid reports from betas/external builds [shash] - - Added the version on window bar to recognize versions from screenshots [shash] - - Changed graphics render core to DirectDraw (work faster) [CrazyMax] - - Fix a race condition in NDS_3D_Reset and NDS_glInit [zeromus] - - Tweak optimization flags and change entire source code to use fastcall [zeromus] - - Add an arm9 cpu load average calculator similar to no$ [zeromus] - - Fix the buggy auto frameskip logic which made the emu slow to a crawl. Now it runs fast! [zeromus] - - Fix resizing, rotate & aspect ration of main window. Add save window position and parameters [CrazyMax] - - Rewrite all debug tools (autoupdate works now) [CrazyMax] - - Add AVI output [zeromus] - - Remove multithreading from user interface after finding several synchronization issues [zeromus] - - Rewrite input core & replace config input dialog [CrazyMax] + For this release, we have formatted the list into a high level overview of big changes and bad bugs relative to the previous release. Hopefully what you're interested in. + This list does not include items which are solely performance boosts, for let us just say that virtually every system has been speeded up. + + * The savestate system is totally changed and incompatible with old savestates. + * The 3d system should be considered rewritten. + +General/Core: + enh: Convert to c++ + enh: Add functions for a lid open/close. Holding key (default "Backspace" in Windows port) while game is freeze/non freeze. [CrazyMax] + enh: Add secure area decryption from ndstool [zeromus] + enh: Change savestate code to support loosely bound chunks and more easily other parts of the emu (GE, GPU). + The savestate format is changed, but from now on it is in principle more resilient + (though it will continue to break as we tinker with the internals) [zeromus] + enh: Added SSE2 optimizations for matrices. Since we now make an SSE2 build, more optimizations can be made. [CrazyMax] + enh: Add a preliminary GUI hud system [CrazyMax,zeromus] + +CPU/MMU: + bug: Many fixes in IPC and GE FIFOs. Fixes freezes in NSMB, dsracing, and others. [CrazyMax,luigi__,shash] + bug: Fix ARM instructions SBC and RSC (likewise SBC in thumb) [normatt] + bug: Fixed Thumb LDMIA (fixes ingame Dead'n'Furious) [shash] + bug: Fix repeating DMA (fixes NSMB parallax BG) [zeromus] + bug: Proper handling for unaligned CPU accesses [luigi__] + bug: Proper handling for undefined instruction exceptions [Salva Peiró] + enh: Remove 16MB of WRAM at 0x01****** from arm9. Mapped to unused instead. Nobody knows what this was. [zeromus] + enh: Changed instruction execution to 16 at a time blocks (tested and stable) [shash] + +Hardware: + bug: Newer and better sqrt and div emulation; makes SM64DS playable [luigi__,shash,zeromus] + bug: Add preliminary RTC implementations [CrazyMax] + enh: Add cosine interpolation in the SPU (conditionally compiled) [zeromus,luigi__] + enh: Experimental: always one silent non-mixing SPU core at 44.1khz synched with emu, for more precision. + The audible core runs with the host, causing music to slow down but not tear or pitch bend. [zeromus] + +Graphics: + - Overhaul 3d: + . Move entire GE to core emu. + . Move OpenGL renderer to emu core for optional use by platforms, removing ogl_collector. Now every platform shares the same 3d code. + . Reorganize 3d code to defer rendering to after 3d vblank. Eliminates tearing, and texturing artifacts. [zeromus] + . Add optional fragment shading pipeline (more precision) [luigi__] + . 3d compositing integrated into GPU engine (more precision and speed in cases where no compositing needed) [luigi__] + . Move lighting model to software instead of using opengl's fixed function model [zeromus] + . Render shadow volumes; toon shading and highlight table [zeromus, luigi__] + . Added texture caching! big speed up. [CrazyMax] + + bug: Many assorted tweaks and improvements to 3d and 2d precision [zeromus,CrazyMax,luigi__] + bug: Fixes to GE: command unpacking, projection and pos-vector mode matrix handling, mult and load commands [zeromus] + bug: Fix a bug in texture transformation mode 1 [zeromus] + bug: Fixed GPU rendering bugs in sprites and BG [CrazyMax] + bug: Fixes to texture conversion [CrazyMax,zeromus] + bug: Fixes in capture display (no blinking in many games with dual 3D) [CrazyMax] + bug: Fixes in master brightness (this fixes some games with black screens) [CrazyMax] + bug: Fixes in screen, backdrop, and sprite blending [luigi__] + bug: Changed clear depths and how depth initial values are calculated (fixes SM64DS skybox, Castlevania) [shash,lugi__] + bug: Add 3d layer h-scrolling [zeromus] + bug: Added transparency and fixed material alpha support and alpha testing on the 3D core [shash] + bug: Rewrite VRAM mapping control and rendering (more accurate) [CrazyMax,luigi__] + bug: Fix some errors in rendering 512 tall BG [zeromus] + bug: convert colors to opengl better to prevent alpha=31 polys from being ever so slightly transparent [zeromus] + enh: Add MMU->GPU signal for when vram mappings change to function as a texture cache invalidate signal [zeromus] + enh: Make matrix 4x4 multiply routines use W-coordinate; carry w coord through pipeline [zeromus] + +Mac OS X port: + bug: Fixed: Filenames and paths with unicode characters now work. [Jeff] + bug: Fixed: Load state from file button works again. [Jeff] + enh: Save State panel now pauses emulation while the file selection box is open. [Jeff] + bug: Fixed: Frozen video output (and/or messed 3d emulation) after loading a state. [Jeff] + bug: Added option to load the most recent file upon launching the program. [Jeff] + enh: Added French translation (thanks to Pierre Rudloff). [Jeff] + enh: Added basic key mapping configuration to application preferences (thanks to Julio GorgŽ). [Jeff] + enh: Added keyboard shortcuts for Execute, Pause and Reset command (thanks to Julio GorgŽ). [Jeff] + enh: Default key mappings are no longer case sensitive. [Jeff] + enh: Added ability to limit speed. [Jeff] + enh: Fixed: Video output should work on software-only 3D renderers. [Jeff] + +Windows port: + bug: Fix a race condition in NDS_3D_Reset and NDS_glInit [zeromus] + bug: Fix the buggy auto frameskip logic which made the emu slow to a crawl. Now it runs fast! [zeromus] + bug: Fix resizing, rotate & aspect ration of main window. [CrazyMax,_zeromus] + bug: Remove multithreading from user interface after finding several synchronization issues [zeromus] + enh: recent roms menu [luigi_] + enh: Changed graphics render core to DirectDraw (work faster) [CrazyMax] + enh: Add an arm9 cpu load average calculator similar to no$. but I dont think it works right. [zeromus] + enh: Rewrite all debug tools (autoupdate works now) [CrazyMax] + enh: Rewrite input core & replace config input dialog [CrazyMax] + enh: Add AVI output [zeromus] + enh: Add pause toggle and frame advance hotkeys [adelikat] + enh: Add frame counter display and hud messages framework [adelikat] + enh: Main window remembers position, size, and a few other emu preferences [adelikat] + enh: Removed directx sdk dependency for easier building. [zeromus] + enh: Savestate doesnt unpause emu if it is already paused [adelikat] 0.7.3 -> 0.8 Cocoa: diff --git a/src/arm_instructions.cpp b/src/arm_instructions.cpp index d4b103bfe..d2b0f1b9d 100644 --- a/src/arm_instructions.cpp +++ b/src/arm_instructions.cpp @@ -22,11 +22,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -//zero 9/8/08 - fixed a bug -//SIGNED_UNDERFLOW(a, (!cpu->CPSR.bits.C), tmp) -//was being called. but SIGNED_UNDERFLOW expects values in bit31. replaced with -//SIGNED_UNDERFLOW(a, (cpu->CPSR.bits.C?0:0x80000000), tmp) - #include "cp15.h" #include "debug.h" #include "MMU.h" diff --git a/src/thumb_instructions.cpp b/src/thumb_instructions.cpp index fbe4fb6d1..9b365b14e 100644 --- a/src/thumb_instructions.cpp +++ b/src/thumb_instructions.cpp @@ -24,11 +24,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -//zero 9/8/08 - fixed a bug -//SIGNED_UNDERFLOW(a, (!cpu->CPSR.bits.C), tmp) -//was being called. but SIGNED_UNDERFLOW expects values in bit31. replaced with -//SIGNED_UNDERFLOW(a, (cpu->CPSR.bits.C?0:0x80000000), tmp) - #include "bios.h" #include "debug.h" #include "MMU.h" @@ -357,8 +352,11 @@ TEMPLATE static u32 FASTCALL OP_SBC_REG() cpu->CPSR.bits.N = BIT31(res); cpu->CPSR.bits.Z = res == 0; - cpu->CPSR.bits.C = (!UNSIGNED_UNDERFLOW(a, (u32)(cpu->CPSR.bits.C?0:0x80000000), tmp)) & (!UNSIGNED_OVERFLOW(tmp, b, res)); - cpu->CPSR.bits.V = SIGNED_UNDERFLOW(a, (u32)(cpu->CPSR.bits.C?0:0x80000000), tmp) | SIGNED_OVERFLOW(tmp, b, res); + //zero 31-dec-2008 - apply normatt's fixed logic from the arm SBC instruction + //although it seemed a bit odd to me and to whomever wrote this for SBC not to work similar to ADC.. + //but thats how it is. + cpu->CPSR.bits.C = !UNSIGNED_UNDERFLOW(a, b, res); + cpu->CPSR.bits.V = SIGNED_UNDERFLOW(a, b, res); return 3; } diff --git a/src/windows/AboutBox.cpp b/src/windows/AboutBox.cpp index bced7f8bc..631913b38 100644 --- a/src/windows/AboutBox.cpp +++ b/src/windows/AboutBox.cpp @@ -24,7 +24,7 @@ #include "AboutBox.h" #include "resource.h" -#define TEAM 31 +#define TEAM 32 const char *team[TEAM] = { "Original author", "---------------", "yopyop", @@ -44,6 +44,7 @@ const char *team[TEAM] = { "Original author", "Max Tabachenko (CrazyMax/mtabachenko)", "Zeromus", "Luigi__", + "adelikat", "", "Contributors", "------------", diff --git a/src/windows/resources.rc b/src/windows/resources.rc index 862ef8844..d27470b9d 100644 --- a/src/windows/resources.rc +++ b/src/windows/resources.rc @@ -1,4 +1,4 @@ -//Microsoft Developer Studio generated resource script. +// Microsoft Visual C++ generated resource script. // #include "resource.h" @@ -25,7 +25,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // Accelerator // -IDR_MAIN_ACCEL ACCELERATORS MOVEABLE PURE +IDR_MAIN_ACCEL ACCELERATORS BEGIN "0", ACCEL_0, VIRTKEY, NOINVERT "1", ACCEL_1, VIRTKEY, NOINVERT @@ -82,7 +82,7 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT // Menu // -MENU_PRINCIPAL MENU DISCARDABLE +MENU_PRINCIPAL MENU BEGIN POPUP "&Fil" BEGIN @@ -225,7 +225,7 @@ BEGIN END END -RECENTROMS MENU DISCARDABLE +RECENTROMS MENU BEGIN POPUP "Recent ROMs" BEGIN @@ -242,94 +242,70 @@ END // IDD_CONFIG DIALOGEX 0, 0, 125, 227 -STYLE DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Konfigurer Input" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "OK",IDC_FERMER,67,208,50,14 PUSHBUTTON "Standard",IDC_BUTTON1,7,208,50,14 - COMBOBOX IDC_COMBO1,46,13,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO1,46,13,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Op:",IDC_STATIC,17,14,27,10 - COMBOBOX IDC_COMBO4,46,29,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO4,46,29,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Ned:",IDC_STATIC,17,31,28,9 - COMBOBOX IDC_COMBO2,46,45,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO2,46,45,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Venstre:",IDC_STATIC,17,47,28,9 - COMBOBOX IDC_COMBO3,46,61,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO3,46,61,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Højre:",IDC_STATIC,17,63,28,9 - COMBOBOX IDC_COMBO7,46,77,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO7,46,77,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "A:",IDC_STATIC,18,78,28,9 - COMBOBOX IDC_COMBO8,46,92,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO8,46,92,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "B:",IDC_STATIC,17,94,28,9 - COMBOBOX IDC_COMBO10,46,108,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO10,46,108,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "L:",IDC_STATIC,17,110,28,9 - COMBOBOX IDC_COMBO11,46,124,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO11,46,124,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "R:",IDC_STATIC,17,126,28,9 - COMBOBOX IDC_COMBO6,46,140,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO6,46,140,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "X:",IDC_STATIC,17,142,28,9 - COMBOBOX IDC_COMBO5,46,156,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO5,46,156,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Y:",IDC_STATIC,17,158,28,9 GROUPBOX "",IDC_STATIC,7,3,111,203 - COMBOBOX IDC_COMBO9,46,172,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO9,46,172,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Start:",IDC_STATIC,17,174,28,9 - COMBOBOX IDC_COMBO12,46,188,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO12,46,188,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Select:",IDC_STATIC,17,190,28,9 END IDD_MEM_VIEWER7 DIALOGEX 0, 0, 428, 178 -STYLE DS_CENTER | WS_CAPTION +STYLE DS_SETFONT | DS_CENTER | WS_CAPTION CAPTION "Vis Hukommelse" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - CONTROL "8 bit",IDC_8_BIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP, - 10,4,29,10 - CONTROL "16 bit",IDC_16_BIT,"Button",BS_AUTORADIOBUTTON,44,4,33, - 10 - CONTROL "32 bit",IDC_32_BIT,"Button",BS_AUTORADIOBUTTON,82,4,33, - 10 + CONTROL "8 bit",IDC_8_BIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,4,29,10 + CONTROL "16 bit",IDC_16_BIT,"Button",BS_AUTORADIOBUTTON,44,4,33,10 + CONTROL "32 bit",IDC_32_BIT,"Button",BS_AUTORADIOBUTTON,82,4,33,10 LTEXT "Gå Til:",IDC_STATIC,130,4,33,10 - EDITTEXT IDC_GOTOMEM,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | - ES_WANTRETURN | WS_GROUP + EDITTEXT IDC_GOTOMEM,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP PUSHBUTTON "&Start",IDC_GO,240,1,20,14 - CONTROL "Rediger",IDC_MEM_BOX,"MemViewBox7",WS_VSCROLL | - WS_TABSTOP,4,16,424,142,WS_EX_CLIENTEDGE + CONTROL "Rediger",IDC_MEM_BOX,"MemViewBox7",WS_VSCROLL | WS_TABSTOP,4,16,424,142,WS_EX_CLIENTEDGE PUSHBUTTON "&Luk",IDC_FERMER,185,162,50,14 - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,327,1,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,382,2,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,394,2,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,327,1,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,382,2,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,394,2,11,14 LTEXT "secs",IDC_STATIC,406,5,16,8 END IDD_DESASSEMBLEUR_VIEWER7 DIALOGEX 0, 0, 380, 186 -STYLE DS_CENTER | WS_CAPTION +STYLE DS_SETFONT | DS_CENTER | WS_CAPTION CAPTION "Disassembler" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - CONTROL "Auto ",IDC_AUTO_DES,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,10,4,35,10 + CONTROL "Auto ",IDC_AUTO_DES,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,4,35,10 CONTROL "ARM",IDC_ARM,"Button",BS_AUTORADIOBUTTON,44,4,35,10 CONTROL "Thumb",IDC_THUMB,"Button",BS_AUTORADIOBUTTON,82,4,40,10 LTEXT "Gå til:",IDC_STATIC,130,4,33,10 - EDITTEXT IDC_GOTODES,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | - ES_WANTRETURN | WS_GROUP + EDITTEXT IDC_GOTODES,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP PUSHBUTTON "&Start",IDC_GO,240,1,20,14 - CONTROL "Rediger",IDC_DES_BOX,"DesViewBox7",WS_VSCROLL | - WS_TABSTOP,4,16,296,150,WS_EX_CLIENTEDGE + CONTROL "Rediger",IDC_DES_BOX,"DesViewBox7",WS_VSCROLL | WS_TABSTOP,4,16,296,150,WS_EX_CLIENTEDGE PUSHBUTTON "&Luk",IDC_FERMER,246,170,50,14 LTEXT "R0 :",IDC_STATIC,304,16,17,8 LTEXT "R1 :",IDC_STATIC,304,24,17,8 @@ -368,23 +344,17 @@ BEGIN LTEXT "",IDC_MODE,327,158,28,8 LTEXT "",IDC_TMP,327,168,40,8 PUSHBUTTON "&Refresh",IDC_REFRESH,162,170,50,14,BS_ICON - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,285,1,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,340,3,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,352,2,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,285,1,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,340,3,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,352,2,11,14 LTEXT "secs",IDC_STATIC,364,5,16,8 - EDITTEXT IDC_SETPNUM,5,170,34,14,ES_UPPERCASE | ES_AUTOHSCROLL | - ES_NUMBER | WS_GROUP + EDITTEXT IDC_SETPNUM,5,170,34,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP PUSHBUTTON "&Step",IDC_STEP,41,170,50,14 - CONTROL "Autoupd asm",IDC_AUTOUPDATE_ASM,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,94,172,57,10 + CONTROL "Autoupd asm",IDC_AUTOUPDATE_ASM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,94,172,57,10 END -IDD_GAME_INFO DIALOG DISCARDABLE 0, 0, 150, 150 -STYLE WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_GAME_INFO DIALOG 0, 0, 150, 150 +STYLE DS_SETFONT | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ROM Information" FONT 8, "MS Sans Serif" BEGIN @@ -406,7 +376,7 @@ BEGIN END IDD_PAL DIALOGEX 0, 0, 120, 190 -STYLE WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | WS_CAPTION | WS_SYSMENU CAPTION "Palette Fremvisning" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN @@ -414,18 +384,14 @@ BEGIN LTEXT "Pal : 0",IDC_PALNUM,3,21,25,8 SCROLLBAR IDC_SCROLLER,30,18,20,14 PUSHBUTTON "&Luk",IDC_FERMER,35,169,50,14 - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,13,150,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,68,151,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,80,151,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,150,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,68,151,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,80,151,11,14 LTEXT "secs",IDC_STATIC,92,154,16,8 END IDD_TILE DIALOGEX 0, 0, 446, 180 -STYLE WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | WS_CAPTION | WS_SYSMENU CAPTION "TILE Fremvisning" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN @@ -433,30 +399,21 @@ BEGIN LTEXT "Pal : 0",IDC_PALNUM,4,31,25,8 SCROLLBAR IDC_SCROLLER,30,28,20,14 COMBOBOX IDC_MEM_SELECT,4,50,90,14,CBS_DROPDOWN | WS_TABSTOP - CONTROL "Bitmap",IDC_BITMAP,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,4,68,35,10 - CONTROL "256 Farver",IDC_256COUL,"Button",BS_AUTORADIOBUTTON,4, - 80,55,10 - CONTROL "16 Farver",IDC_16COUL,"Button",BS_AUTORADIOBUTTON,4,92, - 50,10 - CONTROL "Rediger",IDC_Tile_BOX,"TileViewBox",WS_TABSTOP,100,2, - 344,160,WS_EX_CLIENTEDGE - CONTROL "Rediger",IDC_MINI_TILE,"MiniTileViewBox",WS_TABSTOP,22, - 116,56,52,WS_EX_CLIENTEDGE + CONTROL "Bitmap",IDC_BITMAP,"Button",BS_AUTORADIOBUTTON | WS_GROUP,4,68,35,10 + CONTROL "256 Farver",IDC_256COUL,"Button",BS_AUTORADIOBUTTON,4,80,55,10 + CONTROL "16 Farver",IDC_16COUL,"Button",BS_AUTORADIOBUTTON,4,92,50,10 + CONTROL "Rediger",IDC_Tile_BOX,"TileViewBox",WS_TABSTOP,100,2,344,160,WS_EX_CLIENTEDGE + CONTROL "Rediger",IDC_MINI_TILE,"MiniTileViewBox",WS_TABSTOP,22,116,56,52,WS_EX_CLIENTEDGE LTEXT "Tile Num : 0",IDC_TILENUM,23,170,100,8 PUSHBUTTON "&Luk",IDC_FERMER,198,164,50,14 - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,349,165,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,404,165,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,416,164,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,349,165,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,404,165,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,416,164,11,14 LTEXT "secs",IDC_STATIC,428,167,16,8 END IDD_MAP DIALOGEX 0, 0, 485, 320 -STYLE DS_CENTER | WS_CAPTION +STYLE DS_SETFONT | DS_CENTER | WS_CAPTION CAPTION "MAP Fremviser" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN @@ -476,18 +433,14 @@ BEGIN LTEXT "",IDC_MSIZE,48,70,85,8 LTEXT "",IDC_SCROLL,48,80,85,8 PUSHBUTTON "&Luk",IDC_FERMER,4,300,50,14 - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,4,92,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,59,93,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,71,93,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,92,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,59,93,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,71,93,11,14 LTEXT "secs",IDC_STATIC,83,96,16,8 END IDD_OAM DIALOGEX 0, 0, 300, 200 -STYLE WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | WS_CAPTION | WS_SYSMENU CAPTION "OAM Fremviser" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN @@ -513,26 +466,20 @@ BEGIN LTEXT "",IDC_PROP0,4,116,86,8 LTEXT "",IDC_PROP1,4,126,86,8 PUSHBUTTON "&Luk",IDC_FERMER,50,181,50,14 - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,4,161,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,59,162,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,71,161,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,161,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,59,162,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,71,161,11,14 LTEXT "secs",IDC_STATIC,83,163,16,8 END IDD_SOUNDSETTINGS DIALOGEX 0, 0, 174, 96 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Lyd Indstillinger" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN GROUPBOX "Lyd Indstillinger",-1,3,2,168,28 LTEXT "Lyd Driver",-1,10,14,40,10 - COMBOBOX IDC_SOUNDCORECB,54,13,110,33,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SOUNDCORECB,54,13,110,33,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Andre Indstillinger",-1,3,31,168,43 LTEXT "Buffer Størrelse",-1,10,42,60,10 EDITTEXT IDC_SOUNDBUFFERET,136,41,28,13 @@ -542,54 +489,39 @@ BEGIN PUSHBUTTON "&Fortryd",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 +IDD_FIRMSETTINGS DIALOG 0, 0, 161, 145 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Firmware Indstillinger" FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "&OK",IDOK,7,124,50,14 PUSHBUTTON "&Fortryd",IDCANCEL,104,124,50,14 - CONTROL "Favorit Farve:",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 "Fødselsmåned:",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 "Fødselsdag:",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 "Sprog:",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 "Kælenavn:",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 "Besked:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | - WS_GROUP,9,36,52,12 - EDITTEXT IDC_EDIT2,66,33,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | - WS_GROUP + CONTROL "Favorit Farve:",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 "Fødselsmåned:",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 "Fødselsdag:",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 "Sprog:",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 "Kælenavn:",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 "Besked:",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 IDD_DESASSEMBLEUR_VIEWER9 DIALOGEX 0, 0, 380, 186 -STYLE DS_CENTER | WS_CAPTION +STYLE DS_SETFONT | DS_CENTER | WS_CAPTION CAPTION "Disassembler" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - CONTROL "Auto ",IDC_AUTO_DES,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,10,4,35,10 + CONTROL "Auto ",IDC_AUTO_DES,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,4,35,10 CONTROL "ARM",IDC_ARM,"Button",BS_AUTORADIOBUTTON,44,4,35,10 CONTROL "Thumb",IDC_THUMB,"Button",BS_AUTORADIOBUTTON,82,4,40,10 LTEXT "Gå til:",IDC_STATIC,130,4,33,10 - EDITTEXT IDC_GOTODES,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | - ES_WANTRETURN | WS_GROUP + EDITTEXT IDC_GOTODES,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP PUSHBUTTON "&Start",IDC_GO,240,1,20,14 - CONTROL "Rediger",IDC_DES_BOX,"DesViewBox9",WS_VSCROLL | - WS_TABSTOP,4,16,296,150,WS_EX_CLIENTEDGE + CONTROL "Rediger",IDC_DES_BOX,"DesViewBox9",WS_VSCROLL | WS_TABSTOP,4,16,296,150,WS_EX_CLIENTEDGE PUSHBUTTON "&Luk",IDC_FERMER,246,170,50,14 LTEXT "R0 :",IDC_STATIC,304,16,17,8 LTEXT "R1 :",IDC_STATIC,304,24,17,8 @@ -628,51 +560,36 @@ BEGIN LTEXT "",IDC_MODE,327,158,28,8 LTEXT "",IDC_TMP,327,168,40,8 PUSHBUTTON "&Refresh",IDC_REFRESH,162,170,50,14,BS_ICON - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,285,1,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,340,3,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,352,2,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,285,1,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,340,3,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,352,2,11,14 LTEXT "secs",IDC_STATIC,364,5,16,8 - EDITTEXT IDC_SETPNUM,5,170,34,14,ES_UPPERCASE | ES_AUTOHSCROLL | - ES_NUMBER | WS_GROUP + EDITTEXT IDC_SETPNUM,5,170,34,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP PUSHBUTTON "&Step",IDC_STEP,41,170,50,14 - CONTROL "Autoupd asm",IDC_AUTOUPDATE_ASM,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,94,172,57,10 + CONTROL "Autoupd asm",IDC_AUTOUPDATE_ASM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,94,172,57,10 END IDD_MEM_VIEWER9 DIALOGEX 0, 0, 428, 178 -STYLE DS_CENTER | WS_CAPTION +STYLE DS_SETFONT | DS_CENTER | WS_CAPTION CAPTION "Vis Hukommelse" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - CONTROL "8 bit",IDC_8_BIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP, - 10,4,29,10 - CONTROL "16 bit",IDC_16_BIT,"Button",BS_AUTORADIOBUTTON,44,4,33, - 10 - CONTROL "32 bit",IDC_32_BIT,"Button",BS_AUTORADIOBUTTON,82,4,33, - 10 + CONTROL "8 bit",IDC_8_BIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,4,29,10 + CONTROL "16 bit",IDC_16_BIT,"Button",BS_AUTORADIOBUTTON,44,4,33,10 + CONTROL "32 bit",IDC_32_BIT,"Button",BS_AUTORADIOBUTTON,82,4,33,10 LTEXT "Gå Til:",IDC_STATIC,130,4,33,10 - EDITTEXT IDC_GOTOMEM,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | - ES_WANTRETURN | WS_GROUP + EDITTEXT IDC_GOTOMEM,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP PUSHBUTTON "&Start",IDC_GO,240,1,20,14 - CONTROL "Rediger",IDC_MEM_BOX,"MemViewBox9",WS_VSCROLL | - WS_TABSTOP,4,16,424,142,WS_EX_CLIENTEDGE + CONTROL "Rediger",IDC_MEM_BOX,"MemViewBox9",WS_VSCROLL | WS_TABSTOP,4,16,424,142,WS_EX_CLIENTEDGE PUSHBUTTON "&Luk",IDC_FERMER,185,162,50,14 - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,327,1,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,382,2,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,394,2,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,327,1,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,382,2,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,394,2,11,14 LTEXT "secs",IDC_STATIC,406,5,16,8 END IDD_IO_REG DIALOGEX 0, 0, 150, 200 -STYLE DS_CENTER | WS_CAPTION +STYLE DS_SETFONT | DS_CENTER | WS_CAPTION CAPTION "IO registers" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN @@ -696,13 +613,9 @@ BEGIN LTEXT "",IDC_IPCSYNC9,60,76,78,8 LTEXT "IPCFIFO :",IDC_STATIC,5,84,41,8 LTEXT "",IDC_IPCFIFO9,60,85,79,8 - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,32,163,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,87,164,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,99,164,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,163,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,87,164,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,99,164,11,14 LTEXT "secs",IDC_STATIC,111,167,16,8 PUSHBUTTON "&Fermer",IDC_FERMER,50,183,50,14 GROUPBOX "ARM9",IDC_STATIC,4,4,142,98 @@ -721,8 +634,8 @@ BEGIN LTEXT "",IDC_IPCFIFO7,60,147,79,8 END -IDD_3DSETTINGS DIALOG DISCARDABLE 0, 0, 174, 73 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_3DSETTINGS DIALOG 0, 0, 174, 73 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "3D settings" FONT 8, "MS Sans Serif" BEGIN @@ -730,8 +643,7 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,117,52,50,14 PUSHBUTTON "Default",IDC_DEFAULT,7,52,50,14 GROUPBOX "Renderer:",IDC_STATIC,7,7,160,39 - COMBOBOX IDC_3DCORE,15,23,146,138,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_3DCORE,15,23,146,138,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END @@ -741,7 +653,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO MOVEABLE PURE +GUIDELINES DESIGNINFO BEGIN IDD_PAL, DIALOG BEGIN @@ -788,7 +700,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -ICONDESMUME ICON DISCARDABLE "DeSmuME.ico" +ICONDESMUME ICON "DeSmuME.ico" #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -796,17 +708,17 @@ ICONDESMUME ICON DISCARDABLE "DeSmuME.ico" // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN "resource.h\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "\r\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\0" END @@ -831,7 +743,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Menu // -MENU_PRINCIPAL MENU DISCARDABLE +MENU_PRINCIPAL MENU BEGIN POPUP "&File" BEGIN @@ -976,7 +888,7 @@ BEGIN END END -RECENTROMS MENU DISCARDABLE +RECENTROMS MENU BEGIN POPUP "Recent ROMs" BEGIN @@ -993,141 +905,103 @@ END // IDD_LIGHT_VIEWER DIALOGEX 0, 0, 197, 89 -STYLE DS_FIXEDSYS | DS_CENTER | WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CAPTION CAPTION "Light Viewer" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "OK",IDOK,140,68,50,14 GROUPBOX "Light0",IDC_LIGHT_VIWER_LIGHT0_GROUP,7,7,90,27 - EDITTEXT IDC_LIGHT_VIEWER_LIGHT0VECTOR_EDIT,58,16,35,14, - ES_AUTOHSCROLL | ES_READONLY | WS_GROUP - EDITTEXT IDC_LIGHT_VIEWER_LIGHT0COLOR_EDIT,33,16,23,14, - ES_AUTOHSCROLL | ES_READONLY | WS_GROUP + EDITTEXT IDC_LIGHT_VIEWER_LIGHT0VECTOR_EDIT,58,16,35,14,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP + EDITTEXT IDC_LIGHT_VIEWER_LIGHT0COLOR_EDIT,33,16,23,14,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP CONTROL "",IDC_LIGHT_VIEWER_LIGHT0COLOR_COLORCTRL, "DeSmuME_ColorCtrl",WS_TABSTOP,11,16,19,14 GROUPBOX "Light1",IDC_LIGHT_VIWER_LIGHT1_GROUP,100,7,90,27 - EDITTEXT IDC_LIGHT_VIEWER_LIGHT1VECTOR_EDIT,151,16,35,14, - ES_AUTOHSCROLL | ES_READONLY | WS_GROUP - EDITTEXT IDC_LIGHT_VIEWER_LIGHT1COLOR_EDIT,126,16,23,14, - ES_AUTOHSCROLL | ES_READONLY | WS_GROUP + EDITTEXT IDC_LIGHT_VIEWER_LIGHT1VECTOR_EDIT,151,16,35,14,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP + EDITTEXT IDC_LIGHT_VIEWER_LIGHT1COLOR_EDIT,126,16,23,14,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP CONTROL "",IDC_LIGHT_VIEWER_LIGHT1COLOR_COLORCTRL, "DeSmuME_ColorCtrl",WS_TABSTOP,104,16,19,14 GROUPBOX "Light2",IDC_LIGHT_VIWER_LIGHT2_GROUP,7,33,90,27 - EDITTEXT IDC_LIGHT_VIEWER_LIGHT2VECTOR_EDIT,58,43,35,14, - ES_AUTOHSCROLL | ES_READONLY | WS_GROUP - EDITTEXT IDC_LIGHT_VIEWER_LIGHT2COLOR_EDIT,33,43,23,14, - ES_AUTOHSCROLL | ES_READONLY | WS_GROUP + EDITTEXT IDC_LIGHT_VIEWER_LIGHT2VECTOR_EDIT,58,43,35,14,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP + EDITTEXT IDC_LIGHT_VIEWER_LIGHT2COLOR_EDIT,33,43,23,14,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP CONTROL "",IDC_LIGHT_VIEWER_LIGHT2COLOR_COLORCTRL, "DeSmuME_ColorCtrl",WS_TABSTOP,11,43,19,14 GROUPBOX "Light3",IDC_LIGHT_VIWER_LIGHT3_GROUP,100,33,90,27 - EDITTEXT IDC_LIGHT_VIEWER_LIGHT3VECTOR_EDIT,151,43,35,14, - ES_AUTOHSCROLL | ES_READONLY | WS_GROUP - EDITTEXT IDC_LIGHT_VIEWER_LIGHT3COLOR_EDIT,126,43,23,14, - ES_AUTOHSCROLL | ES_READONLY | WS_GROUP + EDITTEXT IDC_LIGHT_VIEWER_LIGHT3VECTOR_EDIT,151,43,35,14,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP + EDITTEXT IDC_LIGHT_VIEWER_LIGHT3COLOR_EDIT,126,43,23,14,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP CONTROL "",IDC_LIGHT_VIEWER_LIGHT3COLOR_COLORCTRL, "DeSmuME_ColorCtrl",WS_TABSTOP,104,43,19,14 - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,13,66,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,68,67,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,80,67,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,66,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,68,67,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,80,67,11,14 LTEXT "secs",IDC_STATIC,92,70,16,8 END IDD_CONFIG DIALOGEX 0, 0, 125, 227 -STYLE DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Configure Keys" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "OK",IDC_FERMER,67,208,50,14 PUSHBUTTON "Default",IDC_BUTTON1,7,208,50,14 - COMBOBOX IDC_COMBO1,46,13,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO1,46,13,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Up:",IDC_STATIC,17,14,27,10 - COMBOBOX IDC_COMBO4,46,29,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO4,46,29,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Down:",IDC_STATIC,17,31,28,9 - COMBOBOX IDC_COMBO2,46,45,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO2,46,45,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Left:",IDC_STATIC,17,47,28,9 - COMBOBOX IDC_COMBO3,46,61,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO3,46,61,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Right:",IDC_STATIC,17,63,28,9 - COMBOBOX IDC_COMBO7,46,77,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO7,46,77,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "A:",IDC_STATIC,18,78,28,9 - COMBOBOX IDC_COMBO8,46,92,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO8,46,92,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "B:",IDC_STATIC,17,94,28,9 - COMBOBOX IDC_COMBO10,46,108,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO10,46,108,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "L:",IDC_STATIC,17,110,28,9 - COMBOBOX IDC_COMBO11,46,124,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO11,46,124,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "R:",IDC_STATIC,17,126,28,9 - COMBOBOX IDC_COMBO6,46,140,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO6,46,140,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "X:",IDC_STATIC,17,142,28,9 - COMBOBOX IDC_COMBO5,46,156,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO5,46,156,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Y:",IDC_STATIC,17,158,28,9 GROUPBOX "",IDC_STATIC,7,3,111,203 - COMBOBOX IDC_COMBO9,46,172,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO9,46,172,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Start:",IDC_STATIC,17,174,28,9 - COMBOBOX IDC_COMBO12,46,188,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO12,46,188,59,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Select:",IDC_STATIC,17,190,28,9 END IDD_MEM_VIEWER7 DIALOGEX 0, 0, 428, 178 -STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | - WS_CAPTION +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "View Memory" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "8 bit",IDC_8_BIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP, - 10,4,29,10 - CONTROL "16 bit",IDC_16_BIT,"Button",BS_AUTORADIOBUTTON,44,4,33, - 10 - CONTROL "32 bit",IDC_32_BIT,"Button",BS_AUTORADIOBUTTON,82,4,33, - 10 + CONTROL "8 bit",IDC_8_BIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,4,29,10 + CONTROL "16 bit",IDC_16_BIT,"Button",BS_AUTORADIOBUTTON,44,4,33,10 + CONTROL "32 bit",IDC_32_BIT,"Button",BS_AUTORADIOBUTTON,82,4,33,10 LTEXT "Go to:",IDC_STATIC,130,4,33,10 - EDITTEXT IDC_GOTOMEM,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | - ES_WANTRETURN | WS_GROUP + EDITTEXT IDC_GOTOMEM,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP PUSHBUTTON "&GO",IDC_GO,240,1,20,14 PUSHBUTTON "&Close",IDC_FERMER,185,162,50,14 - CONTROL "Rediger",IDC_MEM_BOX,"MemViewBox7",WS_VSCROLL | - WS_TABSTOP,4,16,424,142,WS_EX_CLIENTEDGE - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,327,1,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,382,2,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,394,2,11,14 + CONTROL "Rediger",IDC_MEM_BOX,"MemViewBox7",WS_VSCROLL | WS_TABSTOP,4,16,424,142,WS_EX_CLIENTEDGE + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,327,1,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,382,2,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,394,2,11,14 LTEXT "secs",IDC_STATIC,406,5,16,8 END IDD_DESASSEMBLEUR_VIEWER7 DIALOGEX 0, 0, 380, 186 -STYLE DS_CENTER | WS_CAPTION +STYLE DS_SETFONT | DS_CENTER | WS_CAPTION CAPTION "Disassembler" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - CONTROL "Auto ",IDC_AUTO_DES,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,10,4,35,10 + CONTROL "Auto ",IDC_AUTO_DES,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,4,35,10 CONTROL "ARM",IDC_ARM,"Button",BS_AUTORADIOBUTTON,44,4,35,10 CONTROL "Thumb",IDC_THUMB,"Button",BS_AUTORADIOBUTTON,82,4,40,10 LTEXT "Go to:",IDC_STATIC,130,4,33,10 - EDITTEXT IDC_GOTODES,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | - ES_WANTRETURN | WS_GROUP + EDITTEXT IDC_GOTODES,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP PUSHBUTTON "&GO",IDC_GO,240,1,20,14 - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,285,1,54,14 - CONTROL "Edit",IDC_DES_BOX,"DesViewBox7",WS_VSCROLL | WS_TABSTOP, - 4,16,296,150,WS_EX_CLIENTEDGE + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,285,1,54,14 + CONTROL "Edit",IDC_DES_BOX,"DesViewBox7",WS_VSCROLL | WS_TABSTOP,4,16,296,150,WS_EX_CLIENTEDGE PUSHBUTTON "&Close",IDC_FERMER,248,170,50,14 LTEXT "R0 :",IDC_STATIC,304,16,17,8 LTEXT "R1 :",IDC_STATIC,304,24,17,8 @@ -1165,22 +1039,17 @@ BEGIN LTEXT "00000000",IDC_R15,325,136,40,8 LTEXT "",IDC_MODE,327,158,28,8 LTEXT "",IDC_TMP,327,168,40,8 - EDITTEXT IDC_AUTO_UPDATE_SECS,340,3,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,352,2,11,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,340,3,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,352,2,11,14 LTEXT "secs",IDC_STATIC,364,5,16,8 PUSHBUTTON "&Refresh",IDC_REFRESH,162,170,50,14,BS_ICON - EDITTEXT IDC_SETPNUM,5,170,34,14,ES_UPPERCASE | ES_AUTOHSCROLL | - ES_NUMBER | WS_GROUP + EDITTEXT IDC_SETPNUM,5,170,34,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP PUSHBUTTON "&Step",IDC_STEP,41,170,50,14 - CONTROL "Autoupd asm",IDC_AUTOUPDATE_ASM,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,94,172,57,10 + CONTROL "Autoupd asm",IDC_AUTOUPDATE_ASM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,94,172,57,10 END -IDD_GAME_INFO DIALOG DISCARDABLE 0, 0, 150, 150 -STYLE WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_GAME_INFO DIALOG 0, 0, 150, 150 +STYLE DS_SETFONT | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ROM Info" FONT 8, "MS Sans Serif" BEGIN @@ -1202,7 +1071,7 @@ BEGIN END IDD_IO_REG DIALOGEX 0, 0, 150, 200 -STYLE DS_CENTER | WS_CAPTION +STYLE DS_SETFONT | DS_CENTER | WS_CAPTION CAPTION "IO registers" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN @@ -1226,13 +1095,9 @@ BEGIN LTEXT "",IDC_IPCSYNC9,60,76,78,8 LTEXT "IPCFIFO :",IDC_STATIC,5,84,41,8 LTEXT "",IDC_IPCFIFO9,60,85,79,8 - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,32,163,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,87,164,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,99,164,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,163,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,87,164,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,99,164,11,14 LTEXT "secs",IDC_STATIC,111,167,16,8 PUSHBUTTON "&Close",IDC_FERMER,50,183,50,14 GROUPBOX "ARM9",IDC_STATIC,4,4,142,98 @@ -1252,7 +1117,7 @@ BEGIN END IDD_PAL DIALOGEX 0, 0, 120, 184 -STYLE DS_CENTER | WS_CAPTION +STYLE DS_SETFONT | DS_CENTER | WS_CAPTION CAPTION "PAL VIEW" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN @@ -1260,18 +1125,14 @@ BEGIN LTEXT "Pal : 0",IDC_PALNUM,3,21,25,8 SCROLLBAR IDC_SCROLLER,30,18,20,14 PUSHBUTTON "&Close",IDC_FERMER,35,169,50,14 - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,13,150,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,68,151,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,80,151,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,150,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,68,151,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,80,151,11,14 LTEXT "secs",IDC_STATIC,92,154,16,8 END IDD_TILE DIALOGEX 0, 0, 446, 180 -STYLE DS_CENTER | WS_VISIBLE | WS_CAPTION +STYLE DS_SETFONT | DS_CENTER | WS_VISIBLE | WS_CAPTION CAPTION "TILE VIEW" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN @@ -1279,30 +1140,21 @@ BEGIN LTEXT "Pal : 0",IDC_PALNUM,4,31,25,8 SCROLLBAR IDC_SCROLLER,30,28,20,14 COMBOBOX IDC_MEM_SELECT,4,50,90,14,CBS_DROPDOWN | WS_TABSTOP - CONTROL "Bitmap",IDC_BITMAP,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,4,68,35,10 - CONTROL "256 colors",IDC_256COUL,"Button",BS_AUTORADIOBUTTON,4, - 80,55,10 - CONTROL "16 colors",IDC_16COUL,"Button",BS_AUTORADIOBUTTON,4,92, - 50,10 - CONTROL "Edit",IDC_Tile_BOX,"TileViewBox",0x0,100,2,344,160, - WS_EX_CLIENTEDGE - CONTROL "Edit",IDC_MINI_TILE,"MiniTileViewBox",0x0,22,116,56,52, - WS_EX_CLIENTEDGE + CONTROL "Bitmap",IDC_BITMAP,"Button",BS_AUTORADIOBUTTON | WS_GROUP,4,68,35,10 + CONTROL "256 colors",IDC_256COUL,"Button",BS_AUTORADIOBUTTON,4,80,55,10 + CONTROL "16 colors",IDC_16COUL,"Button",BS_AUTORADIOBUTTON,4,92,50,10 + CONTROL "Edit",IDC_Tile_BOX,"TileViewBox",0x0,100,2,344,160,WS_EX_CLIENTEDGE + CONTROL "Edit",IDC_MINI_TILE,"MiniTileViewBox",0x0,22,116,56,52,WS_EX_CLIENTEDGE LTEXT "Tile num : 0",IDC_TILENUM,23,170,100,8 PUSHBUTTON "&Close",IDC_FERMER,198,164,50,14 - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,349,165,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,404,165,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,416,164,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,349,165,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,404,165,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,416,164,11,14 LTEXT "secs",IDC_STATIC,428,167,16,8 END IDD_MAP DIALOGEX 0, 0, 485, 320 -STYLE DS_CENTER | WS_CAPTION +STYLE DS_SETFONT | DS_CENTER | WS_CAPTION CAPTION "MAP VIEW" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN @@ -1322,20 +1174,16 @@ BEGIN LTEXT "Size",IDC_MSIZE,29,82,50,8 LTEXT "Scroll",IDC_SCROLL,30,91,85,8 PUSHBUTTON "&Close",IDC_FERMER,4,300,50,14 - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,4,102,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,59,103,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,71,103,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,102,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,59,103,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,71,103,11,14 LTEXT "secs",IDC_STATIC,83,106,16,8 LTEXT "Visible :",IDC_STATIC,4,50,38,8 LTEXT "CHAR",IDC_CHAR,47,63,85,8 END IDD_OAM DIALOGEX 0, 0, 300, 200 -STYLE DS_CENTER | WS_CAPTION +STYLE DS_SETFONT | DS_CENTER | WS_CAPTION CAPTION "OAM Viewer" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN @@ -1361,26 +1209,20 @@ BEGIN LTEXT "",IDC_PROP0,4,116,86,8 LTEXT "",IDC_PROP1,4,126,86,8 PUSHBUTTON "&Close",IDC_FERMER,50,180,50,14 - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,4,161,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,59,162,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,71,161,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,161,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,59,162,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,71,161,11,14 LTEXT "secs",IDC_STATIC,83,163,16,8 END IDD_SOUNDSETTINGS DIALOGEX 0, 0, 174, 96 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Sound Settings" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN GROUPBOX "Sound Core Settings",-1,3,2,168,28 LTEXT "Sound Core",-1,10,14,40,10 - COMBOBOX IDC_SOUNDCORECB,54,13,110,33,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SOUNDCORECB,54,13,110,33,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Other Settings",-1,3,31,168,43 LTEXT "Buffer Size",-1,10,42,60,10 EDITTEXT IDC_SOUNDBUFFERET,136,41,28,13 @@ -1391,236 +1233,137 @@ BEGIN END IDD_FIRMSETTINGS DIALOGEX 0, 0, 161, 145 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Firmware Settings" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - EDITTEXT IDC_EDIT1,66,14,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | - WS_GROUP - EDITTEXT IDC_EDIT2,66,33,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | - WS_GROUP - COMBOBOX IDC_COMBO1,66,53,84,14,CBS_DROPDOWN | WS_VSCROLL | - WS_TABSTOP - COMBOBOX IDC_COMBO2,66,71,84,14,CBS_DROPDOWN | WS_VSCROLL | - WS_TABSTOP - COMBOBOX IDC_COMBO3,66,88,84,14,CBS_DROPDOWN | WS_VSCROLL | - WS_TABSTOP - COMBOBOX IDC_COMBO4,66,105,84,14,CBS_DROPDOWN | WS_VSCROLL | - WS_TABSTOP + EDITTEXT IDC_EDIT1,66,14,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP + EDITTEXT IDC_EDIT2,66,33,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP + COMBOBOX IDC_COMBO1,66,53,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO2,66,71,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO3,66,88,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO4,66,105,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP 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 - CONTROL "Birth Month:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | - WS_GROUP,9,72,52,12 - CONTROL "Birthday:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | - WS_GROUP,9,90,52,12 - CONTROL "Language:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | - WS_GROUP,9,106,52,12 - CONTROL "Nickname:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | - WS_GROUP,9,17,52,12 - CONTROL "Message:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | - WS_GROUP,9,36,52,12 + CONTROL "Favourite Color:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,55,52,12 + CONTROL "Birth Month:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,72,52,12 + CONTROL "Birthday:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,90,52,12 + CONTROL "Language:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,106,52,12 + CONTROL "Nickname:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,17,52,12 + CONTROL "Message:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,36,52,12 END IDD_MATRIX_VIEWER DIALOGEX 0, 0, 364, 177 -STYLE DS_FIXEDSYS | DS_CENTER | WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CAPTION CAPTION "Matrix Viewer" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "OK",IDOK,307,156,50,14 GROUPBOX "Projection",IDC_MATRIX_VIEWER_PROJ_GROUP,7,86,173,65 - EDITTEXT IDC_MATRIX_VIEWER_PROJ_11_EDIT,11,95,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_PROJ_21_EDIT,11,108,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_PROJ_31_EDIT,11,122,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_PROJ_41_EDIT,11,135,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_PROJ_12_EDIT,52,95,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_PROJ_22_EDIT,52,108,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_PROJ_32_EDIT,52,122,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_PROJ_42_EDIT,52,135,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_PROJ_13_EDIT,94,95,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_PROJ_23_EDIT,94,108,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_PROJ_33_EDIT,94,122,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_PROJ_43_EDIT,94,135,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_PROJ_14_EDIT,136,95,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_PROJ_24_EDIT,136,108,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_PROJ_34_EDIT,136,122,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_PROJ_44_EDIT,136,135,40,12, - ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_PROJ_11_EDIT,11,95,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_PROJ_21_EDIT,11,108,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_PROJ_31_EDIT,11,122,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_PROJ_41_EDIT,11,135,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_PROJ_12_EDIT,52,95,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_PROJ_22_EDIT,52,108,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_PROJ_32_EDIT,52,122,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_PROJ_42_EDIT,52,135,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_PROJ_13_EDIT,94,95,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_PROJ_23_EDIT,94,108,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_PROJ_33_EDIT,94,122,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_PROJ_43_EDIT,94,135,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_PROJ_14_EDIT,136,95,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_PROJ_24_EDIT,136,108,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_PROJ_34_EDIT,136,122,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_PROJ_44_EDIT,136,135,40,12,ES_AUTOHSCROLL | ES_READONLY GROUPBOX "Position",IDC_MATRIX_VIEWER_COORD_GROUP,7,7,173,80 - EDITTEXT IDC_MATRIX_VIEWER_COORD_11_EDIT,11,15,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_COORD_21_EDIT,11,28,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_COORD_31_EDIT,11,42,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_COORD_41_EDIT,11,55,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_COORD_12_EDIT,52,15,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_COORD_22_EDIT,52,28,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_COORD_32_EDIT,52,42,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_COORD_42_EDIT,52,55,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_COORD_13_EDIT,94,15,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_COORD_23_EDIT,94,28,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_COORD_33_EDIT,94,42,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_COORD_43_EDIT,94,55,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_COORD_14_EDIT,136,15,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_COORD_24_EDIT,136,28,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_COORD_34_EDIT,136,42,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_COORD_44_EDIT,136,55,40,12, - ES_AUTOHSCROLL | ES_READONLY - COMBOBOX IDC_MATRIX_VIEWER_COORD_COMBO,136,70,40,88, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_MATRIX_VIEWER_COORD_11_EDIT,11,15,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_COORD_21_EDIT,11,28,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_COORD_31_EDIT,11,42,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_COORD_41_EDIT,11,55,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_COORD_12_EDIT,52,15,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_COORD_22_EDIT,52,28,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_COORD_32_EDIT,52,42,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_COORD_42_EDIT,52,55,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_COORD_13_EDIT,94,15,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_COORD_23_EDIT,94,28,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_COORD_33_EDIT,94,42,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_COORD_43_EDIT,94,55,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_COORD_14_EDIT,136,15,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_COORD_24_EDIT,136,28,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_COORD_34_EDIT,136,42,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_COORD_44_EDIT,136,55,40,12,ES_AUTOHSCROLL | ES_READONLY + COMBOBOX IDC_MATRIX_VIEWER_COORD_COMBO,136,70,40,88,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Direction",IDC_MATRIX_VIEWER_DIR_GROUP,184,7,173,80 - EDITTEXT IDC_MATRIX_VIEWER_DIR_11_EDIT,188,15,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_DIR_21_EDIT,188,29,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_DIR_31_EDIT,188,42,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_DIR_41_EDIT,188,55,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_DIR_12_EDIT,228,15,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_DIR_22_EDIT,228,29,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_DIR_32_EDIT,228,42,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_DIR_42_EDIT,228,55,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_DIR_13_EDIT,270,15,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_DIR_23_EDIT,270,29,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_DIR_33_EDIT,270,42,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_DIR_43_EDIT,270,55,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_DIR_14_EDIT,312,15,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_DIR_24_EDIT,312,29,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_DIR_34_EDIT,312,42,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_DIR_44_EDIT,312,55,40,12, - ES_AUTOHSCROLL | ES_READONLY - COMBOBOX IDC_MATRIX_VIEWER_DIR_COMBO,312,71,40,88, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_MATRIX_VIEWER_DIR_11_EDIT,188,15,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_DIR_21_EDIT,188,29,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_DIR_31_EDIT,188,42,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_DIR_41_EDIT,188,55,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_DIR_12_EDIT,228,15,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_DIR_22_EDIT,228,29,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_DIR_32_EDIT,228,42,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_DIR_42_EDIT,228,55,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_DIR_13_EDIT,270,15,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_DIR_23_EDIT,270,29,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_DIR_33_EDIT,270,42,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_DIR_43_EDIT,270,55,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_DIR_14_EDIT,312,15,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_DIR_24_EDIT,312,29,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_DIR_34_EDIT,312,42,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_DIR_44_EDIT,312,55,40,12,ES_AUTOHSCROLL | ES_READONLY + COMBOBOX IDC_MATRIX_VIEWER_DIR_COMBO,312,71,40,88,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Texture",IDC_MATRIX_VIEWER_TEX_GROUP,184,86,173,65 - EDITTEXT IDC_MATRIX_VIEWER_TEX_11_EDIT,187,95,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_TEX_21_EDIT,187,108,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_TEX_31_EDIT,187,122,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_TEX_41_EDIT,187,135,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_TEX_12_EDIT,228,95,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_TEX_22_EDIT,228,108,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_TEX_32_EDIT,228,122,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_TEX_42_EDIT,228,135,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_TEX_13_EDIT,270,95,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_TEX_23_EDIT,270,108,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_TEX_33_EDIT,270,122,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_TEX_43_EDIT,270,135,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_TEX_14_EDIT,312,95,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_TEX_24_EDIT,312,108,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_TEX_34_EDIT,312,122,40,12, - ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_MATRIX_VIEWER_TEX_44_EDIT,312,135,40,12, - ES_AUTOHSCROLL | ES_READONLY - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,13,154,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,68,155,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,80,155,11,14 + EDITTEXT IDC_MATRIX_VIEWER_TEX_11_EDIT,187,95,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_TEX_21_EDIT,187,108,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_TEX_31_EDIT,187,122,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_TEX_41_EDIT,187,135,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_TEX_12_EDIT,228,95,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_TEX_22_EDIT,228,108,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_TEX_32_EDIT,228,122,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_TEX_42_EDIT,228,135,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_TEX_13_EDIT,270,95,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_TEX_23_EDIT,270,108,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_TEX_33_EDIT,270,122,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_TEX_43_EDIT,270,135,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_TEX_14_EDIT,312,95,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_TEX_24_EDIT,312,108,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_TEX_34_EDIT,312,122,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_MATRIX_VIEWER_TEX_44_EDIT,312,135,40,12,ES_AUTOHSCROLL | ES_READONLY + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,154,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,68,155,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,80,155,11,14 LTEXT "secs",IDC_STATIC,92,158,16,8 END -IDD_ABOUT_BOX DIALOGEX 0, 0, 212, 284 -STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION +IDD_ABOUT_BOX DIALOGEX 0, 0, 212, 298 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION CAPTION "About DeSmuME..." FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Close",IDC_FERMER,86,263,50,14 - CTEXT "",IDC_AUTHORS_LIST,7,7,198,250,0,WS_EX_CLIENTEDGE + DEFPUSHBUTTON "Close",IDC_FERMER,86,277,50,14 + CTEXT "",IDC_AUTHORS_LIST,7,7,198,264,0,WS_EX_CLIENTEDGE END IDD_INPUT DIALOGEX 0, 0, 325, 148 -STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Configure controls" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - EDITTEXT IDC_EDIT01,32,69,26,14,ES_CENTER | ES_AUTOHSCROLL | - ES_READONLY | ES_WANTRETURN - EDITTEXT IDC_EDIT02,7,83,26,14,ES_CENTER | ES_AUTOHSCROLL | - ES_READONLY - EDITTEXT IDC_EDIT03,57,83,26,14,ES_CENTER | ES_AUTOHSCROLL | - ES_READONLY - EDITTEXT IDC_EDIT04,32,97,26,14,ES_CENTER | ES_AUTOHSCROLL | - ES_READONLY - EDITTEXT IDC_EDIT05,271,97,26,14,ES_CENTER | ES_AUTOHSCROLL | - ES_READONLY - EDITTEXT IDC_EDIT06,290,81,26,14,ES_CENTER | ES_AUTOHSCROLL | - ES_READONLY - EDITTEXT IDC_EDIT07,247,80,26,14,ES_CENTER | ES_AUTOHSCROLL | - ES_READONLY - EDITTEXT IDC_EDIT08,271,63,26,14,ES_CENTER | ES_AUTOHSCROLL | - ES_READONLY - EDITTEXT IDC_EDIT09,7,7,50,14,ES_CENTER | ES_AUTOHSCROLL | - ES_READONLY - EDITTEXT IDC_EDIT10,268,7,50,14,ES_CENTER | ES_AUTOHSCROLL | - ES_READONLY - EDITTEXT IDC_EDIT11,248,30,34,14,ES_CENTER | ES_AUTOHSCROLL | - ES_READONLY - EDITTEXT IDC_EDIT12,285,30,30,14,ES_CENTER | ES_AUTOHSCROLL | - ES_READONLY - EDITTEXT IDC_EDIT13,7,127,26,14,ES_CENTER | ES_AUTOHSCROLL | - ES_READONLY - EDITTEXT IDC_EDIT14,95,127,26,14,ES_CENTER | ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - EDITTEXT IDC_EDIT15,28,30,34,14,ES_CENTER | ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED + EDITTEXT IDC_EDIT01,32,69,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN + EDITTEXT IDC_EDIT02,7,83,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT03,57,83,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT04,32,97,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT05,271,97,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT06,290,81,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT07,247,80,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT08,271,63,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT09,7,7,50,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT10,268,7,50,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT11,248,30,34,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT12,285,30,30,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT13,7,127,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT14,95,127,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + EDITTEXT IDC_EDIT15,28,30,34,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED PUSHBUTTON "OK",IDOK,205,127,50,14 PUSHBUTTON "Cancel",IDCANCEL,268,127,50,14 GROUPBOX "",IDC_STATIC,7,17,311,109 @@ -1644,25 +1387,20 @@ BEGIN END IDD_DESASSEMBLEUR_VIEWER9 DIALOGEX 0, 0, 380, 186 -STYLE DS_CENTER | WS_CAPTION +STYLE DS_SETFONT | DS_CENTER | WS_CAPTION CAPTION "Disassembler" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - CONTROL "Auto ",IDC_AUTO_DES,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,10,4,35,10 + CONTROL "Auto ",IDC_AUTO_DES,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,4,35,10 CONTROL "ARM",IDC_ARM,"Button",BS_AUTORADIOBUTTON,44,4,35,10 CONTROL "Thumb",IDC_THUMB,"Button",BS_AUTORADIOBUTTON,82,4,40,10 LTEXT "Go to:",IDC_STATIC,130,4,33,10 - EDITTEXT IDC_GOTODES,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | - ES_WANTRETURN | WS_GROUP + EDITTEXT IDC_GOTODES,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP PUSHBUTTON "&GO",IDC_GO,240,1,20,14 - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,285,1,54,14 - CONTROL "Edit",IDC_DES_BOX,"DesViewBox9",WS_VSCROLL | WS_TABSTOP, - 4,16,296,150,WS_EX_CLIENTEDGE + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,285,1,54,14 + CONTROL "Edit",IDC_DES_BOX,"DesViewBox9",WS_VSCROLL | WS_TABSTOP,4,16,296,150,WS_EX_CLIENTEDGE PUSHBUTTON "&Close",IDC_FERMER,248,170,50,14 - EDITTEXT IDC_SETPNUM,5,170,34,14,ES_UPPERCASE | ES_AUTOHSCROLL | - ES_NUMBER | WS_GROUP + EDITTEXT IDC_SETPNUM,5,170,34,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP PUSHBUTTON "&Step",IDC_STEP,41,170,50,14 LTEXT "R0 :",IDC_STATIC,304,16,17,8 LTEXT "R1 :",IDC_STATIC,304,24,17,8 @@ -1700,48 +1438,34 @@ BEGIN LTEXT "00000000",IDC_R15,325,136,40,8 LTEXT "",IDC_MODE,327,158,28,8 LTEXT "",IDC_TMP,327,168,40,8 - EDITTEXT IDC_AUTO_UPDATE_SECS,340,3,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,352,2,11,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,340,3,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,352,2,11,14 LTEXT "secs",IDC_STATIC,364,5,16,8 PUSHBUTTON "&Refresh",IDC_REFRESH,162,170,50,14,BS_ICON - CONTROL "Autoupd asm",IDC_AUTOUPDATE_ASM,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,94,172,57,10 + CONTROL "Autoupd asm",IDC_AUTOUPDATE_ASM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,94,172,57,10 END IDD_MEM_VIEWER9 DIALOGEX 0, 0, 428, 178 -STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | - WS_CAPTION +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "View Memory" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "8 bit",IDC_8_BIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP, - 10,4,29,10 - CONTROL "16 bit",IDC_16_BIT,"Button",BS_AUTORADIOBUTTON,44,4,33, - 10 - CONTROL "32 bit",IDC_32_BIT,"Button",BS_AUTORADIOBUTTON,82,4,33, - 10 + CONTROL "8 bit",IDC_8_BIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,4,29,10 + CONTROL "16 bit",IDC_16_BIT,"Button",BS_AUTORADIOBUTTON,44,4,33,10 + CONTROL "32 bit",IDC_32_BIT,"Button",BS_AUTORADIOBUTTON,82,4,33,10 LTEXT "Go to:",IDC_STATIC,130,4,33,10 - EDITTEXT IDC_GOTOMEM,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | - ES_WANTRETURN | WS_GROUP + EDITTEXT IDC_GOTOMEM,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP PUSHBUTTON "&GO",IDC_GO,240,1,20,14 PUSHBUTTON "&Close",IDC_FERMER,185,162,50,14 - CONTROL "Rediger",IDC_MEM_BOX,"MemViewBox9",WS_VSCROLL | - WS_TABSTOP,4,16,424,142,WS_EX_CLIENTEDGE - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,327,1,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,382,2,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,394,2,11,14 + CONTROL "Rediger",IDC_MEM_BOX,"MemViewBox9",WS_VSCROLL | WS_TABSTOP,4,16,424,142,WS_EX_CLIENTEDGE + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,327,1,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,382,2,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,394,2,11,14 LTEXT "secs",IDC_STATIC,406,5,16,8 END -IDD_3DSETTINGS DIALOG DISCARDABLE 0, 0, 174, 73 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_3DSETTINGS DIALOG 0, 0, 174, 73 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "3D settings" FONT 8, "MS Sans Serif" BEGIN @@ -1749,8 +1473,7 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,117,52,50,14 PUSHBUTTON "Default",IDC_DEFAULT,7,52,50,14 GROUPBOX "Renderer:",IDC_STATIC,7,7,160,39 - COMBOBOX IDC_3DCORE,15,23,146,138,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_3DCORE,15,23,146,138,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END @@ -1760,7 +1483,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO MOVEABLE PURE +GUIDELINES DESIGNINFO BEGIN IDD_LIGHT_VIEWER, DIALOG BEGIN @@ -1793,7 +1516,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 205 TOPMARGIN, 7 - BOTTOMMARGIN, 277 + BOTTOMMARGIN, 291 END IDD_INPUT, DIALOG @@ -1833,7 +1556,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH // Menu // -MENU_PRINCIPAL MENU DISCARDABLE +MENU_PRINCIPAL MENU BEGIN POPUP "&Fichier" BEGIN @@ -1976,7 +1699,7 @@ BEGIN END END -RECENTROMS MENU DISCARDABLE +RECENTROMS MENU BEGIN POPUP "ROMs récentes" BEGIN @@ -1993,48 +1716,36 @@ END // IDD_MEM_VIEWER7 DIALOGEX 0, 0, 428, 178 -STYLE DS_CENTER | WS_CAPTION +STYLE DS_SETFONT | DS_CENTER | WS_CAPTION CAPTION "Visualisation de la memoire" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - CONTROL "8 bit",IDC_8_BIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP, - 10,4,29,10 - CONTROL "16 bit",IDC_16_BIT,"Button",BS_AUTORADIOBUTTON,44,4,33, - 10 - CONTROL "32 bit",IDC_32_BIT,"Button",BS_AUTORADIOBUTTON,82,4,33, - 10 + CONTROL "8 bit",IDC_8_BIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,4,29,10 + CONTROL "16 bit",IDC_16_BIT,"Button",BS_AUTORADIOBUTTON,44,4,33,10 + CONTROL "32 bit",IDC_32_BIT,"Button",BS_AUTORADIOBUTTON,82,4,33,10 LTEXT "Aller E:",IDC_STATIC,130,4,33,10 - EDITTEXT IDC_GOTOMEM,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | - ES_WANTRETURN | WS_GROUP + EDITTEXT IDC_GOTOMEM,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP PUSHBUTTON "&GO",IDC_GO,240,1,20,14 - CONTROL "Edit",IDC_MEM_BOX,"MemViewBox7",WS_VSCROLL | WS_TABSTOP, - 4,16,424,142,WS_EX_CLIENTEDGE + CONTROL "Edit",IDC_MEM_BOX,"MemViewBox7",WS_VSCROLL | WS_TABSTOP,4,16,424,142,WS_EX_CLIENTEDGE PUSHBUTTON "&Fermer",IDC_FERMER,185,162,50,14 - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,327,1,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,382,2,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,394,2,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,327,1,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,382,2,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,394,2,11,14 LTEXT "secs",IDC_STATIC,406,5,16,8 END IDD_DESASSEMBLEUR_VIEWER7 DIALOGEX 0, 0, 380, 186 -STYLE DS_CENTER | WS_CAPTION +STYLE DS_SETFONT | DS_CENTER | WS_CAPTION CAPTION "Desassembleur" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - CONTROL "Auto ",IDC_AUTO_DES,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,10,4,35,10 + CONTROL "Auto ",IDC_AUTO_DES,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,4,35,10 CONTROL "ARM",IDC_ARM,"Button",BS_AUTORADIOBUTTON,44,4,35,10 CONTROL "Thumb",IDC_THUMB,"Button",BS_AUTORADIOBUTTON,82,4,40,10 LTEXT "Aller E:",IDC_STATIC,130,4,33,10 - EDITTEXT IDC_GOTODES,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | - ES_WANTRETURN | WS_GROUP + EDITTEXT IDC_GOTODES,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP PUSHBUTTON "&GO",IDC_GO,240,1,20,14 - CONTROL "Edit",IDC_DES_BOX,"DesViewBox7",WS_VSCROLL | WS_TABSTOP, - 4,16,296,150,WS_EX_CLIENTEDGE + CONTROL "Edit",IDC_DES_BOX,"DesViewBox7",WS_VSCROLL | WS_TABSTOP,4,16,296,150,WS_EX_CLIENTEDGE PUSHBUTTON "&Fermer",IDC_FERMER,246,170,50,14 LTEXT "R0 :",IDC_STATIC,304,16,17,8 LTEXT "R1 :",IDC_STATIC,304,24,17,8 @@ -2072,24 +1783,18 @@ BEGIN LTEXT "00000000",IDC_R15,325,136,40,8 LTEXT "",IDC_MODE,327,158,28,8 LTEXT "",IDC_TMP,327,168,40,8 - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,285,1,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,340,3,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,352,2,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,285,1,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,340,3,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,352,2,11,14 LTEXT "secs",IDC_STATIC,364,5,16,8 PUSHBUTTON "&Refresh",IDC_REFRESH,162,170,50,14,BS_ICON - EDITTEXT IDC_SETPNUM,5,170,34,14,ES_UPPERCASE | ES_AUTOHSCROLL | - ES_NUMBER | WS_GROUP + EDITTEXT IDC_SETPNUM,5,170,34,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP PUSHBUTTON "&Step",IDC_STEP,41,170,50,14 - CONTROL "Autoupd asm",IDC_AUTOUPDATE_ASM,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,94,172,57,10 + CONTROL "Autoupd asm",IDC_AUTOUPDATE_ASM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,94,172,57,10 END -IDD_GAME_INFO DIALOG DISCARDABLE 0, 0, 150, 150 -STYLE WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_GAME_INFO DIALOG 0, 0, 150, 150 +STYLE DS_SETFONT | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Info ROM" FONT 8, "MS Sans Serif" BEGIN @@ -2111,28 +1816,23 @@ BEGIN END IDD_PAL DIALOGEX 0, 0, 120, 194 -STYLE WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | WS_CAPTION | WS_SYSMENU CAPTION "PAL VIEW" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN COMBOBOX IDC_PAL_SELECT,15,3,90,14,CBS_DROPDOWN | WS_TABSTOP LTEXT "Pal : 0",IDC_PALNUM,3,21,25,8 SCROLLBAR IDC_SCROLLER,30,18,20,14 - CONTROL "Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,60,18,75,14 + CONTROL "Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,18,75,14 PUSHBUTTON "&Fermer",IDC_FERMER,35,169,50,14 - CONTROL "&Auto-update",IDC_AUTO_UPDATE2,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,13,150,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,68,151,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,80,151,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,150,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,68,151,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,80,151,11,14 LTEXT "secs",IDC_STATIC,92,154,16,8 END IDD_TILE DIALOGEX 0, 0, 446, 180 -STYLE WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | WS_CAPTION | WS_SYSMENU CAPTION "TILE VIEW" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN @@ -2140,30 +1840,21 @@ BEGIN LTEXT "Pal : 0",IDC_PALNUM,4,31,25,8 SCROLLBAR IDC_SCROLLER,30,28,20,14 COMBOBOX IDC_MEM_SELECT,4,50,90,14,CBS_DROPDOWN | WS_TABSTOP - CONTROL "Bitmap",IDC_BITMAP,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,4,68,35,10 - CONTROL "256 couleurs",IDC_256COUL,"Button",BS_AUTORADIOBUTTON,4, - 80,55,10 - CONTROL "16 couleurs",IDC_16COUL,"Button",BS_AUTORADIOBUTTON,4, - 92,50,10 - CONTROL "Edit",IDC_Tile_BOX,"TileViewBox",WS_TABSTOP,100,2,344, - 160,WS_EX_CLIENTEDGE - CONTROL "Edit",IDC_MINI_TILE,"MiniTileViewBox",WS_TABSTOP,22,116, - 56,52,WS_EX_CLIENTEDGE + CONTROL "Bitmap",IDC_BITMAP,"Button",BS_AUTORADIOBUTTON | WS_GROUP,4,68,35,10 + CONTROL "256 couleurs",IDC_256COUL,"Button",BS_AUTORADIOBUTTON,4,80,55,10 + CONTROL "16 couleurs",IDC_16COUL,"Button",BS_AUTORADIOBUTTON,4,92,50,10 + CONTROL "Edit",IDC_Tile_BOX,"TileViewBox",WS_TABSTOP,100,2,344,160,WS_EX_CLIENTEDGE + CONTROL "Edit",IDC_MINI_TILE,"MiniTileViewBox",WS_TABSTOP,22,116,56,52,WS_EX_CLIENTEDGE LTEXT "Tile num : 0",IDC_TILENUM,23,170,100,8 PUSHBUTTON "&Fermer",IDC_FERMER,198,164,50,14 - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,349,165,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,404,165,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,416,164,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,349,165,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,404,165,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,416,164,11,14 LTEXT "secs",IDC_STATIC,428,167,16,8 END IDD_MAP DIALOGEX 0, 0, 485, 320 -STYLE DS_CENTER | WS_CAPTION +STYLE DS_SETFONT | DS_CENTER | WS_CAPTION CAPTION "MAP VIEW" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN @@ -2183,18 +1874,14 @@ BEGIN LTEXT "",IDC_MSIZE,48,70,85,8 LTEXT "",IDC_SCROLL,48,80,85,8 PUSHBUTTON "&Fermer",IDC_FERMER,4,300,50,14 - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,4,92,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,59,93,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,71,93,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,92,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,59,93,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,71,93,11,14 LTEXT "secs",IDC_STATIC,83,96,16,8 END IDD_OAM DIALOGEX 0, 0, 300, 200 -STYLE WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | WS_CAPTION | WS_SYSMENU CAPTION "OAM Viewer" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN @@ -2220,31 +1907,24 @@ BEGIN LTEXT "",IDC_PROP0,4,116,86,8 LTEXT "",IDC_PROP1,4,126,86,8 PUSHBUTTON "&Fermer",IDC_FERMER,50,180,50,14 - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,4,161,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,59,162,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,71,161,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,161,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,59,162,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,71,161,11,14 LTEXT "secs",IDC_STATIC,83,163,16,8 END IDD_DESASSEMBLEUR_VIEWER9 DIALOGEX 0, 0, 380, 186 -STYLE DS_CENTER | WS_CAPTION +STYLE DS_SETFONT | DS_CENTER | WS_CAPTION CAPTION "Desassembleur" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - CONTROL "Auto ",IDC_AUTO_DES,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,10,4,35,10 + CONTROL "Auto ",IDC_AUTO_DES,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,4,35,10 CONTROL "ARM",IDC_ARM,"Button",BS_AUTORADIOBUTTON,44,4,35,10 CONTROL "Thumb",IDC_THUMB,"Button",BS_AUTORADIOBUTTON,82,4,40,10 LTEXT "Aller E:",IDC_STATIC,130,4,33,10 - EDITTEXT IDC_GOTODES,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | - ES_WANTRETURN | WS_GROUP + EDITTEXT IDC_GOTODES,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP PUSHBUTTON "&GO",IDC_GO,240,1,20,14 - CONTROL "Edit",IDC_DES_BOX,"DesViewBox9",WS_VSCROLL | WS_TABSTOP, - 4,16,296,150,WS_EX_CLIENTEDGE + CONTROL "Edit",IDC_DES_BOX,"DesViewBox9",WS_VSCROLL | WS_TABSTOP,4,16,296,150,WS_EX_CLIENTEDGE PUSHBUTTON "&Fermer",IDC_FERMER,246,170,50,14 LTEXT "R0 :",IDC_STATIC,304,16,17,8 LTEXT "R1 :",IDC_STATIC,304,24,17,8 @@ -2282,52 +1962,37 @@ BEGIN LTEXT "00000000",IDC_R15,325,136,40,8 LTEXT "",IDC_MODE,327,158,28,8 LTEXT "",IDC_TMP,327,168,40,8 - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,285,1,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,340,3,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,352,2,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,285,1,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,340,3,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,352,2,11,14 LTEXT "secs",IDC_STATIC,364,5,16,8 PUSHBUTTON "&Refresh",IDC_REFRESH,162,170,50,14,BS_ICON - EDITTEXT IDC_SETPNUM,5,170,34,14,ES_UPPERCASE | ES_AUTOHSCROLL | - ES_NUMBER | WS_GROUP + EDITTEXT IDC_SETPNUM,5,170,34,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP PUSHBUTTON "&Step",IDC_STEP,41,170,50,14 - CONTROL "Autoupd asm",IDC_AUTOUPDATE_ASM,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,94,172,57,10 + CONTROL "Autoupd asm",IDC_AUTOUPDATE_ASM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,94,172,57,10 END IDD_MEM_VIEWER9 DIALOGEX 0, 0, 428, 178 -STYLE DS_CENTER | WS_CAPTION +STYLE DS_SETFONT | DS_CENTER | WS_CAPTION CAPTION "Visualisation de la memoire" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - CONTROL "8 bit",IDC_8_BIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP, - 10,4,29,10 - CONTROL "16 bit",IDC_16_BIT,"Button",BS_AUTORADIOBUTTON,44,4,33, - 10 - CONTROL "32 bit",IDC_32_BIT,"Button",BS_AUTORADIOBUTTON,82,4,33, - 10 + CONTROL "8 bit",IDC_8_BIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,4,29,10 + CONTROL "16 bit",IDC_16_BIT,"Button",BS_AUTORADIOBUTTON,44,4,33,10 + CONTROL "32 bit",IDC_32_BIT,"Button",BS_AUTORADIOBUTTON,82,4,33,10 LTEXT "Aller E:",IDC_STATIC,130,4,33,10 - EDITTEXT IDC_GOTOMEM,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | - ES_WANTRETURN | WS_GROUP + EDITTEXT IDC_GOTOMEM,155,1,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP PUSHBUTTON "&GO",IDC_GO,240,1,20,14 - CONTROL "Edit",IDC_MEM_BOX,"MemViewBox9",WS_VSCROLL | WS_TABSTOP, - 4,16,424,142,WS_EX_CLIENTEDGE + CONTROL "Edit",IDC_MEM_BOX,"MemViewBox9",WS_VSCROLL | WS_TABSTOP,4,16,424,142,WS_EX_CLIENTEDGE PUSHBUTTON "&Fermer",IDC_FERMER,185,162,50,14 - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,327,1,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,382,2,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,394,2,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,327,1,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,382,2,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,394,2,11,14 LTEXT "secs",IDC_STATIC,406,5,16,8 END IDD_IO_REG DIALOGEX 0, 0, 150, 200 -STYLE DS_CENTER | WS_CAPTION +STYLE DS_SETFONT | DS_CENTER | WS_CAPTION CAPTION "IO registre" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN @@ -2351,13 +2016,9 @@ BEGIN LTEXT "",IDC_IPCSYNC9,60,76,78,8 LTEXT "IPCFIFO :",IDC_STATIC,5,84,41,8 LTEXT "",IDC_IPCFIFO9,60,85,79,8 - CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,32,163,54,14 - EDITTEXT IDC_AUTO_UPDATE_SECS,87,164,12,14,ES_AUTOHSCROLL | - ES_READONLY | WS_DISABLED - CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32", - UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_DISABLED,99,164,11,14 + CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,163,54,14 + EDITTEXT IDC_AUTO_UPDATE_SECS,87,164,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,99,164,11,14 LTEXT "secs",IDC_STATIC,111,167,16,8 PUSHBUTTON "&Luk",IDC_FERMER,50,183,50,14 GROUPBOX "ARM9",IDC_STATIC,4,4,142,98 @@ -2376,8 +2037,8 @@ BEGIN LTEXT "",IDC_IPCFIFO7,60,147,79,8 END -IDD_3DSETTINGS DIALOG DISCARDABLE 0, 0, 174, 73 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_3DSETTINGS DIALOG 0, 0, 174, 73 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Configuration 3D" FONT 8, "MS Sans Serif" BEGIN @@ -2385,42 +2046,28 @@ BEGIN PUSHBUTTON "Annuler",IDCANCEL,117,52,50,14 PUSHBUTTON "Par défaut",IDC_DEFAULT,7,52,50,14 GROUPBOX "Moteur de rendu :",IDC_STATIC,7,7,160,39 - COMBOBOX IDC_3DCORE,15,23,146,138,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_3DCORE,15,23,146,138,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END -IDD_FIRMSETTINGS DIALOG DISCARDABLE 0, 0, 161, 145 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU +IDD_FIRMSETTINGS DIALOG 0, 0, 161, 145 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Configuration du firmware" FONT 8, "MS Sans Serif" BEGIN - EDITTEXT IDC_EDIT1,66,14,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | - WS_GROUP - EDITTEXT IDC_EDIT2,66,33,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | - WS_GROUP - COMBOBOX IDC_COMBO1,66,53,84,14,CBS_DROPDOWN | WS_VSCROLL | - WS_TABSTOP - COMBOBOX IDC_COMBO2,66,71,84,14,CBS_DROPDOWN | WS_VSCROLL | - WS_TABSTOP - COMBOBOX IDC_COMBO3,66,88,84,14,CBS_DROPDOWN | WS_VSCROLL | - WS_TABSTOP - COMBOBOX IDC_COMBO4,66,105,84,14,CBS_DROPDOWN | WS_VSCROLL | - WS_TABSTOP + EDITTEXT IDC_EDIT1,66,14,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP + EDITTEXT IDC_EDIT2,66,33,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP + COMBOBOX IDC_COMBO1,66,53,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO2,66,71,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO3,66,88,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO4,66,105,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "&OK",IDOK,7,124,50,14 PUSHBUTTON "&Cancel",IDCANCEL,104,124,50,14 - CONTROL "Couleur préférée:",IDC_STATIC,"Static", - SS_LEFTNOWORDWRAP | WS_GROUP,9,55,54,12 - CONTROL "Mois naissance:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | - WS_GROUP,9,72,56,12 - CONTROL "Jour naissance:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | - WS_GROUP,9,90,52,12 - CONTROL "Langage:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | - WS_GROUP,9,106,52,12 - CONTROL "Pseudonyme:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | - WS_GROUP,9,17,52,12 - CONTROL "Message:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | - WS_GROUP,9,36,52,12 + CONTROL "Couleur préférée:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,55,54,12 + CONTROL "Mois naissance:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,72,56,12 + CONTROL "Jour naissance:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,90,52,12 + CONTROL "Langage:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,106,52,12 + CONTROL "Pseudonyme:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,17,52,12 + CONTROL "Message:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,9,36,52,12 END @@ -2430,7 +2077,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO MOVEABLE PURE +GUIDELINES DESIGNINFO BEGIN IDD_PAL, DIALOG BEGIN