diff options
Diffstat (limited to 'plugins/BasicHistory/src')
| -rw-r--r-- | plugins/BasicHistory/src/DatExport.cpp | 4 | ||||
| -rw-r--r-- | plugins/BasicHistory/src/HotkeyHelper.cpp | 6 | ||||
| -rw-r--r-- | plugins/BasicHistory/src/Options.cpp | 5 | ||||
| -rw-r--r-- | plugins/BasicHistory/src/Options.h | 2 | ||||
| -rw-r--r-- | plugins/BasicHistory/src/resource.h | 1 | ||||
| -rw-r--r-- | plugins/BasicHistory/src/version.h | 2 |
6 files changed, 14 insertions, 6 deletions
diff --git a/plugins/BasicHistory/src/DatExport.cpp b/plugins/BasicHistory/src/DatExport.cpp index bd74546393..0a40abd39d 100644 --- a/plugins/BasicHistory/src/DatExport.cpp +++ b/plugins/BasicHistory/src/DatExport.cpp @@ -86,9 +86,7 @@ void DatExport::WriteFooter() EXP_FILE.write((char*)&dataSize, sizeof(dataSize));
EXP_FILE.seekp(pos, std::ios_base::beg);
memBuf.resize(0);
-#ifdef _WIN64
memBuf.shrink_to_fit();
-#endif
}
void DatExport::WriteGroup(bool isMe, const std::wstring &time, const std::wstring &user, const std::wstring &eventText)
@@ -201,9 +199,7 @@ bool DatExport::GetEventList(std::vector<IImport::ExternalMessage>& eventList) }
memBuf.resize(0);
-#ifdef _WIN64
memBuf.shrink_to_fit();
-#endif
for(std::multimap<DWORD, IImport::ExternalMessage>::iterator it = sortedEvents.begin(); it != sortedEvents.end(); ++it)
{
diff --git a/plugins/BasicHistory/src/HotkeyHelper.cpp b/plugins/BasicHistory/src/HotkeyHelper.cpp index eeb537456a..29f916ea3c 100644 --- a/plugins/BasicHistory/src/HotkeyHelper.cpp +++ b/plugins/BasicHistory/src/HotkeyHelper.cpp @@ -18,6 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "StdAfx.h"
#include "HotkeyHelper.h"
+#include "resource.h"
+#include "Options.h"
LRESULT CALLBACK HotkeySubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
@@ -44,6 +46,10 @@ LRESULT CALLBACK HotkeySubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l WNDPROC oldProc = (WNDPROC)GetWindowLongPtr(hwnd, GWLP_USERDATA);
switch (msg) {
+ case WM_NCPAINT:
+ if(Options::instance->noFindBorder && GetDlgCtrlID(hwnd) == IDC_FIND_TEXT)
+ return 0;
+ break;
case WM_CHAR:
case WM_SYSCHAR:
case WM_UNICHAR:
diff --git a/plugins/BasicHistory/src/Options.cpp b/plugins/BasicHistory/src/Options.cpp index 218e721f03..67610e7724 100644 --- a/plugins/BasicHistory/src/Options.cpp +++ b/plugins/BasicHistory/src/Options.cpp @@ -77,6 +77,7 @@ Options::Options() {
showContacts = false;
showContactGroups = true;
+ noFindBorder = false;
groupNewOnTop = true;
groupShowEvents = true;
groupShowTime = true;
@@ -289,6 +290,7 @@ void Options::Load(void) showContacts = DBGetContactSettingByte(0, MODULE, "showContacts", 0) ? true : false;
showContactGroups = DBGetContactSettingByte(0, MODULE, "showContactGroups", 1) ? true : false;
+ noFindBorder = DBGetContactSettingByte(0, MODULE, "noFindBorder", 0) ? true : false;
groupNewOnTop = DBGetContactSettingByte(0, MODULE, "groupNewOnTop", 1) ? true : false;
groupShowEvents = DBGetContactSettingByte(0, MODULE, "groupShowEvents", 1) ? true : false;
groupShowTime = DBGetContactSettingByte(0, MODULE, "groupShowTime", 1) ? true : false;
@@ -467,6 +469,7 @@ void Options::Save() {
DBWriteContactSettingByte(0, MODULE, "showContacts", showContacts ? 1 : 0);
DBWriteContactSettingByte(0, MODULE, "showContactGroups", showContactGroups ? 1 : 0);
+ DBWriteContactSettingByte(0, MODULE, "noFindBorder", noFindBorder ? 1 : 0);
DBWriteContactSettingByte(0, MODULE, "groupNewOnTop", groupNewOnTop ? 1 : 0);
DBWriteContactSettingByte(0, MODULE, "groupShowEvents", groupShowEvents ? 1 : 0);
DBWriteContactSettingByte(0, MODULE, "groupShowTime", groupShowTime ? 1 : 0);
@@ -955,6 +958,7 @@ INT_PTR CALLBACK Options::DlgProcOptsMain(HWND hwndDlg, UINT msg, WPARAM wParam, SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)FALSE);
CheckDlgButton(hwndDlg, IDC_SHOWCONTACTS, instance->showContacts ? 1 : 0);
CheckDlgButton(hwndDlg, IDC_SHOWCONTACTGROUPS, instance->showContactGroups ? 1 : 0);
+ CheckDlgButton(hwndDlg, IDC_FINDNOBORDER, instance->noFindBorder ? 1 : 0);
HWND events = GetDlgItem(hwndDlg, IDC_EVENT);
HWND defFilter = GetDlgItem(hwndDlg, IDC_DEFFILTER);
HWND listFilter = GetDlgItem(hwndDlg, IDC_LIST_FILTERS);
@@ -1205,6 +1209,7 @@ INT_PTR CALLBACK Options::DlgProcOptsMain(HWND hwndDlg, UINT msg, WPARAM wParam, instance->showContacts = IsDlgButtonChecked(hwndDlg, IDC_SHOWCONTACTS) ? true : false;
instance->showContactGroups = IsDlgButtonChecked(hwndDlg, IDC_SHOWCONTACTGROUPS) ? true : false;
+ instance->noFindBorder = IsDlgButtonChecked(hwndDlg, IDC_FINDNOBORDER) ? true : false;
instance->defFilter = ComboBox_GetCurSel(GetDlgItem(hwndDlg, IDC_DEFFILTER));
instance->customFilters.clear();
instance->customFilters.insert(instance->customFilters.begin(), instance->customFiltersTemp.begin(), instance->customFiltersTemp.end());
diff --git a/plugins/BasicHistory/src/Options.h b/plugins/BasicHistory/src/Options.h index 4a5d17229c..015c8734de 100644 --- a/plugins/BasicHistory/src/Options.h +++ b/plugins/BasicHistory/src/Options.h @@ -153,7 +153,7 @@ public: void LoadTasks();
void Unload();
- bool showContacts, showContactGroups, groupNewOnTop, groupShowEvents, groupShowTime, groupShowName, groupShowMessage;
+ bool showContacts, showContactGroups, noFindBorder, groupNewOnTop, groupShowEvents, groupShowTime, groupShowName, groupShowMessage;
bool messagesNewOnTop, messagesShowDate, messagesShowSec, messagesShowName, messagesShowEvents, messagesUseSmileys;
bool searchForInList, searchForInMess, searchMatchCase, searchMatchWhole, searchOnlyIn, searchOnlyOut, searchOnlyGroup, searchAllContacts;
bool schedulerAlerts, schedulerHistoryAlerts;
diff --git a/plugins/BasicHistory/src/resource.h b/plugins/BasicHistory/src/resource.h index 71484f2343..87ada39676 100644 --- a/plugins/BasicHistory/src/resource.h +++ b/plugins/BasicHistory/src/resource.h @@ -97,6 +97,7 @@ #define IDC_SCHEDULER_ALERTS 1089
#define IDC_SCHEDULER_HISTORY_ALERTS 1090
#define IDC_ALLCONTACTS 1091
+#define IDC_FINDNOBORDER 1092
#define IDI_INM 20000
#define IDI_OUTM 20001
#define IDI_SHOW 20002
diff --git a/plugins/BasicHistory/src/version.h b/plugins/BasicHistory/src/version.h index 8b7d5ce949..b3f35e42ef 100644 --- a/plugins/BasicHistory/src/version.h +++ b/plugins/BasicHistory/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 1
#define __MINOR_VERSION 0
#define __RELEASE_NUM 1
-#define __BUILD_NUM 6
+#define __BUILD_NUM 7
#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
#define __FILEVERSION_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM
|