diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc
index f468630a..85753716 100644
--- a/src/drivers/win/res.rc
+++ b/src/drivers/win/res.rc
@@ -1444,6 +1444,23 @@ BEGIN
LTEXT "made by zeromus & adelikat",IDC_STATIC,138,35,96,9,SS_NOPREFIX
END
+IDD_TASEDITOR_NEWPROJECT DIALOGEX 0, 0, 171, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Create New Project"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,7,80,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,114,80,50,14
+ CONTROL " Copy current input",IDC_COPY_INPUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,80,14,75,10
+ CONTROL " 1 player",IDC_RADIO_1PLAYER,"Button",BS_AUTORADIOBUTTON,16,14,45,10
+ CONTROL " 2 players",IDC_RADIO_2PLAYERS,"Button",BS_AUTORADIOBUTTON,16,27,45,10
+ CONTROL " Fourscore",IDC_RADIO_FOURSCORE,"Button",BS_AUTORADIOBUTTON,16,40,45,10
+ CONTROL " Copy current markers",IDC_COPY_MARKERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,80,27,83,10
+ GROUPBOX "Input type",IDC_STATIC,5,3,67,52,BS_CENTER
+ EDITTEXT IDC_EDIT_AUTHOR,36,61,127,13,ES_AUTOHSCROLL
+ LTEXT "Author:",IDC_STATIC,8,63,26,9
+END
+
IDD_TASEDITOR_EXPORT DIALOGEX 0, 0, 158, 86
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Export to FM2"
@@ -1977,6 +1994,10 @@ BEGIN
BEGIN
END
+ IDD_TASEDITOR_NEWPROJECT, DIALOG
+ BEGIN
+ END
+
IDD_TASEDITOR_EXPORT, DIALOG
BEGIN
END
@@ -2059,55 +2080,6 @@ END
#endif // Нейтральный resources
/////////////////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////////////////
-// Русский (Россия) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_TASEDITOR_NEWPROJECT DIALOGEX 0, 0, 171, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Create New Project"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
- DEFPUSHBUTTON "OK",IDOK,7,80,50,14
- PUSHBUTTON "Cancel",IDCANCEL,114,80,50,14
- CONTROL " Copy current input",IDC_COPY_INPUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,80,14,75,10
- CONTROL " 1 player",IDC_RADIO_1PLAYER,"Button",BS_AUTORADIOBUTTON,16,14,45,10
- CONTROL " 2 players",IDC_RADIO_2PLAYERS,"Button",BS_AUTORADIOBUTTON,16,27,45,10
- CONTROL " Fourscore",IDC_RADIO_FOURSCORE,"Button",BS_AUTORADIOBUTTON,16,40,45,10
- CONTROL " Copy current markers",IDC_COPY_MARKERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,80,27,83,10
- GROUPBOX "Input type",IDC_STATIC,5,3,67,52,BS_CENTER
- EDITTEXT IDC_EDIT_AUTHOR,36,61,127,13,ES_AUTOHSCROLL
- LTEXT "Author:",IDC_STATIC,8,63,26,9
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
-BEGIN
- IDD_TASEDITOR_NEWPROJECT, DIALOG
- BEGIN
- END
-END
-#endif // APSTUDIO_INVOKED
-
-#endif // Русский (Россия) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
/////////////////////////////////////////////////////////////////////////////
// Английский (США) resources
@@ -2262,6 +2234,67 @@ IDB_BITMAP18 BITMAP "res\\te_18.bmp"
IDB_BITMAP19 BITMAP "res\\te_19.bmp"
IDB_TE_ARROW BITMAP "res\\te_arrow.bmp"
IDB_TE_GREEN_ARROW BITMAP "res\\te_green_arrow.bmp"
+IDB_TE_GREEN_BLUE_ARROW BITMAP "res\\te_green_blue_arrow.bmp"
+IDB_PIANO_0 BITMAP "res\\te_piano_0.bmp"
+IDB_PIANO_1 BITMAP "res\\te_piano_1.bmp"
+IDB_PIANO_2 BITMAP "res\\te_piano_2.bmp"
+IDB_PIANO_3 BITMAP "res\\te_piano_3.bmp"
+IDB_PIANO_4 BITMAP "res\\te_piano_4.bmp"
+IDB_PIANO_5 BITMAP "res\\te_piano_5.bmp"
+IDB_PIANO_6 BITMAP "res\\te_piano_6.bmp"
+IDB_PIANO_7 BITMAP "res\\te_piano_7.bmp"
+IDB_PIANO_8 BITMAP "res\\te_piano_8.bmp"
+IDB_PIANO_9 BITMAP "res\\te_piano_9.bmp"
+IDB_PIANO_10 BITMAP "res\\te_piano_10.bmp"
+IDB_PIANO_11 BITMAP "res\\te_piano_11.bmp"
+IDB_PIANO_12 BITMAP "res\\te_piano_12.bmp"
+IDB_PIANO_13 BITMAP "res\\te_piano_13.bmp"
+IDB_PIANO_14 BITMAP "res\\te_piano_14.bmp"
+IDB_PIANO_15 BITMAP "res\\te_piano_15.bmp"
+IDB_PIANO_16 BITMAP "res\\te_piano_16.bmp"
+IDB_PIANO_17 BITMAP "res\\te_piano_17.bmp"
+IDB_PIANO_18 BITMAP "res\\te_piano_18.bmp"
+IDB_PIANO_19 BITMAP "res\\te_piano_19.bmp"
+IDB_PIANO_PLAYBACK_0 BITMAP "res\\te_piano_0_playback.bmp"
+IDB_PIANO_PLAYBACK_1 BITMAP "res\\te_piano_1_playback.bmp"
+IDB_PIANO_PLAYBACK_2 BITMAP "res\\te_piano_2_playback.bmp"
+IDB_PIANO_PLAYBACK_3 BITMAP "res\\te_piano_3_playback.bmp"
+IDB_PIANO_PLAYBACK_4 BITMAP "res\\te_piano_4_playback.bmp"
+IDB_PIANO_PLAYBACK_5 BITMAP "res\\te_piano_5_playback.bmp"
+IDB_PIANO_PLAYBACK_6 BITMAP "res\\te_piano_6_playback.bmp"
+IDB_PIANO_PLAYBACK_7 BITMAP "res\\te_piano_7_playback.bmp"
+IDB_PIANO_PLAYBACK_8 BITMAP "res\\te_piano_8_playback.bmp"
+IDB_PIANO_PLAYBACK_9 BITMAP "res\\te_piano_9_playback.bmp"
+IDB_PIANO_PLAYBACK_10 BITMAP "res\\te_piano_10_playback.bmp"
+IDB_PIANO_PLAYBACK_11 BITMAP "res\\te_piano_11_playback.bmp"
+IDB_PIANO_PLAYBACK_12 BITMAP "res\\te_piano_12_playback.bmp"
+IDB_PIANO_PLAYBACK_13 BITMAP "res\\te_piano_13_playback.bmp"
+IDB_PIANO_PLAYBACK_14 BITMAP "res\\te_piano_14_playback.bmp"
+IDB_PIANO_PLAYBACK_15 BITMAP "res\\te_piano_15_playback.bmp"
+IDB_PIANO_PLAYBACK_16 BITMAP "res\\te_piano_16_playback.bmp"
+IDB_PIANO_PLAYBACK_17 BITMAP "res\\te_piano_17_playback.bmp"
+IDB_PIANO_PLAYBACK_18 BITMAP "res\\te_piano_18_playback.bmp"
+IDB_PIANO_PLAYBACK_19 BITMAP "res\\te_piano_19_playback.bmp"
+IDB_PIANO_LOSTPOS_0 BITMAP "res\\te_piano_0_lostpos.bmp"
+IDB_PIANO_LOSTPOS_1 BITMAP "res\\te_piano_1_lostpos.bmp"
+IDB_PIANO_LOSTPOS_2 BITMAP "res\\te_piano_2_lostpos.bmp"
+IDB_PIANO_LOSTPOS_3 BITMAP "res\\te_piano_3_lostpos.bmp"
+IDB_PIANO_LOSTPOS_4 BITMAP "res\\te_piano_4_lostpos.bmp"
+IDB_PIANO_LOSTPOS_5 BITMAP "res\\te_piano_5_lostpos.bmp"
+IDB_PIANO_LOSTPOS_6 BITMAP "res\\te_piano_6_lostpos.bmp"
+IDB_PIANO_LOSTPOS_7 BITMAP "res\\te_piano_7_lostpos.bmp"
+IDB_PIANO_LOSTPOS_8 BITMAP "res\\te_piano_8_lostpos.bmp"
+IDB_PIANO_LOSTPOS_9 BITMAP "res\\te_piano_9_lostpos.bmp"
+IDB_PIANO_LOSTPOS_10 BITMAP "res\\te_piano_10_lostpos.bmp"
+IDB_PIANO_LOSTPOS_11 BITMAP "res\\te_piano_11_lostpos.bmp"
+IDB_PIANO_LOSTPOS_12 BITMAP "res\\te_piano_12_lostpos.bmp"
+IDB_PIANO_LOSTPOS_13 BITMAP "res\\te_piano_13_lostpos.bmp"
+IDB_PIANO_LOSTPOS_14 BITMAP "res\\te_piano_14_lostpos.bmp"
+IDB_PIANO_LOSTPOS_15 BITMAP "res\\te_piano_15_lostpos.bmp"
+IDB_PIANO_LOSTPOS_16 BITMAP "res\\te_piano_16_lostpos.bmp"
+IDB_PIANO_LOSTPOS_17 BITMAP "res\\te_piano_17_lostpos.bmp"
+IDB_PIANO_LOSTPOS_18 BITMAP "res\\te_piano_18_lostpos.bmp"
+IDB_PIANO_LOSTPOS_19 BITMAP "res\\te_piano_19_lostpos.bmp"
IDB_BRANCH_SPRITESHEET BITMAP "res\\branch_spritesheet.bmp"
#endif // Английский (США) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/src/drivers/win/res/te_arrow.bmp b/src/drivers/win/res/te_arrow.bmp
index 27a905d4..ce71cfa5 100644
Binary files a/src/drivers/win/res/te_arrow.bmp and b/src/drivers/win/res/te_arrow.bmp differ
diff --git a/src/drivers/win/res/te_green_arrow.bmp b/src/drivers/win/res/te_green_arrow.bmp
index ac099ed0..a8bbe3e7 100644
Binary files a/src/drivers/win/res/te_green_arrow.bmp and b/src/drivers/win/res/te_green_arrow.bmp differ
diff --git a/src/drivers/win/res/te_green_blue_arrow.bmp b/src/drivers/win/res/te_green_blue_arrow.bmp
new file mode 100644
index 00000000..56302a41
Binary files /dev/null and b/src/drivers/win/res/te_green_blue_arrow.bmp differ
diff --git a/src/drivers/win/res/te_piano_0.bmp b/src/drivers/win/res/te_piano_0.bmp
new file mode 100644
index 00000000..9cb5a95a
Binary files /dev/null and b/src/drivers/win/res/te_piano_0.bmp differ
diff --git a/src/drivers/win/res/te_piano_0_lostpos.bmp b/src/drivers/win/res/te_piano_0_lostpos.bmp
new file mode 100644
index 00000000..46f2c861
Binary files /dev/null and b/src/drivers/win/res/te_piano_0_lostpos.bmp differ
diff --git a/src/drivers/win/res/te_piano_0_playback.bmp b/src/drivers/win/res/te_piano_0_playback.bmp
new file mode 100644
index 00000000..33281280
Binary files /dev/null and b/src/drivers/win/res/te_piano_0_playback.bmp differ
diff --git a/src/drivers/win/res/te_piano_1.bmp b/src/drivers/win/res/te_piano_1.bmp
new file mode 100644
index 00000000..bded79b3
Binary files /dev/null and b/src/drivers/win/res/te_piano_1.bmp differ
diff --git a/src/drivers/win/res/te_piano_10.bmp b/src/drivers/win/res/te_piano_10.bmp
new file mode 100644
index 00000000..8c3ef6cf
Binary files /dev/null and b/src/drivers/win/res/te_piano_10.bmp differ
diff --git a/src/drivers/win/res/te_piano_10_lostpos.bmp b/src/drivers/win/res/te_piano_10_lostpos.bmp
new file mode 100644
index 00000000..97cd891b
Binary files /dev/null and b/src/drivers/win/res/te_piano_10_lostpos.bmp differ
diff --git a/src/drivers/win/res/te_piano_10_playback.bmp b/src/drivers/win/res/te_piano_10_playback.bmp
new file mode 100644
index 00000000..27a40f8c
Binary files /dev/null and b/src/drivers/win/res/te_piano_10_playback.bmp differ
diff --git a/src/drivers/win/res/te_piano_11.bmp b/src/drivers/win/res/te_piano_11.bmp
new file mode 100644
index 00000000..e1bc04c4
Binary files /dev/null and b/src/drivers/win/res/te_piano_11.bmp differ
diff --git a/src/drivers/win/res/te_piano_11_lostpos.bmp b/src/drivers/win/res/te_piano_11_lostpos.bmp
new file mode 100644
index 00000000..5e76ba2f
Binary files /dev/null and b/src/drivers/win/res/te_piano_11_lostpos.bmp differ
diff --git a/src/drivers/win/res/te_piano_11_playback.bmp b/src/drivers/win/res/te_piano_11_playback.bmp
new file mode 100644
index 00000000..c1993783
Binary files /dev/null and b/src/drivers/win/res/te_piano_11_playback.bmp differ
diff --git a/src/drivers/win/res/te_piano_12.bmp b/src/drivers/win/res/te_piano_12.bmp
new file mode 100644
index 00000000..b30aca89
Binary files /dev/null and b/src/drivers/win/res/te_piano_12.bmp differ
diff --git a/src/drivers/win/res/te_piano_12_lostpos.bmp b/src/drivers/win/res/te_piano_12_lostpos.bmp
new file mode 100644
index 00000000..7284ec56
Binary files /dev/null and b/src/drivers/win/res/te_piano_12_lostpos.bmp differ
diff --git a/src/drivers/win/res/te_piano_12_playback.bmp b/src/drivers/win/res/te_piano_12_playback.bmp
new file mode 100644
index 00000000..3c941285
Binary files /dev/null and b/src/drivers/win/res/te_piano_12_playback.bmp differ
diff --git a/src/drivers/win/res/te_piano_13.bmp b/src/drivers/win/res/te_piano_13.bmp
new file mode 100644
index 00000000..2aebfcff
Binary files /dev/null and b/src/drivers/win/res/te_piano_13.bmp differ
diff --git a/src/drivers/win/res/te_piano_13_lostpos.bmp b/src/drivers/win/res/te_piano_13_lostpos.bmp
new file mode 100644
index 00000000..8ec39074
Binary files /dev/null and b/src/drivers/win/res/te_piano_13_lostpos.bmp differ
diff --git a/src/drivers/win/res/te_piano_13_playback.bmp b/src/drivers/win/res/te_piano_13_playback.bmp
new file mode 100644
index 00000000..04f0b175
Binary files /dev/null and b/src/drivers/win/res/te_piano_13_playback.bmp differ
diff --git a/src/drivers/win/res/te_piano_14.bmp b/src/drivers/win/res/te_piano_14.bmp
new file mode 100644
index 00000000..fc8b00ff
Binary files /dev/null and b/src/drivers/win/res/te_piano_14.bmp differ
diff --git a/src/drivers/win/res/te_piano_14_lostpos.bmp b/src/drivers/win/res/te_piano_14_lostpos.bmp
new file mode 100644
index 00000000..ac62eb33
Binary files /dev/null and b/src/drivers/win/res/te_piano_14_lostpos.bmp differ
diff --git a/src/drivers/win/res/te_piano_14_playback.bmp b/src/drivers/win/res/te_piano_14_playback.bmp
new file mode 100644
index 00000000..4a5f0ee6
Binary files /dev/null and b/src/drivers/win/res/te_piano_14_playback.bmp differ
diff --git a/src/drivers/win/res/te_piano_15.bmp b/src/drivers/win/res/te_piano_15.bmp
new file mode 100644
index 00000000..46f0000f
Binary files /dev/null and b/src/drivers/win/res/te_piano_15.bmp differ
diff --git a/src/drivers/win/res/te_piano_15_lostpos.bmp b/src/drivers/win/res/te_piano_15_lostpos.bmp
new file mode 100644
index 00000000..8003bbfc
Binary files /dev/null and b/src/drivers/win/res/te_piano_15_lostpos.bmp differ
diff --git a/src/drivers/win/res/te_piano_15_playback.bmp b/src/drivers/win/res/te_piano_15_playback.bmp
new file mode 100644
index 00000000..8303e73b
Binary files /dev/null and b/src/drivers/win/res/te_piano_15_playback.bmp differ
diff --git a/src/drivers/win/res/te_piano_16.bmp b/src/drivers/win/res/te_piano_16.bmp
new file mode 100644
index 00000000..3aa400bc
Binary files /dev/null and b/src/drivers/win/res/te_piano_16.bmp differ
diff --git a/src/drivers/win/res/te_piano_16_lostpos.bmp b/src/drivers/win/res/te_piano_16_lostpos.bmp
new file mode 100644
index 00000000..a1bf9062
Binary files /dev/null and b/src/drivers/win/res/te_piano_16_lostpos.bmp differ
diff --git a/src/drivers/win/res/te_piano_16_playback.bmp b/src/drivers/win/res/te_piano_16_playback.bmp
new file mode 100644
index 00000000..c8b34c55
Binary files /dev/null and b/src/drivers/win/res/te_piano_16_playback.bmp differ
diff --git a/src/drivers/win/res/te_piano_17.bmp b/src/drivers/win/res/te_piano_17.bmp
new file mode 100644
index 00000000..56dd4d7f
Binary files /dev/null and b/src/drivers/win/res/te_piano_17.bmp differ
diff --git a/src/drivers/win/res/te_piano_17_lostpos.bmp b/src/drivers/win/res/te_piano_17_lostpos.bmp
new file mode 100644
index 00000000..d8944bf9
Binary files /dev/null and b/src/drivers/win/res/te_piano_17_lostpos.bmp differ
diff --git a/src/drivers/win/res/te_piano_17_playback.bmp b/src/drivers/win/res/te_piano_17_playback.bmp
new file mode 100644
index 00000000..aa4ecfeb
Binary files /dev/null and b/src/drivers/win/res/te_piano_17_playback.bmp differ
diff --git a/src/drivers/win/res/te_piano_18.bmp b/src/drivers/win/res/te_piano_18.bmp
new file mode 100644
index 00000000..bd514540
Binary files /dev/null and b/src/drivers/win/res/te_piano_18.bmp differ
diff --git a/src/drivers/win/res/te_piano_18_lostpos.bmp b/src/drivers/win/res/te_piano_18_lostpos.bmp
new file mode 100644
index 00000000..8ad4d21c
Binary files /dev/null and b/src/drivers/win/res/te_piano_18_lostpos.bmp differ
diff --git a/src/drivers/win/res/te_piano_18_playback.bmp b/src/drivers/win/res/te_piano_18_playback.bmp
new file mode 100644
index 00000000..2c565533
Binary files /dev/null and b/src/drivers/win/res/te_piano_18_playback.bmp differ
diff --git a/src/drivers/win/res/te_piano_19.bmp b/src/drivers/win/res/te_piano_19.bmp
new file mode 100644
index 00000000..79c3caf0
Binary files /dev/null and b/src/drivers/win/res/te_piano_19.bmp differ
diff --git a/src/drivers/win/res/te_piano_19_lostpos.bmp b/src/drivers/win/res/te_piano_19_lostpos.bmp
new file mode 100644
index 00000000..4b933adb
Binary files /dev/null and b/src/drivers/win/res/te_piano_19_lostpos.bmp differ
diff --git a/src/drivers/win/res/te_piano_19_playback.bmp b/src/drivers/win/res/te_piano_19_playback.bmp
new file mode 100644
index 00000000..5712cffb
Binary files /dev/null and b/src/drivers/win/res/te_piano_19_playback.bmp differ
diff --git a/src/drivers/win/res/te_piano_1_lostpos.bmp b/src/drivers/win/res/te_piano_1_lostpos.bmp
new file mode 100644
index 00000000..a2090c8d
Binary files /dev/null and b/src/drivers/win/res/te_piano_1_lostpos.bmp differ
diff --git a/src/drivers/win/res/te_piano_1_playback.bmp b/src/drivers/win/res/te_piano_1_playback.bmp
new file mode 100644
index 00000000..fe51be1c
Binary files /dev/null and b/src/drivers/win/res/te_piano_1_playback.bmp differ
diff --git a/src/drivers/win/res/te_piano_2.bmp b/src/drivers/win/res/te_piano_2.bmp
new file mode 100644
index 00000000..e293767e
Binary files /dev/null and b/src/drivers/win/res/te_piano_2.bmp differ
diff --git a/src/drivers/win/res/te_piano_2_lostpos.bmp b/src/drivers/win/res/te_piano_2_lostpos.bmp
new file mode 100644
index 00000000..2cec218a
Binary files /dev/null and b/src/drivers/win/res/te_piano_2_lostpos.bmp differ
diff --git a/src/drivers/win/res/te_piano_2_playback.bmp b/src/drivers/win/res/te_piano_2_playback.bmp
new file mode 100644
index 00000000..25e7b564
Binary files /dev/null and b/src/drivers/win/res/te_piano_2_playback.bmp differ
diff --git a/src/drivers/win/res/te_piano_3.bmp b/src/drivers/win/res/te_piano_3.bmp
new file mode 100644
index 00000000..81f48131
Binary files /dev/null and b/src/drivers/win/res/te_piano_3.bmp differ
diff --git a/src/drivers/win/res/te_piano_3_lostpos.bmp b/src/drivers/win/res/te_piano_3_lostpos.bmp
new file mode 100644
index 00000000..74c71056
Binary files /dev/null and b/src/drivers/win/res/te_piano_3_lostpos.bmp differ
diff --git a/src/drivers/win/res/te_piano_3_playback.bmp b/src/drivers/win/res/te_piano_3_playback.bmp
new file mode 100644
index 00000000..7e60c640
Binary files /dev/null and b/src/drivers/win/res/te_piano_3_playback.bmp differ
diff --git a/src/drivers/win/res/te_piano_4.bmp b/src/drivers/win/res/te_piano_4.bmp
new file mode 100644
index 00000000..7ce858d9
Binary files /dev/null and b/src/drivers/win/res/te_piano_4.bmp differ
diff --git a/src/drivers/win/res/te_piano_4_lostpos.bmp b/src/drivers/win/res/te_piano_4_lostpos.bmp
new file mode 100644
index 00000000..aaa25867
Binary files /dev/null and b/src/drivers/win/res/te_piano_4_lostpos.bmp differ
diff --git a/src/drivers/win/res/te_piano_4_playback.bmp b/src/drivers/win/res/te_piano_4_playback.bmp
new file mode 100644
index 00000000..c3e8254e
Binary files /dev/null and b/src/drivers/win/res/te_piano_4_playback.bmp differ
diff --git a/src/drivers/win/res/te_piano_5.bmp b/src/drivers/win/res/te_piano_5.bmp
new file mode 100644
index 00000000..7c9cb5fb
Binary files /dev/null and b/src/drivers/win/res/te_piano_5.bmp differ
diff --git a/src/drivers/win/res/te_piano_5_lostpos.bmp b/src/drivers/win/res/te_piano_5_lostpos.bmp
new file mode 100644
index 00000000..cc12e6c3
Binary files /dev/null and b/src/drivers/win/res/te_piano_5_lostpos.bmp differ
diff --git a/src/drivers/win/res/te_piano_5_playback.bmp b/src/drivers/win/res/te_piano_5_playback.bmp
new file mode 100644
index 00000000..70992487
Binary files /dev/null and b/src/drivers/win/res/te_piano_5_playback.bmp differ
diff --git a/src/drivers/win/res/te_piano_6.bmp b/src/drivers/win/res/te_piano_6.bmp
new file mode 100644
index 00000000..f960f233
Binary files /dev/null and b/src/drivers/win/res/te_piano_6.bmp differ
diff --git a/src/drivers/win/res/te_piano_6_lostpos.bmp b/src/drivers/win/res/te_piano_6_lostpos.bmp
new file mode 100644
index 00000000..35ea3fbf
Binary files /dev/null and b/src/drivers/win/res/te_piano_6_lostpos.bmp differ
diff --git a/src/drivers/win/res/te_piano_6_playback.bmp b/src/drivers/win/res/te_piano_6_playback.bmp
new file mode 100644
index 00000000..9b0f9f80
Binary files /dev/null and b/src/drivers/win/res/te_piano_6_playback.bmp differ
diff --git a/src/drivers/win/res/te_piano_7.bmp b/src/drivers/win/res/te_piano_7.bmp
new file mode 100644
index 00000000..56b609a8
Binary files /dev/null and b/src/drivers/win/res/te_piano_7.bmp differ
diff --git a/src/drivers/win/res/te_piano_7_lostpos.bmp b/src/drivers/win/res/te_piano_7_lostpos.bmp
new file mode 100644
index 00000000..45a6ff81
Binary files /dev/null and b/src/drivers/win/res/te_piano_7_lostpos.bmp differ
diff --git a/src/drivers/win/res/te_piano_7_playback.bmp b/src/drivers/win/res/te_piano_7_playback.bmp
new file mode 100644
index 00000000..0952d433
Binary files /dev/null and b/src/drivers/win/res/te_piano_7_playback.bmp differ
diff --git a/src/drivers/win/res/te_piano_8.bmp b/src/drivers/win/res/te_piano_8.bmp
new file mode 100644
index 00000000..8803b979
Binary files /dev/null and b/src/drivers/win/res/te_piano_8.bmp differ
diff --git a/src/drivers/win/res/te_piano_8_lostpos.bmp b/src/drivers/win/res/te_piano_8_lostpos.bmp
new file mode 100644
index 00000000..3cbad746
Binary files /dev/null and b/src/drivers/win/res/te_piano_8_lostpos.bmp differ
diff --git a/src/drivers/win/res/te_piano_8_playback.bmp b/src/drivers/win/res/te_piano_8_playback.bmp
new file mode 100644
index 00000000..8059363d
Binary files /dev/null and b/src/drivers/win/res/te_piano_8_playback.bmp differ
diff --git a/src/drivers/win/res/te_piano_9.bmp b/src/drivers/win/res/te_piano_9.bmp
new file mode 100644
index 00000000..b56b50b4
Binary files /dev/null and b/src/drivers/win/res/te_piano_9.bmp differ
diff --git a/src/drivers/win/res/te_piano_9_lostpos.bmp b/src/drivers/win/res/te_piano_9_lostpos.bmp
new file mode 100644
index 00000000..a0d3ed62
Binary files /dev/null and b/src/drivers/win/res/te_piano_9_lostpos.bmp differ
diff --git a/src/drivers/win/res/te_piano_9_playback.bmp b/src/drivers/win/res/te_piano_9_playback.bmp
new file mode 100644
index 00000000..6bdde322
Binary files /dev/null and b/src/drivers/win/res/te_piano_9_playback.bmp differ
diff --git a/src/drivers/win/resource.h b/src/drivers/win/resource.h
index 4ace07cc..87adf848 100644
--- a/src/drivers/win/resource.h
+++ b/src/drivers/win/resource.h
@@ -241,6 +241,67 @@
#define IDC_DEBUGGER_FLAG_Z 206
#define IDC_DEBUGGER_FLAG_C 207
#define IDC_DEBUGGER_ENABLE_SYMBOLIC 208
+#define IDB_TE_GREEN_BLUE_ARROW 208
+#define IDB_PIANO_0 209
+#define IDB_PIANO_1 210
+#define IDB_PIANO_2 211
+#define IDB_PIANO_3 212
+#define IDB_PIANO_4 213
+#define IDB_PIANO_5 214
+#define IDB_PIANO_6 215
+#define IDB_PIANO_7 216
+#define IDB_PIANO_8 217
+#define IDB_PIANO_9 218
+#define IDB_PIANO_10 219
+#define IDB_PIANO_11 220
+#define IDB_PIANO_12 221
+#define IDB_PIANO_13 222
+#define IDB_PIANO_14 223
+#define IDB_PIANO_15 224
+#define IDB_PIANO_16 225
+#define IDB_PIANO_17 226
+#define IDB_PIANO_18 227
+#define IDB_PIANO_19 228
+#define IDB_PIANO_PLAYBACK_0 229
+#define IDB_PIANO_PLAYBACK_1 230
+#define IDB_PIANO_PLAYBACK_2 231
+#define IDB_PIANO_PLAYBACK_3 232
+#define IDB_PIANO_PLAYBACK_4 233
+#define IDB_PIANO_PLAYBACK_5 234
+#define IDB_PIANO_PLAYBACK_6 235
+#define IDB_PIANO_PLAYBACK_7 236
+#define IDB_PIANO_PLAYBACK_8 237
+#define IDB_PIANO_PLAYBACK_9 238
+#define IDB_PIANO_PLAYBACK_10 239
+#define IDB_PIANO_PLAYBACK_11 240
+#define IDB_PIANO_PLAYBACK_12 241
+#define IDB_PIANO_PLAYBACK_13 242
+#define IDB_PIANO_PLAYBACK_14 243
+#define IDB_PIANO_PLAYBACK_15 244
+#define IDB_PIANO_PLAYBACK_16 245
+#define IDB_PIANO_PLAYBACK_17 246
+#define IDB_PIANO_PLAYBACK_18 247
+#define IDB_PIANO_PLAYBACK_19 248
+#define IDB_PIANO_LOSTPOS_0 249
+#define IDB_PIANO_LOSTPOS_1 250
+#define IDB_PIANO_LOSTPOS_2 251
+#define IDB_PIANO_LOSTPOS_3 252
+#define IDB_PIANO_LOSTPOS_4 253
+#define IDB_PIANO_LOSTPOS_5 254
+#define IDB_PIANO_LOSTPOS_6 255
+#define IDB_PIANO_LOSTPOS_7 256
+#define IDB_PIANO_LOSTPOS_8 257
+#define IDB_PIANO_LOSTPOS_9 258
+#define IDB_PIANO_LOSTPOS_10 259
+#define IDB_PIANO_LOSTPOS_11 260
+#define IDB_PIANO_LOSTPOS_12 261
+#define IDB_PIANO_LOSTPOS_13 262
+#define IDB_PIANO_LOSTPOS_14 263
+#define IDB_PIANO_LOSTPOS_15 264
+#define IDB_PIANO_LOSTPOS_16 265
+#define IDB_PIANO_LOSTPOS_17 266
+#define IDB_PIANO_LOSTPOS_18 267
+#define IDB_PIANO_LOSTPOS_19 268
#define BTN_NETMOO_CONNECT 250
#define MENU_HIDE_MENU 300
#define COMBO_FILTER 300
@@ -1021,7 +1082,7 @@
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 206
+#define _APS_NEXT_RESOURCE_VALUE 269
#define _APS_NEXT_COMMAND_VALUE 40564
#define _APS_NEXT_CONTROL_VALUE 1281
#define _APS_NEXT_SYMED_VALUE 101
diff --git a/src/drivers/win/taseditor/bookmarks.cpp b/src/drivers/win/taseditor/bookmarks.cpp
index 90aaf726..88312216 100644
--- a/src/drivers/win/taseditor/bookmarks.cpp
+++ b/src/drivers/win/taseditor/bookmarks.cpp
@@ -76,8 +76,69 @@ void BOOKMARKS::init()
ListView_SetExtendedListViewStyleEx(hwndBookmarksList, LVS_EX_FULLROWSELECT|LVS_EX_GRIDLINES, LVS_EX_FULLROWSELECT|LVS_EX_GRIDLINES);
// subclass the listview
hwndBookmarksList_oldWndProc = (WNDPROC)SetWindowLong(hwndBookmarksList, GWL_WNDPROC, (LONG)BookmarksListWndProc);
- // setup same images for the listview
- ListView_SetImageList(hwndBookmarksList, piano_roll.himglist, LVSIL_SMALL);
+ // setup images for the listview
+ himglist = ImageList_Create(9, 13, ILC_COLOR8 | ILC_MASK, 1, 1);
+ HBITMAP bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP0));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP1));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP2));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP3));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP4));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP5));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP6));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP7));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP8));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP9));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP10));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP11));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP12));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP13));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP14));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP15));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP16));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP17));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP18));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP19));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ ListView_SetImageList(hwndBookmarksList, himglist, LVSIL_SMALL);
// setup columns
LVCOLUMN lvc;
// icons column
@@ -114,6 +175,11 @@ void BOOKMARKS::init()
void BOOKMARKS::free()
{
bookmarks_array.resize(0);
+ if (himglist)
+ {
+ ImageList_Destroy(himglist);
+ himglist = 0;
+ }
}
void BOOKMARKS::reset()
{
@@ -402,17 +468,17 @@ error:
void BOOKMARKS::RedrawBookmarksCaption()
{
int prev_edit_mode = edit_mode;
- if (taseditor_config.branch_only_when_rec && movie_readonly)
+ if (taseditor_config.view_branches_tree)
+ {
+ edit_mode = EDIT_MODE_BRANCHES;
+ ShowWindow(hwndBookmarksList, SW_HIDE);
+ ShowWindow(hwndBranchesBitmap, SW_SHOW);
+ } else if (taseditor_config.branch_only_when_rec && movie_readonly)
{
edit_mode = EDIT_MODE_BOOKMARKS;
ShowWindow(hwndBranchesBitmap, SW_HIDE);
ShowWindow(hwndBookmarksList, SW_SHOW);
RedrawBookmarksList();
- } else if (taseditor_config.view_branches_tree)
- {
- edit_mode = EDIT_MODE_BRANCHES;
- ShowWindow(hwndBookmarksList, SW_HIDE);
- ShowWindow(hwndBranchesBitmap, SW_SHOW);
} else
{
edit_mode = EDIT_MODE_BOTH;
diff --git a/src/drivers/win/taseditor/bookmarks.h b/src/drivers/win/taseditor/bookmarks.h
index e5db12cd..e7bd56c7 100644
--- a/src/drivers/win/taseditor/bookmarks.h
+++ b/src/drivers/win/taseditor/bookmarks.h
@@ -21,7 +21,7 @@ enum COMMANDS
TOTAL_COMMANDS
};
-#define BOOKMARKSLIST_COLUMN_ICONS_WIDTH 13
+#define BOOKMARKSLIST_COLUMN_ICONS_WIDTH 14
#define BOOKMARKSLIST_COLUMN_FRAMENUM_WIDTH 74
#define BOOKMARKSLIST_COLUMN_TIME_WIDTH 82
@@ -104,5 +104,6 @@ private:
// GDI stuff
HFONT hBookmarksFont;
+ HIMAGELIST himglist;
};
diff --git a/src/drivers/win/taseditor/piano_roll.cpp b/src/drivers/win/taseditor/piano_roll.cpp
index d76bdbf2..93faf491 100644
--- a/src/drivers/win/taseditor/piano_roll.cpp
+++ b/src/drivers/win/taseditor/piano_roll.cpp
@@ -138,65 +138,185 @@ void PIANO_ROLL::init()
// disable Visual Themes for header
SetWindowTheme(hwndHeader, L"", L"");
// setup images for the listview
- himglist = ImageList_Create(9, 13, ILC_COLOR8 | ILC_MASK, 1, 1);
- HBITMAP bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP0));
+ himglist = ImageList_Create(13, 13, ILC_COLOR8 | ILC_MASK, 1, 1);
+ HBITMAP bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_0));
ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
DeleteObject(bmp);
- bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP1));
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_1));
ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
DeleteObject(bmp);
- bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP2));
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_2));
ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
DeleteObject(bmp);
- bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP3));
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_3));
ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
DeleteObject(bmp);
- bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP4));
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_4));
ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
DeleteObject(bmp);
- bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP5));
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_5));
ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
DeleteObject(bmp);
- bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP6));
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_6));
ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
DeleteObject(bmp);
- bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP7));
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_7));
ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
DeleteObject(bmp);
- bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP8));
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_8));
ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
DeleteObject(bmp);
- bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP9));
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_9));
ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
DeleteObject(bmp);
- bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP10));
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_10));
ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
DeleteObject(bmp);
- bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP11));
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_11));
ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
DeleteObject(bmp);
- bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP12));
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_12));
ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
DeleteObject(bmp);
- bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP13));
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_13));
ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
DeleteObject(bmp);
- bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP14));
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_14));
ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
DeleteObject(bmp);
- bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP15));
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_15));
ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
DeleteObject(bmp);
- bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP16));
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_16));
ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
DeleteObject(bmp);
- bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP17));
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_17));
ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
DeleteObject(bmp);
- bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP18));
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_18));
ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
DeleteObject(bmp);
- bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_BITMAP19));
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_19));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_PLAYBACK_0));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_PLAYBACK_1));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_PLAYBACK_2));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_PLAYBACK_3));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_PLAYBACK_4));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_PLAYBACK_5));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_PLAYBACK_6));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_PLAYBACK_7));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_PLAYBACK_8));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_PLAYBACK_9));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_PLAYBACK_10));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_PLAYBACK_11));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_PLAYBACK_12));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_PLAYBACK_13));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_PLAYBACK_14));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_PLAYBACK_15));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_PLAYBACK_16));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_PLAYBACK_17));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_PLAYBACK_18));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_PLAYBACK_19));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_LOSTPOS_0));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_LOSTPOS_1));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_LOSTPOS_2));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_LOSTPOS_3));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_LOSTPOS_4));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_LOSTPOS_5));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_LOSTPOS_6));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_LOSTPOS_7));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_LOSTPOS_8));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_LOSTPOS_9));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_LOSTPOS_10));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_LOSTPOS_11));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_LOSTPOS_12));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_LOSTPOS_13));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_LOSTPOS_14));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_LOSTPOS_15));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_LOSTPOS_16));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_LOSTPOS_17));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_LOSTPOS_18));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_PIANO_LOSTPOS_19));
ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
DeleteObject(bmp);
bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_TE_ARROW));
@@ -205,6 +325,9 @@ void PIANO_ROLL::init()
bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_TE_GREEN_ARROW));
ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
DeleteObject(bmp);
+ bmp = LoadBitmap(fceu_hInstance, MAKEINTRESOURCE(IDB_TE_GREEN_BLUE_ARROW));
+ ImageList_AddMasked(himglist, bmp, 0xFFFFFF);
+ DeleteObject(bmp);
ListView_SetImageList(hwndList, himglist, LVSIL_SMALL);
// setup 0th column
LVCOLUMN lvc;
@@ -1064,10 +1187,24 @@ void PIANO_ROLL::GetDispInfo(NMLVDISPINFO* nmlvDispInfo)
item.iImage = bookmarks.FindBookmarkAtFrame(item.iItem);
if (item.iImage < 0)
{
- if (item.iItem == currFrameCounter)
- item.iImage = ARROW_IMAGE_ID;
- else if (item.iItem == playback.lost_position_frame-1)
- item.iImage = GREEN_ARROW_IMAGE_ID;
+ // no bookmark at this frame
+ if (item.iItem == playback.lost_position_frame - 1)
+ {
+ if (item.iItem == currFrameCounter)
+ item.iImage = GREEN_BLUE_ARROW_IMAGE_ID;
+ else
+ item.iImage = GREEN_ARROW_IMAGE_ID;
+ } else if (item.iItem == currFrameCounter)
+ {
+ item.iImage = BLUE_ARROW_IMAGE_ID;
+ }
+ } else
+ {
+ // bookmark at this frame
+ if (item.iItem == playback.lost_position_frame - 1)
+ item.iImage += BOOKMARKS_WITH_GREEN_ARROW;
+ else if (item.iItem == currFrameCounter)
+ item.iImage += BOOKMARKS_WITH_BLUE_ARROW;
}
break;
}
diff --git a/src/drivers/win/taseditor/piano_roll.h b/src/drivers/win/taseditor/piano_roll.h
index 778a85fc..66920802 100644
--- a/src/drivers/win/taseditor/piano_roll.h
+++ b/src/drivers/win/taseditor/piano_roll.h
@@ -86,10 +86,14 @@ enum DRAG_MODES
#define NUM_COLUMNS_NEED_2ND_FRAMENUM COLUMN_JOYPAD4_R
#define DIGITS_IN_FRAMENUM 7
-#define ARROW_IMAGE_ID 20
-#define GREEN_ARROW_IMAGE_ID 21
-#define COLUMN_ICONS_WIDTH 16
+#define BOOKMARKS_WITH_BLUE_ARROW 20
+#define BOOKMARKS_WITH_GREEN_ARROW 40
+#define BLUE_ARROW_IMAGE_ID 60
+#define GREEN_ARROW_IMAGE_ID 61
+#define GREEN_BLUE_ARROW_IMAGE_ID 62
+
+#define COLUMN_ICONS_WIDTH 17
#define COLUMN_FRAMENUM_WIDTH 75
#define COLUMN_BUTTON_WIDTH 21
@@ -207,7 +211,6 @@ public:
HWND hwndMarkerDragBox, hwndMarkerDragBoxText;
// GDI stuff
- HIMAGELIST himglist;
HFONT hMainListFont, hMainListSelectFont, hMarkersFont, hMarkersEditFont, hTaseditorAboutFont;
HBRUSH bg_brush, marker_drag_box_brush, marker_drag_box_brush_bind;
@@ -225,6 +228,9 @@ private:
HMENU hrmenu;
+ // GDI stuff
+ HIMAGELIST himglist;
+
WNDCLASSEX wincl;
BLENDFUNCTION blend;
diff --git a/src/drivers/win/taseditor/playback.cpp b/src/drivers/win/taseditor/playback.cpp
index 0c55d3df..dfb5e90f 100644
--- a/src/drivers/win/taseditor/playback.cpp
+++ b/src/drivers/win/taseditor/playback.cpp
@@ -137,14 +137,10 @@ void PLAYBACK::update()
}
}
- // forget lost_position_frame when the position is restored
- if (currFrameCounter + 1 >= lost_position_frame)
- lost_position_frame = 0;
-
// pause when seeking hits pause_frame
if(pause_frame && currFrameCounter + 1 >= pause_frame)
SeekingStop();
- else if (!lost_position_frame && currFrameCounter >= currMovieData.getNumRecords()-1 && autopause_at_the_end && taseditor_config.autopause_at_finish)
+ else if (currFrameCounter + 1 > lost_position_frame && currFrameCounter >= currMovieData.getNumRecords()-1 && autopause_at_the_end && taseditor_config.autopause_at_finish)
// pause at the end of the movie
PauseEmulation();
@@ -273,7 +269,7 @@ void PLAYBACK::UnpauseEmulation()
}
void PLAYBACK::RestorePosition()
{
- if (lost_position_frame && lost_position_frame > currFrameCounter + 1)
+ if (lost_position_frame > currFrameCounter + 1)
{
if (emu_paused)
SeekingStart(lost_position_frame);
@@ -304,7 +300,7 @@ void PLAYBACK::MiddleButtonClick()
int selection_beginning = selection.GetCurrentSelectionBeginning();
if (selection_beginning > currFrameCounter)
SeekingStart(selection_beginning + 1);
- } else if (lost_position_frame && lost_position_frame > currFrameCounter + 1) // (GetAsyncKeyState(VK_MENU) < 0)
+ } else if (lost_position_frame > currFrameCounter + 1)
{
RestorePosition();
} else
diff --git a/vc/vc10_fceux.vcxproj b/vc/vc10_fceux.vcxproj
index b356af13..9425bfa3 100644
--- a/vc/vc10_fceux.vcxproj
+++ b/vc/vc10_fceux.vcxproj
@@ -872,6 +872,8 @@
+
+
@@ -915,6 +917,7 @@
$(OutDir)auxlib.lua;%(Outputs)
+
diff --git a/vc/vc10_fceux.vcxproj.filters b/vc/vc10_fceux.vcxproj.filters
index 37af602f..3585c102 100644
--- a/vc/vc10_fceux.vcxproj.filters
+++ b/vc/vc10_fceux.vcxproj.filters
@@ -1544,6 +1544,9 @@
+
+
+