From c3d11e6a0c39709b0a1caa9f65e268e98accb544 Mon Sep 17 00:00:00 2001 From: adelikat Date: Wed, 2 Jul 2008 02:46:59 +0000 Subject: [PATCH] TASEdit dialog changes (and minor changes to input.cpp --- src/drivers/win/res.rc | 28 +++++++++++++++++++++------- src/drivers/win/resource.h | 12 +++++++++++- src/input.cpp | 10 +++++----- 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc index 895e0557..491d078d 100644 --- a/src/drivers/win/res.rc +++ b/src/drivers/win/res.rc @@ -1261,15 +1261,29 @@ BEGIN PUSHBUTTON "Metadata...",IDC_BUTTON_METADATA,239,71,50,14 END -TASEDIT DIALOGEX 0, 0, 513, 356 +TASEDIT DIALOGEX 0, 0, 465, 382 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "TAS Editor" MENU TASEDITMENU FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,302,342 - PUSHBUTTON "Hacky truncate after current frame",IDC_HACKY1,347,7,124,38 - LTEXT "I think this will prove useful enough for a hotkey at some point",IDC_STATIC,347,46,125,16 + CONTROL "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,11,324,364 + PUSHBUTTON "Truncate",IDC_HACKY1,338,80,51,16 + LTEXT "After current frame",IDC_STATIC,338,97,67,11 + PUSHBUTTON "<",IDC_BUTTON1,367,33,26,14 + PUSHBUTTON ">",IDC_BUTTON2,391,33,26,14 + PUSHBUTTON "<<",IDC_BUTTON3,341,33,26,14 + PUSHBUTTON ">>",IDC_BUTTON4,417,33,26,14 + LTEXT "<< rewinds to previous breakpoint, < to previous frame",IDC_STATIC,342,49,103,23 + GROUPBOX "Static",IDC_STATIC,335,11,120,176 + GROUPBOX "Macros",IDC_STATIC,335,200,120,175 + LTEXT "< Extra column for user notes/ram values",IDC_STATIC,321,19,134,8 + CONTROL "Record",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,339,153,39,10 + CONTROL "Union",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,339,164,34,10 + CONTROL "Play",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,339,144,29,10 + COMBOBOX IDC_COMBO1,343,222,48,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "To select macro",IDC_STATIC,394,225,51,8 + PUSHBUTTON "Insert Macro",IDC_BUTTON6,342,244,49,14 END ASSEMBLER DIALOGEX 0, 0, 202, 135 @@ -1522,9 +1536,9 @@ BEGIN "TASEDIT", DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 506 - TOPMARGIN, 7 - BOTTOMMARGIN, 349 + RIGHTMARGIN, 455 + TOPMARGIN, 11 + BOTTOMMARGIN, 375 END "ASSEMBLER", DIALOG diff --git a/src/drivers/win/resource.h b/src/drivers/win/resource.h index 53a574f3..c8971258 100644 --- a/src/drivers/win/resource.h +++ b/src/drivers/win/resource.h @@ -447,6 +447,16 @@ #define IDC_HACKY1 1132 #define IDC_BUTTON_METADATA 1132 #define IDC_HACKYEXPORT 1133 +#define IDC_BUTTON1 1133 +#define IDC_BUTTON2 1134 +#define IDC_BUTTON3 1135 +#define IDC_BUTTON4 1136 +#define IDC_RADIO1 1138 +#define IDC_RADIO2 1139 +#define IDC_RADIO3 1140 +#define IDC_LIST2 1141 +#define IDC_COMBO1 1142 +#define IDC_BUTTON6 1143 #define MENU_NETWORK 40040 #define MENU_PALETTE 40041 #define MENU_SOUND 40042 @@ -547,7 +557,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 121 #define _APS_NEXT_COMMAND_VALUE 40159 -#define _APS_NEXT_CONTROL_VALUE 1133 +#define _APS_NEXT_CONTROL_VALUE 1144 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/src/input.cpp b/src/input.cpp index e7909923..8295a20c 100644 --- a/src/input.cpp +++ b/src/input.cpp @@ -738,11 +738,11 @@ struct EMUCMDTABLE FCEUI_CommandTable[]= { EMUCMD_VSUNI_TOGGLE_DIP_7, EMUCMDTYPE_VSUNI, CommandToggleDip, 0, 0, "Toggle Dipswitch 7", 0 }, { EMUCMD_VSUNI_TOGGLE_DIP_8, EMUCMDTYPE_VSUNI, CommandToggleDip, 0, 0, "Toggle Dipswitch 8", 0 }, { EMUCMD_VSUNI_TOGGLE_DIP_9, EMUCMDTYPE_VSUNI, CommandToggleDip, 0, 0, "Toggle Dipswitch 9", 0 }, - { EMUCMD_MISC_AUTOSAVE, EMUCMDTYPE_MISC, FCEUI_Autosave, 0, 0, "Auto-save", 0 }, - { EMUCMD_MISC_SHOWSTATES, EMUCMDTYPE_MISC, ViewSlots, 0,0, "View save slots",0 }, - { EMUCMD_MISC_USE_INPUT_PRESET_1, EMUCMDTYPE_MISC, CommandUsePreset, 0,0, "Use Input Preset 1", 0 }, - { EMUCMD_MISC_USE_INPUT_PRESET_2, EMUCMDTYPE_MISC, CommandUsePreset, 0,0, "Use Input Preset 2", 0 }, - { EMUCMD_MISC_USE_INPUT_PRESET_3, EMUCMDTYPE_MISC, CommandUsePreset, 0,0, "Use Input Preset 3", 0 }, + { EMUCMD_MISC_AUTOSAVE, EMUCMDTYPE_MISC, FCEUI_Autosave, 0, 0, "Load Last Auto-save", 0}, + { EMUCMD_MISC_SHOWSTATES, EMUCMDTYPE_MISC, ViewSlots, 0, 0, "View save slots", 0 }, + { EMUCMD_MISC_USE_INPUT_PRESET_1, EMUCMDTYPE_MISC, CommandUsePreset, 0, 0, "Use Input Preset 1", 0 }, + { EMUCMD_MISC_USE_INPUT_PRESET_2, EMUCMDTYPE_MISC, CommandUsePreset, 0, 0, "Use Input Preset 2", 0 }, + { EMUCMD_MISC_USE_INPUT_PRESET_3, EMUCMDTYPE_MISC, CommandUsePreset, 0, 0, "Use Input Preset 3", 0 }, }; #define NUM_EMU_CMDS (sizeof(FCEUI_CommandTable)/sizeof(FCEUI_CommandTable[0]))