From 3084d80d13977934b976afe57f16f0b81e6b7398 Mon Sep 17 00:00:00 2001 From: Abdul Date: Thu, 5 Jul 2012 15:10:11 +0000 Subject: BasicHistory updated to 1.0.1.7 git-svn-id: http://svn.miranda-ng.org/main/trunk@776 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/BasicHistory/Docs/BasicHistory_readme.txt | 7 ++++ plugins/BasicHistory/res/BasicHistory.rc | 40 ++++++++++++----------- plugins/BasicHistory/src/DatExport.cpp | 4 --- plugins/BasicHistory/src/HotkeyHelper.cpp | 6 ++++ plugins/BasicHistory/src/Options.cpp | 5 +++ plugins/BasicHistory/src/Options.h | 2 +- plugins/BasicHistory/src/resource.h | 1 + plugins/BasicHistory/src/version.h | 2 +- 8 files changed, 42 insertions(+), 25 deletions(-) (limited to 'plugins/BasicHistory') diff --git a/plugins/BasicHistory/Docs/BasicHistory_readme.txt b/plugins/BasicHistory/Docs/BasicHistory_readme.txt index 5f38c1cede..b258cda8fc 100644 --- a/plugins/BasicHistory/Docs/BasicHistory_readme.txt +++ b/plugins/BasicHistory/Docs/BasicHistory_readme.txt @@ -24,6 +24,13 @@ Microsoft Visual C++ 2008 Redistributable Package for x86 version (included in M Changelog ========= +--- 1.0.1.7 --- +* fixed border colors + +--- 1.0.1.6 --- +* fixed compilation warnings ++ added more configurable colors and fonts + --- 1.0.1.5 --- + added browse buttons in Options + added searching in all contacts diff --git a/plugins/BasicHistory/res/BasicHistory.rc b/plugins/BasicHistory/res/BasicHistory.rc index ff34263736..6da741a059 100644 --- a/plugins/BasicHistory/res/BasicHistory.rc +++ b/plugins/BasicHistory/res/BasicHistory.rc @@ -39,11 +39,11 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "",IDC_LIST,WC_LISTVIEW, WS_TABSTOP | WS_BORDER | LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SHOWSELALWAYS | LVS_SINGLESEL | LVS_SHAREIMAGELISTS ,102,27,387,73 CONTROL "",IDC_SPLITTER,WC_STATIC,SS_ENHMETAFILE,102,100,413,2 - CONTROL "", IDC_EDIT, RICHEDIT_CLASS, WS_VSCROLL | WS_TABSTOP | WS_BORDER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_DISABLENOSCROLL, 102,102,387,252 + CONTROL "", IDC_EDIT, RICHEDIT_CLASS, WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_DISABLENOSCROLL, 102,102,387,252, WS_EX_STATICEDGE CONTROL "", IDC_SHOWHIDE,"MButtonClass", WS_TABSTOP,7,7,16,14 EDITTEXT IDC_FIND_TEXT,25,8,380,12,ES_AUTOHSCROLL CONTROL "", IDC_TOOLBAR,TOOLBARCLASSNAME, WS_TABSTOP | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | CCS_NOPARENTALIGN | CCS_NODIVIDER | CCS_NORESIZE,413,7,76,20 - CONTROL "", IDC_LIST_CONTACTS, CLISTCONTROL_CLASS, WS_TABSTOP | CLS_USEGROUPS | CLS_NOHIDEOFFLINE | CLS_HIDEEMPTYGROUPS,7,27,93,327,WS_EX_CLIENTEDGE + CONTROL "", IDC_LIST_CONTACTS, CLISTCONTROL_CLASS, WS_TABSTOP | CLS_USEGROUPS | CLS_NOHIDEOFFLINE | CLS_HIDEEMPTYGROUPS,7,27,93,327,WS_EX_STATICEDGE CONTROL "",IDC_SPLITTERV,WC_STATIC,SS_ENHMETAFILE,100,27,2,338 END @@ -57,23 +57,25 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,23,270,10 CONTROL "Show groups in contact list",IDC_SHOWCONTACTGROUPS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,34,270,10 - COMBOBOX IDC_DEFFILTER,172,45,122,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Default Event Filter",IDC_STATIC,12,48,145,8 - GROUPBOX "Custom filters",IDC_STATIC,12,67,282,86 - LISTBOX IDC_LIST_FILTERS,20,81,133,30, WS_TABSTOP | LBS_NOINTEGRALHEIGHT | WS_BORDER | WS_VSCROLL - LISTBOX IDC_LIST_EVENTS,20,113,133,30, WS_TABSTOP | LBS_NOINTEGRALHEIGHT | WS_BORDER | WS_VSCROLL - EDITTEXT IDC_FILTER_NAME,160,81,130,12,WS_TABSTOP|ES_AUTOHSCROLL - PUSHBUTTON "Add filter",IDC_ADD_FILTER,160,97,63,14, WS_TABSTOP - PUSHBUTTON "Delete filter",IDC_DELETE_FILTER,227,97,63,14, WS_TABSTOP - COMBOBOX IDC_EVENT,160,113,130,30,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Add event",IDC_ADD_EVENT,160,129,63,14, WS_TABSTOP - PUSHBUTTON "Delete event",IDC_DELETE_EVENT,227,129,63,14, WS_TABSTOP - EDITTEXT IDC_WINSCP,107,160,165,12, ES_AUTOHSCROLL | WS_TABSTOP - PUSHBUTTON "...",IDC_WINSCP_BROWSE,274,160,20,12, WS_TABSTOP - LTEXT "WinSCP path",IDC_STATIC,12,163,94,8 - EDITTEXT IDC_WINSCPLOG,107,178,165,12, ES_AUTOHSCROLL | WS_TABSTOP - PUSHBUTTON "...",IDC_WINSCPLOG_BROWSE,274,178,20,12, WS_TABSTOP - LTEXT "WinSCP log path",IDC_STATIC,12,181,94,8 + CONTROL "Do not show Find control border",IDC_FINDNOBORDER, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,45,270,10 + COMBOBOX IDC_DEFFILTER,172,56,122,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Default Event Filter",IDC_STATIC,12,59,145,8 + GROUPBOX "Custom filters",IDC_STATIC,12,78,282,86 + LISTBOX IDC_LIST_FILTERS,20,92,133,30, WS_TABSTOP | LBS_NOINTEGRALHEIGHT | WS_BORDER | WS_VSCROLL + LISTBOX IDC_LIST_EVENTS,20,124,133,30, WS_TABSTOP | LBS_NOINTEGRALHEIGHT | WS_BORDER | WS_VSCROLL + EDITTEXT IDC_FILTER_NAME,160,92,130,12,WS_TABSTOP|ES_AUTOHSCROLL + PUSHBUTTON "Add filter",IDC_ADD_FILTER,160,108,63,14, WS_TABSTOP + PUSHBUTTON "Delete filter",IDC_DELETE_FILTER,227,108,63,14, WS_TABSTOP + COMBOBOX IDC_EVENT,160,124,130,30,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Add event",IDC_ADD_EVENT,160,140,63,14, WS_TABSTOP + PUSHBUTTON "Delete event",IDC_DELETE_EVENT,227,140,63,14, WS_TABSTOP + EDITTEXT IDC_WINSCP,107,171,165,12, ES_AUTOHSCROLL | WS_TABSTOP + PUSHBUTTON "...",IDC_WINSCP_BROWSE,274,171,20,12, WS_TABSTOP + LTEXT "WinSCP path",IDC_STATIC,12,174,94,8 + EDITTEXT IDC_WINSCPLOG,107,189,165,12, ES_AUTOHSCROLL | WS_TABSTOP + PUSHBUTTON "...",IDC_WINSCPLOG_BROWSE,274,189,20,12, WS_TABSTOP + LTEXT "WinSCP log path",IDC_STATIC,12,192,94,8 END IDD_OPT_GROUPLIST DIALOGEX 0, 0, 304, 225 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& eventList) } memBuf.resize(0); -#ifdef _WIN64 memBuf.shrink_to_fit(); -#endif for(std::multimap::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 . #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 -- cgit v1.2.3