vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

editor: change bookmark-browsing keys

Browse Source 
Shift+PgUp/PgDn was a poor choice for bookmark-browsing keys, as
it's also useful for selecting sync-data for copy/paste.

Fix this by changing the hotkeys to Alt+PgUp/PgDn instead.
This commit is contained in:
Erik Faye-Lund 2012-04-16 19:02:54 +02:00
parent b1d3320415
commit c17de99f82
5 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@ -69,7 +69,7 @@ Enter Enter key-frame value
Del Delete key-frame Del Delete key-frame
i Enumerate interpolation mode i Enumerate interpolation mode
k Toggle bookmark k Toggle bookmark
Shift+PgUp/PgDn Go to prev/next bookmark Alt+PgUp/PgDn Go to prev/next bookmark
Space Pause/Resume demo Space Pause/Resume demo
Shift+Up/Down/Left/Right Select Shift+Up/Down/Left/Right Select
Ctrl+C Copy Ctrl+C Copy

19
editor/editor.cpp
View File

@ -442,7 +442,24 @@ static LRESULT CALLBACK mainWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
case ID_EDIT_COPY: SendMessage(trackViewWin, WM_COPY, 0, 0); break; case ID_EDIT_COPY: SendMessage(trackViewWin, WM_COPY, 0, 0); break;
case ID_EDIT_CUT: SendMessage(trackViewWin, WM_CUT, 0, 0); break; case ID_EDIT_CUT: SendMessage(trackViewWin, WM_CUT, 0, 0); break;
case ID_EDIT_PASTE: SendMessage(trackViewWin, WM_PASTE, 0, 0); break; case ID_EDIT_PASTE: SendMessage(trackViewWin, WM_PASTE, 0, 0); break;
case ID_EDIT_BOOKMARK_PREV:
{
int row = doc->prevRowBookmark(trackView->getEditRow());
if (row >= 0)
trackView->setEditRow(row);
}
break;
case ID_EDIT_BOOKMARK_NEXT:
{
int row = doc->nextRowBookmark(trackView->getEditRow());
if (row >= 0)
trackView->setEditRow(row);
}
break;
case ID_EDIT_SETROWS: case ID_EDIT_SETROWS:
{ {
size_t rows = trackView->getRows(); size_t rows = trackView->getRows();

5
editor/editor.rc
View File

@ -66,6 +66,8 @@ BEGIN
"A", ID_EDIT_SELECT_ALL, VIRTKEY, CONTROL, NOINVERT "A", ID_EDIT_SELECT_ALL, VIRTKEY, CONTROL, NOINVERT
"T", ID_EDIT_SELECTTRACK, VIRTKEY, CONTROL, NOINVERT "T", ID_EDIT_SELECTTRACK, VIRTKEY, CONTROL, NOINVERT
"R", ID_EDIT_SETROWS, VIRTKEY, CONTROL, NOINVERT "R", ID_EDIT_SETROWS, VIRTKEY, CONTROL, NOINVERT
VK_PRIOR, ID_EDIT_BOOKMARK_PREV, VIRTKEY, ALT, NOINVERT
VK_NEXT, ID_EDIT_BOOKMARK_NEXT, VIRTKEY, ALT, NOINVERT
END END
@ -108,6 +110,9 @@ BEGIN
MENUITEM "&Bias Selection\tCtrl+B", ID_EDIT_BIAS MENUITEM "&Bias Selection\tCtrl+B", ID_EDIT_BIAS
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Set Rows\tCtrl+R", ID_EDIT_SETROWS MENUITEM "Set Rows\tCtrl+R", ID_EDIT_SETROWS
MENUITEM SEPARATOR
MENUITEM "Previous Bookmark\tAlt+PgDn", ID_EDIT_BOOKMARK_PREV
MENUITEM "Next Bookmark\tAlt+PgUp", ID_EDIT_BOOKMARK_NEXT
END END
END END

4
editor/resource.h
View File

@ -25,13 +25,15 @@
#define ID_EDIT_SELECTALL 40023 #define ID_EDIT_SELECTALL 40023
#define ID_EDIT_SELECTROW 40024 #define ID_EDIT_SELECTROW 40024
#define ID_EDIT_SELECTTRACK 40025 #define ID_EDIT_SELECTTRACK 40025
#define ID_EDIT_BOOKMARK_NEXT 40026
#define ID_EDIT_BOOKMARK_PREV 40027
// Next default values for new objects // Next default values for new objects
// //
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 105 #define _APS_NEXT_RESOURCE_VALUE 105
#define _APS_NEXT_COMMAND_VALUE 40026 #define _APS_NEXT_COMMAND_VALUE 40028
#define _APS_NEXT_CONTROL_VALUE 1004 #define _APS_NEXT_CONTROL_VALUE 1004
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101
#endif #endif

8
editor/trackview.cpp
View File

@ -998,10 +998,6 @@ LRESULT TrackView::onKeyDown(UINT keyCode, UINT /*flags*/)
if (GetKeyState(VK_SHIFT) < 0) if (GetKeyState(VK_SHIFT) < 0)
bias = 100.0f; bias = 100.0f;
editBiasValue(bias); editBiasValue(bias);
} else if (GetKeyState(VK_SHIFT) < 0) {
int row = doc->prevRowBookmark(editRow);
if (row >= 0)
setEditRow(row);
} else } else
setEditRow(editRow - 0x10); setEditRow(editRow - 0x10);
break; break;
@ -1012,10 +1008,6 @@ LRESULT TrackView::onKeyDown(UINT keyCode, UINT /*flags*/)
if (GetKeyState(VK_SHIFT) < 0) if (GetKeyState(VK_SHIFT) < 0)
bias = 100.0f; bias = 100.0f;
editBiasValue(-bias); editBiasValue(-bias);
} else if (GetKeyState(VK_SHIFT) < 0) {
int row = doc->nextRowBookmark(editRow);
if (row >= 0)
setEditRow(row);
} else } else
setEditRow(editRow + 0x10); setEditRow(editRow + 0x10);
break; break;