From 5d590e4054937b31229ebde6dfd1363c8f8de468 Mon Sep 17 00:00:00 2001 From: adelikat Date: Tue, 25 May 2010 16:48:52 +0000 Subject: [PATCH] Win32 - TASEdit - Pause toggle button --- src/drivers/win/res.rc | 41 +++++++++++++++++++------------------ src/drivers/win/resource.h | 2 ++ src/drivers/win/tasedit.cpp | 5 +++++ 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc index b1cbdc24..6139d010 100644 --- a/src/drivers/win/res.rc +++ b/src/drivers/win/res.rc @@ -1314,29 +1314,30 @@ BEGIN EDITTEXT IDC_LABEL_NEWPPUUSED,76,164,155,12,ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP END -TASEDIT DIALOGEX 0, 0, 465, 382 +TASEDIT DIALOGEX 0, 0, 474, 383 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | 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,11,324,364 - PUSHBUTTON "Truncate",IDC_HACKY1,338,46,51,16 - LTEXT "Any number of these icon buttons are pressed",IDC_STATIC,395,84,47,34 - PUSHBUTTON "<",TASEDIT_REWIND,367,25,26,14 - PUSHBUTTON ">",TASEDIT_FOWARD,391,25,26,14 - PUSHBUTTON "<<",TASEDIT_REWIND_FULL,341,25,26,14 - PUSHBUTTON ">>",TASEDIT_FOWARD_FULL,417,25,26,14 - GROUPBOX "Frames",IDC_STATIC,335,11,120,176 - GROUPBOX "Project Input Logs",IDC_STATIC,335,200,120,175 - PUSHBUTTON "Record P1",IDC_BUTTON5,340,95,50,14,WS_DISABLED - PUSHBUTTON "Record P2",IDC_BUTTON7,340,79,50,14,WS_DISABLED - LTEXT "After current frame",IDC_STATIC,337,62,67,11 - PUSHBUTTON "Union Mode",IDC_BUTTON8,340,111,50,14,WS_DISABLED - EDITTEXT IDC_EDIT1,341,149,40,14,ES_AUTOHSCROLL - PUSHBUTTON "Send",IDC_BUTTON9,385,148,31,14,WS_DISABLED - LTEXT "Sends to Notes column",IDC_STATIC,341,137,74,8 - CONTROL "",IDC_LIST2,"SysListView32",LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,340,215,115,160 + CONTROL "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,11,324,365 + PUSHBUTTON "Truncate",IDC_HACKY1,345,46,51,16 + LTEXT "Any number of these icon buttons are pressed",IDC_STATIC,402,84,47,34 + PUSHBUTTON "<",TASEDIT_REWIND,367,22,22,14 + PUSHBUTTON ">",TASEDIT_FOWARD,410,22,22,14 + PUSHBUTTON "<<",TASEDIT_REWIND_FULL,345,22,22,14 + PUSHBUTTON ">>",TASEDIT_FOWARD_FULL,431,22,22,14 + GROUPBOX "Frames",IDC_STATIC,344,11,120,176 + GROUPBOX "Project Input Logs",IDC_STATIC,344,201,120,175 + PUSHBUTTON "Record P1",IDC_BUTTON5,347,95,50,14,WS_DISABLED + PUSHBUTTON "Record P2",IDC_BUTTON7,347,79,50,14,WS_DISABLED + LTEXT "After current frame",IDC_STATIC,347,62,67,11 + PUSHBUTTON "Union Mode",IDC_BUTTON8,347,111,50,14,WS_DISABLED + EDITTEXT IDC_EDIT1,348,149,40,14,ES_AUTOHSCROLL + PUSHBUTTON "Send",IDC_BUTTON9,392,148,31,14,WS_DISABLED + LTEXT "Sends to Notes column",IDC_STATIC,348,137,74,8 + CONTROL "",IDC_LIST2,"SysListView32",LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,349,216,115,160 + PUSHBUTTON "||",TASEDIT_PLAYSTOP,389,22,22,14 END ASSEMBLER DIALOGEX 0, 0, 202, 135 @@ -1798,9 +1799,9 @@ BEGIN "TASEDIT", DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 455 + RIGHTMARGIN, 464 TOPMARGIN, 11 - BOTTOMMARGIN, 375 + BOTTOMMARGIN, 376 END "ASSEMBLER", DIALOG diff --git a/src/drivers/win/resource.h b/src/drivers/win/resource.h index 0037f987..fe78e9b0 100644 --- a/src/drivers/win/resource.h +++ b/src/drivers/win/resource.h @@ -377,6 +377,8 @@ #define TASEDIT_REWIND_FULL 1135 #define IDC_BUTTON4 1136 #define TASEDIT_FOWARD_FULL 1136 +#define TASEDIT_REWIND2 1137 +#define TASEDIT_PLAYSTOP 1137 #define IDC_RADIO1 1138 #define IDC_RADIO2 1139 #define IDC_RADIO3 1140 diff --git a/src/drivers/win/tasedit.cpp b/src/drivers/win/tasedit.cpp index 0d1972e1..441683da 100644 --- a/src/drivers/win/tasedit.cpp +++ b/src/drivers/win/tasedit.cpp @@ -1199,6 +1199,11 @@ BOOL CALLBACK WndprocTasEdit(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar if (currFrameCounter>0) JumpToFrame(currFrameCounter-1); break; + + case TASEDIT_PLAYSTOP: + //Pause/Unpses (Play/Stop) movie + FCEUI_ToggleEmulationPause(); + break; case TASEDIT_REWIND_FULL: //rewinds to beginning of movie