diff options
| -rw-r--r-- | plugins/NewStory/res/resource.rc | 2 | ||||
| -rw-r--r-- | plugins/NewStory/src/history.cpp | 7 | ||||
| -rw-r--r-- | plugins/NewStory/src/history_control.cpp | 10 | ||||
| -rw-r--r-- | plugins/NewStory/src/resource.h | 1 |
4 files changed, 15 insertions, 5 deletions
diff --git a/plugins/NewStory/res/resource.rc b/plugins/NewStory/res/resource.rc index 8197f03223..9d59a47de1 100644 --- a/plugins/NewStory/res/resource.rc +++ b/plugins/NewStory/res/resource.rc @@ -88,7 +88,7 @@ BEGIN CONTROL "",IDC_TIMETREE,"MButtonClass",WS_TABSTOP,118,99,16,14 CONTROL "",IDC_FILTER,"MButtonClass",WS_TABSTOP,132,99,16,14 CONTROL "",IDC_FINDPREV,"MButtonClass",WS_TABSTOP,364,305,16,14 - CONTROL "",IDC_FINDNEXT,"MButtonClass",WS_TABSTOP,337,305,16,14 + CONTROL "",IDOK,"MButtonClass",WS_TABSTOP,337,305,16,14 EDITTEXT IDC_SEARCHTEXT,19,305,305,14,ES_AUTOHSCROLL ICON "",IDC_SEARCHICON,1,298,20,20,SS_CENTERIMAGE CONTROL "",IDC_LOGOPTIONS,"MButtonClass",WS_TABSTOP,116,99,16,14 diff --git a/plugins/NewStory/src/history.cpp b/plugins/NewStory/src/history.cpp index 52449c633a..bfc3cfeb2d 100644 --- a/plugins/NewStory/src/history.cpp +++ b/plugins/NewStory/src/history.cpp @@ -415,7 +415,7 @@ public: btnCalendar(this, IDC_DATEPOPUP, g_plugin.getIcon(ICO_CALENDAR), LPGEN("Jump to date")), btnUserInfo(this, IDC_USERINFO, g_plugin.getIcon(ICO_USERINFO), LPGEN("User info")), btnUserMenu(this, IDC_USERMENU, g_plugin.getIcon(ICO_USERMENU), LPGEN("User menu")), - btnFindNext(this, IDC_FINDNEXT, g_plugin.getIcon(ICO_FINDNEXT), LPGEN("Find next")), + btnFindNext(this, IDOK, g_plugin.getIcon(ICO_FINDNEXT), LPGEN("Find next")), btnFindPrev(this, IDC_FINDPREV, g_plugin.getIcon(ICO_FINDPREV), LPGEN("Find previous")), btnTimeTree(this, IDC_TIMETREE, g_plugin.getIcon(ICO_TIMETREE), LPGEN("Conversations")) { @@ -575,6 +575,11 @@ public: return true; } + bool OnApply() override + { + return false; + } + void OnDestroy() override { g_plugin.setWord(m_hContact, "showFlags", showFlags); diff --git a/plugins/NewStory/src/history_control.cpp b/plugins/NewStory/src/history_control.cpp index 7e8d25ba8f..19a92950be 100644 --- a/plugins/NewStory/src/history_control.cpp +++ b/plugins/NewStory/src/history_control.cpp @@ -750,11 +750,17 @@ LRESULT CALLBACK NewstoryListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM break; case VK_PRIOR: - data->PageUp(); + if (isCtrl) + data->ScrollTop(); + else + data->PageUp(); break; case VK_NEXT: - data->PageDown(); + if (isCtrl) + data->ScrollBottom(); + else + data->PageDown(); break; case VK_HOME: diff --git a/plugins/NewStory/src/resource.h b/plugins/NewStory/src/resource.h index 47234f6a50..13bc660309 100644 --- a/plugins/NewStory/src/resource.h +++ b/plugins/NewStory/src/resource.h @@ -38,7 +38,6 @@ #define IDC_TIMETREE 1007 #define IDC_FILTER 1008 #define IDC_FINDPREV 1009 -#define IDC_FINDNEXT 1010 #define IDC_SEARCHTEXT 1011 #define IDC_SEARCHICON 1012 #define IDC_LOGOPTIONS 1013 |