From 48e0d2824f79489e28b027d3e7affcc218817bba Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 18 Sep 2019 19:39:02 +0300 Subject: m_ieview support removed from Pascal source code --- include/delphi/custom_api.inc | 1 - plugins/ExternalAPI/delphi/m_ieview.inc | 216 --------------- plugins/HistoryPlusPlus/historypp.dpr | 1 - plugins/HistoryPlusPlus/hpp_external.pas | 377 --------------------------- plugins/HistoryPlusPlus/hpp_externalgrid.pas | 5 - plugins/HistoryPlusPlus/hpp_forms.pas | 6 - plugins/HistoryPlusPlus/hpp_opt_dialog.pas | 30 +-- plugins/HistoryPlusPlus/hpp_opt_dialog.rc | 1 - 8 files changed, 1 insertion(+), 636 deletions(-) delete mode 100644 plugins/ExternalAPI/delphi/m_ieview.inc delete mode 100644 plugins/HistoryPlusPlus/hpp_external.pas diff --git a/include/delphi/custom_api.inc b/include/delphi/custom_api.inc index a7d290f5e4..0030ae5bac 100644 --- a/include/delphi/custom_api.inc +++ b/include/delphi/custom_api.inc @@ -1,7 +1,6 @@ {$include m_actman.inc} {$include m_fingerprint.inc} {$include m_folders.inc} -{$include m_ieview.inc} {$include m_msg_buttonsbar.inc} {$include m_proto_listeningto.inc} {$include m_radio.inc} diff --git a/plugins/ExternalAPI/delphi/m_ieview.inc b/plugins/ExternalAPI/delphi/m_ieview.inc deleted file mode 100644 index 0b71e99ad0..0000000000 --- a/plugins/ExternalAPI/delphi/m_ieview.inc +++ /dev/null @@ -1,216 +0,0 @@ -{ - IEView Plugin for Miranda IM - Copyright (C) 2005 Piotr Piastucki - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -} - -{$IFNDEF M_IEVIEW} -{$DEFINE M_IEVIEW} - -const - MS_IEVIEW_WINDOW = 'IEVIEW/NewWindow'; - MS_IEVIEW_EVENT = 'IEVIEW/Event'; - MS_IEVIEW_NAVIGATE = 'IEVIEW/Navigate'; - - ME_IEVIEW_OPTIONSCHANGED = 'IEVIEW/OptionsChanged'; -(* - MS_IEVIEW_UTILS = 'IEVIEW/Utils'; - MS_IEVIEW_SHOWSMILEYSELECTION = 'IEVIEW/ShowSmileySelection'; - ME_IEVIEW_NOTIFICATION = 'IEVIEW/Notification'; -*) - IEW_CREATE = 1; // create new window (control) - IEW_DESTROY = 2; // destroy control - IEW_SETPOS = 3; // set window position and size - IEW_SCROLLBOTTOM = 4; // scroll text to bottom - - IEWM_SRMM = 0; // regular SRMM - IEWM_TABSRMM = 1; // TabSRMM-compatible HTML builder - IEWM_HTML = 2; // HTML - IEWM_SCRIVER = 3; // HTML - IEWM_MUCC = 4; // MUCC group chats GUI - IEWM_CHAT = 5; // chat.dll group chats GUI - IEWM_HISTORY = 6; // history viewer - IEWM_BROWSER = 256; // empty browser window - -type - PIEVIEWWINDOW = ^TIEVIEWWINDOW; - TIEVIEWWINDOW = record - cbSize : int; // size of the strusture - iType : int; // one of IEW_* values - dwMode : dword; // compatibility mode - one of IEWM_* values - dwFlags: dword; // flags, one of IEWF_* values - parent : HWND; // parent window HWND - hwnd : HWND; // IEW_CREATE returns WebBrowser control's HWND here - x : int; // IE control horizontal position - y : int; // IE control vertical position - cx : int; // IE control horizontal size - cy : int; // IE control vertical size - end; - -const - IEEDF_UNICODE = 1; // if set pszText is a pointer to wchar_t string instead of AnsiChar string - IEEDF_UNICODE_TEXT = 1; // if set pszText is a pointer to wchar_t string instead of AnsiChar string - IEEDF_UNICODE_NICK = 2; // if set pszNick is a pointer to wchar_t string instead of AnsiChar string - IEEDF_UNICODE_TEXT2 = 4; // if set pszText2 is a pointer to wchar_t string instead of AnsiChar string -// The following flags are valid only for message events (IEED_EVENT_MESSAGE) - IEEDF_FORMAT_FONT = $00000100; // if set pszFont (font name) is valid and should be used - IEEDF_FORMAT_SIZE = $00000200; // if set fontSize is valid and should be used - IEEDF_FORMAT_COLOR = $00000400; // if set color is valid and should be used - IEEDF_FORMAT_STYLE = $00000800; // if set fontSize is valid and should be used - - IEEDF_READ = $00001000; // if set - IEEDF_SENT = $00002000; // if set - IEEDF_RTL = $00004000; // if set - - IEED_EVENT_MESSAGE = $0001; // message - IEED_EVENT_STATUSCHANGE = $0002; // status change - IEED_EVENT_FILE = $0003; // file - IEED_EVENT_ERRMSG = $0005; // error message - IEED_EVENT_SYSTEM = $0006; // system event - - IEED_MUCC_EVENT_MESSAGE = $0001; // message - IEED_MUCC_EVENT_TOPIC = $0002; // topic change - IEED_MUCC_EVENT_JOINED = $0003; // user joined - IEED_MUCC_EVENT_LEFT = $0004; // user left - IEED_MUCC_EVENT_ERROR = $0005; // error - -// MUCC-related dwData bit flags - IEEDD_MUCC_SHOW_NICK = $00000001; - IEEDD_MUCC_MSG_ON_NEW_LINE = $00000002; - IEEDD_MUCC_SHOW_DATE = $00000010; - IEEDD_MUCC_SHOW_TIME = $00000020; - IEEDD_MUCC_SECONDS = $00000040; - IEEDD_MUCC_LONG_DATE = $00000080; - - IEED_GC_EVENT_HIGHLIGHT = $8000; - IEED_GC_EVENT_MESSAGE = $0001; - IEED_GC_EVENT_TOPIC = $0002; - IEED_GC_EVENT_JOIN = $0003; - IEED_GC_EVENT_PART = $0004; - IEED_GC_EVENT_QUIT = $0006; - IEED_GC_EVENT_NICK = $0007; - IEED_GC_EVENT_ACTION = $0008; - IEED_GC_EVENT_KICK = $0009; - IEED_GC_EVENT_NOTICE = $000A; - IEED_GC_EVENT_INFORMATION = $000B; - IEED_GC_EVENT_ADDSTATUS = $000C; - IEED_GC_EVENT_REMOVESTATUS = $000D; - -// GC-related dwData bit flags - IEEDD_GC_SHOW_NICK = $00000001; - IEEDD_GC_SHOW_TIME = $00000002; - IEEDD_GC_SHOW_ICON = $00000004; - IEEDD_GC_MSG_ON_NEW_LINE = $00001000; - - IE_FONT_BOLD = $000100; // Bold font flag - IE_FONT_ITALIC = $000200; // Italic font flag - IE_FONT_UNDERLINE = $000400; // Underlined font flags - -type - PtagIEVIEWEVENTDATA = ^TtagIEVIEWEVENTDATA; - TtagIEVIEWEVENTDATA = record - cbSize :int; - iType :int; // Event type, one of MUCC_EVENT_* values - dwFlags :dword; // Event flags - IEEF_* - fontName :PAnsiChar; // Text font name - fontSize :int; // Text font size (in pixels) - fontStyle:int; // Text font style (combination of IE_FONT_* flags) - color :TCOLORREF; // Text color - Nick :TChar; // Nick, usage depends on type of event - Text :TChar; // Text, usage depends on type of event - dwData :dword; // dword data e.g. status - bIsMe :bool; // TRUE if the event is related to the user - time :dword; // Time of the event - next :PtagIEVIEWEVENTDATA; - Text2 :TChar; // Text, usage depends on type of event - end; - PIEVIEWEVENTDATA = PtagIEVIEWEVENTDATA; - TIEVIEWEVENTDATA = TtagIEVIEWEVENTDATA; - -const - IEE_LOG_DB_EVENTS = 1; // log specified number of DB events - IEE_CLEAR_LOG = 2; // clear log - IEE_GET_SELECTION = 3; // get selected text - IEE_SAVE_DOCUMENT = 4; // save current document - IEE_LOG_MEM_EVENTS = 5; // log specified number of IEView events - - IEEF_RTL = 1; // turn on RTL support - IEEF_NO_UNICODE = 2; // disable Unicode support - IEEF_NO_SCROLLING = 4; // do not scroll logs to bottom - -const - IEVIEWEVENT_SIZE_V1 = 28; - IEVIEWEVENT_SIZE_V2 = 32; - IEVIEWEVENT_SIZE_V3 = 36; - -type - tagIEVIEWEVENT = record - case byte of - 0: (hDbEventFirst:TMEVENT); - 1: (eventData :PIEVIEWEVENTDATA); - end; - - PIEVIEWEVENT = ^TIEVIEWEVENT; - TIEVIEWEVENT = record - cbSize :int; // size of the strusture - iType :int; // one of IEE_* values - dwFlags :dword; // one of IEEF_* values - hwnd :HWND; // HWND returned by IEW_CREATE - hContact :TMCONTACT; // contact - Event :tagIEVIEWEVENT; // first event to log, when IEE_LOG_EVENTS - // returns it will contain the last event - // actually logged or NULL if no event was logged - count :int; // number of events to log - codepage :int; // ANSI codepage - pszProto :PAnsiChar; - end; -(* -type - PIEVIEWSHOWSMILEYSEL = ^TIEVIEWSHOWSMILEYSEL; - TIEVIEWSHOWSMILEYSEL = record - cbSize : int; // size of the structure - Protocolname : PAnsiChar; // protocol to use... if you have defined a protocol, - // u can use your own protocol name. Smiley add will - // automatically select the smileypack that is - // defined for your protocol. Or, use "Standard" for - // standard smiley set. Or "ICQ", "MSN" if you - // prefer those icons. If not found or NULL: - // "Standard" will be used - xPosition : int; // Postition to place the selectwindow - yPosition : int; - Direction : int; // Direction (i.e. size upwards/downwards/etc) of - // the window 0, 1, 2, 3 - hwndTarget : HWND; // Window, where to send the message when smiley is - // selected. - targetMessage: dword; // Target message, to be sent. - targetWParam : LPARAM; // Target WParam to be sent (LParam will be AnsiChar* - // to select smiley) see the example file. - end; -*) -const - IEN_NAVIGATE = 1; // navigate to the given destination - IENF_UNICODE = 1; // if set urlW is used instead of urlW - -type - IEVIEWNAVIGATE = record - cbSize :int; // size of the strusture - iType :int; // one of IEN_* values - dwFlags:dword; // one of IEEF_* values - hwnd :HWND; // HWND returned by IEW_CREATE - url :TChar; // Text, usage depends on type of event -end; - -{$ENDIF} diff --git a/plugins/HistoryPlusPlus/historypp.dpr b/plugins/HistoryPlusPlus/historypp.dpr index a9843a5d2a..b89c75c664 100644 --- a/plugins/HistoryPlusPlus/historypp.dpr +++ b/plugins/HistoryPlusPlus/historypp.dpr @@ -60,7 +60,6 @@ uses hpp_mescatcher in 'hpp_mescatcher.pas', CustomizeFiltersForm in 'CustomizeFiltersForm.pas' {fmCustomizeFilters}, CustomizeToolbar in 'CustomizeToolbar.pas' {fmCustomizeToolbar}, - hpp_external in 'hpp_external.pas', hpp_externalgrid in 'hpp_externalgrid.pas', hpp_richedit in 'hpp_richedit.pas', hpp_olesmileys in 'hpp_olesmileys.pas', diff --git a/plugins/HistoryPlusPlus/hpp_external.pas b/plugins/HistoryPlusPlus/hpp_external.pas deleted file mode 100644 index 5c61e363fb..0000000000 --- a/plugins/HistoryPlusPlus/hpp_external.pas +++ /dev/null @@ -1,377 +0,0 @@ -(* - History++ plugin for Miranda IM: the free IM client for Microsoft* Windows* - - Copyright (C) 2006-2009 theMIROn, 2003-2006 Art Fedorov. - History+ parts (C) 2001 Christian Kastner - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*) - -unit hpp_external; - -interface - -uses - Classes, Windows, - m_api, - hpp_externalgrid; - -type - TExternalGrids = class(TObject) - private - FGrids: array[TExGridMode] of TList; - procedure SetGroupLinked(Value: Boolean); - public - constructor Create; - destructor Destroy; override; - procedure Add(const ExtGrid: TExternalGrid; GridMode: TExGridMode); - function Find(Handle: HWND; GridMode: TExGridMode): TExternalGrid; - function Delete(Handle: HWND; GridMode: TExGridMode): Boolean; - function Clear(GridMode: TExGridMode): Boolean; - procedure Perform(Msg: Cardinal; wParam: WPARAM; lParam: LPARAM); - property GroupLinked: Boolean write SetGroupLinked; - end; - - -const - MS_HPP_EG_WINDOW = 'History++/ExtGrid/NewWindow'; - MS_HPP_EG_EVENT = 'History++/ExtGrid/Event'; - MS_HPP_EG_NAVIGATE = 'History++/ExtGrid/Navigate'; - ME_HPP_EG_OPTIONSCHANGED = 'History++/ExtGrid/OptionsChanged'; - -var - ImitateIEView: boolean; - ExternalGrids: TExternalGrids; - -procedure RegisterExtGridServices; -procedure UnregisterExtGridServices; - -implementation - -uses - hpp_global, hpp_database; - -{$include m_ieview.inc} - -var - hExtOptChangedIE, hExtOptChanged: THandle; - -function _ExtWindow(wParam:WPARAM; lParam: LPARAM; GridMode: TExGridMode): uint_ptr; -var - par: PIEVIEWWINDOW; - ExtGrid: TExternalGrid; - ControlID: Cardinal; -begin - Result := 0; - //try - par := PIEVIEWWINDOW(lParam); - Assert(par <> nil, 'Empty IEVIEWWINDOW structure'); - case par.iType of - IEW_CREATE: begin - {$IFDEF DEBUG} - OutputDebugString('IEW_CREATE'); - {$ENDIF} - case par.dwMode of - IEWM_TABSRMM: ControlID := 1006; // IDC_LOG from tabSRMM - IEWM_SCRIVER: ControlID := 1001; // IDC_LOG from Scriver - IEWM_MUCC: ControlID := 0; - IEWM_CHAT: ControlID := 0; - IEWM_HISTORY: ControlID := 0; - else ControlID := 0; - end; - ExtGrid := TExternalGrid.Create(par.Parent,ControlID); - case par.dwMode of - IEWM_MUCC,IEWM_CHAT: begin - ExtGrid.ShowHeaders := False; - ExtGrid.GroupLinked := False; - ExtGrid.ShowBookmarks := False; - end; - IEWM_HISTORY: - ExtGrid.GroupLinked := False; - end; - ExtGrid.SetPosition(par.x,par.y,par.cx,par.cy); - ExternalGrids.Add(ExtGrid,GridMode); - par.Hwnd := ExtGrid.GridHandle; - end; - IEW_DESTROY: begin - {$IFDEF DEBUG} - OutputDebugString('IEW_DESTROY'); - {$ENDIF} - ExternalGrids.Delete(par.Hwnd,GridMode); - end; - IEW_SETPOS: begin - {$IFDEF DEBUG} - OutputDebugString('IEW_SETPOS'); - {$ENDIF} - ExtGrid := ExternalGrids.Find(par.Hwnd,GridMode); - if ExtGrid <> nil then - ExtGrid.SetPosition(par.x,par.y,par.cx,par.cy); - end; - IEW_SCROLLBOTTOM: begin - {$IFDEF DEBUG} - OutputDebugString('IEW_SCROLLBOTTOM'); - {$ENDIF} - ExtGrid := ExternalGrids.Find(par.Hwnd,GridMode); - if ExtGrid <> nil then - ExtGrid.ScrollToBottom; - end; - end; - //except - //end; -end; - -function ExtWindowNative(wParam:WPARAM; lParam: LPARAM): uint_ptr; cdecl; -begin - Result := _ExtWindow(wParam,lParam,gmNative); -end; - -function ExtWindowIEView(wParam:WPARAM; lParam: LPARAM): uint_ptr; cdecl; -begin - Result := _ExtWindow(wParam,lParam,gmIEView); -end; - -function _ExtEvent(wParam:WPARAM; lParam: LPARAM; GridMode: TExGridMode): uint_ptr; cdecl; -var - event: PIEVIEWEVENT; - customEvent: PIEVIEWEVENTDATA; - UsedCodepage: Cardinal; - hDBNext: THandle; - eventCount: Integer; - ExtGrid: TExternalGrid; - CustomItem: TExtCustomItem; -begin - Result := 0; - //try - {$IFDEF DEBUG} - OutputDebugString('MS_IEVIEW_EVENT'); - {$ENDIF} - event := PIEVIEWEVENT(lParam); - Assert(event <> nil, 'Empty IEVIEWEVENT structure'); - ExtGrid := ExternalGrids.Find(event.Hwnd,GridMode); - if ExtGrid = nil then exit; - case event.iType of - IEE_LOG_DB_EVENTS: begin - if event.cbSize >= IEVIEWEVENT_SIZE_V2 then - UsedCodepage := event.Codepage - else - UsedCodepage := CP_ACP; - eventCount := event.Count; - hDBNext := event.Event.hDBEventFirst; - ExtGrid.BeginUpdate; - while (eventCount <> 0) and (hDBNext <> 0) do - begin - ExtGrid.AddEvent(event.hContact, hDBNext, UsedCodepage, - boolean(event.dwFlags and IEEF_RTL), - not boolean(event.dwFlags and IEEF_NO_SCROLLING)); - if eventCount > 0 then Dec(eventCount); - if eventCount <> 0 then - hDBNext := db_event_next(event.hContact,hDBNext); - end; - ExtGrid.EndUpdate; - end; - IEE_LOG_MEM_EVENTS: begin - if event.cbSize >= IEVIEWEVENT_SIZE_V2 then - UsedCodepage := event.Codepage - else - UsedCodepage := CP_ACP; - eventCount := event.Count; - customEvent := event.Event.eventData; - ExtGrid.BeginUpdate; - while (eventCount <> 0) and (customEvent <> nil) do - begin - if boolean(customEvent.dwFlags and IEEDF_UNICODE_TEXT) then - SetString(CustomItem.Text,customEvent.Text.w,lstrlenW(customEvent.Text.w)) - else - CustomItem.Text := AnsiToWideString(AnsiString(customEvent.Text.a),UsedCodepage); - if boolean(customEvent.dwFlags and IEEDF_UNICODE_NICK) then - SetString(CustomItem.Nick,customEvent.Nick.w,lstrlenW(customEvent.Nick.w)) - else - CustomItem.Nick := AnsiToWideString(AnsiString(customEvent.Nick.a),UsedCodepage); - CustomItem.Sent := boolean(customEvent.bIsMe); - CustomItem.Time := customEvent.time; - ExtGrid.AddCustomEvent(event.hContact, CustomItem, UsedCodepage, - boolean(event.dwFlags and IEEF_RTL), - not boolean(event.dwFlags and IEEF_NO_SCROLLING)); - if eventCount > 0 then Dec(eventCount); - customEvent := customEvent.next; - end; - ExtGrid.EndUpdate; - end; - IEE_CLEAR_LOG: begin - ExtGrid.BeginUpdate; - ExtGrid.Clear; - ExtGrid.EndUpdate; - end; - IEE_GET_SELECTION: begin - Result := uint_ptr(ExtGrid.GetSelection(boolean(event.dwFlags and IEEF_NO_UNICODE))); - end; - IEE_SAVE_DOCUMENT: begin - ExtGrid.SaveSelected; - end; - end; - //except - //end; -end; - -function ExtEventNative(wParam:WPARAM; lParam: LPARAM): uint_ptr; cdecl; -begin - Result := _ExtEvent(wParam,lParam,gmNative); -end; - -function ExtEventIEView(wParam:WPARAM; lParam: LPARAM): uint_ptr; cdecl; -begin - Result := _ExtEvent(wParam,lParam,gmIEView); -end; - -function ExtNavigate(wParam:WPARAM; lParam: LPARAM): uint_ptr; cdecl; -begin - Result := 0; - //try - {$IFDEF DEBUG} - OutputDebugString('MS_IEVIEW_NAVIGATE'); - {$ENDIF} - //except - //end; -end; - -procedure RegisterExtGridServices; -begin - ExternalGrids := TExternalGrids.Create; - ImitateIEView := GetDBBool(hppDBName,'IEViewAPI',false); - if ImitateIEView then - begin - CreateServiceFunction(MS_IEVIEW_WINDOW,@ExtWindowIEView); - CreateServiceFunction(MS_IEVIEW_EVENT,@ExtEventIEView); - CreateServiceFunction(MS_IEVIEW_NAVIGATE,@ExtNavigate); - hExtOptChangedIE := CreateHookableEvent(ME_IEVIEW_OPTIONSCHANGED); - end; - CreateServiceFunction(MS_HPP_EG_WINDOW,@ExtWindowNative); - CreateServiceFunction(MS_HPP_EG_EVENT,@ExtEventNative); - CreateServiceFunction(MS_HPP_EG_NAVIGATE,@ExtNavigate); - hExtOptChanged := CreateHookableEvent(ME_HPP_EG_OPTIONSCHANGED); -end; - -procedure UnregisterExtGridServices; -begin - if ImitateIEView then - begin - DestroyHookableEvent(hExtOptChangedIE); - end; - DestroyHookableEvent(hExtOptChanged); - ExternalGrids.Destroy; -end; - -constructor TExternalGrids.Create; -var - GridMode: TExGridMode; -begin - for GridMode := Low(TExGridMode) to High(TExGridMode) do - FGrids[GridMode] := TList.Create; -end; - -destructor TExternalGrids.Destroy; -var - GridMode: TExGridMode; -begin - for GridMode := Low(TExGridMode) to High(TExGridMode) do begin - Clear(GridMode); - FGrids[GridMode].Free; - end; - inherited; -end; - -procedure TExternalGrids.Add(const ExtGrid: TExternalGrid; GridMode: TExGridMode); -begin - FGrids[GridMode].Add(ExtGrid); -end; - -function TExternalGrids.Find(Handle: HWND; GridMode: TExGridMode): TExternalGrid; -var - i: Integer; - ExtGrid: TExternalGrid; -begin - Result := nil; - for i := 0 to FGrids[GridMode].Count-1 do - begin - ExtGrid := TExternalGrid(FGrids[GridMode].Items[i]); - if ExtGrid.GridHandle = Handle then - begin - Result := ExtGrid; - break; - end; - end; -end; - -function TExternalGrids.Delete(Handle: HWND; GridMode: TExGridMode): Boolean; -var - i: Integer; - ExtGrid: TExternalGrid; -begin - Result := True; - for i := 0 to FGrids[GridMode].Count-1 do - begin - ExtGrid := TExternalGrid(FGrids[GridMode].Items[i]); - if ExtGrid.GridHandle = Handle then - begin - try - ExtGrid.Free; - except - Result := False; - end; - FGrids[GridMode].Delete(i); - break; - end; - end; -end; - -function TExternalGrids.Clear(GridMode: TExGridMode): Boolean; -var - i: Integer; - ExtGrid: TExternalGrid; -begin - Result := True; - for i := 0 to FGrids[GridMode].Count-1 do - begin - ExtGrid := TExternalGrid(FGrids[GridMode].Items[i]); - try - ExtGrid.Free; - except - Result := False; - end; - end; - FGrids[GridMode].Clear; -end; - -procedure TExternalGrids.Perform(Msg: Cardinal; wParam: WPARAM; lParam: LPARAM); -var - i: Integer; - GridMode: TExGridMode; -begin - for GridMode := Low(TExGridMode) to High(TExGridMode) do - for i := FGrids[GridMode].Count-1 downto 0 do - TExternalGrid(FGrids[GridMode].Items[i]).Perform(Msg,wParam,lParam); -end; - -procedure TExternalGrids.SetGroupLinked(Value: Boolean); -var - i: Integer; - GridMode: TExGridMode; -begin - for GridMode := Low(TExGridMode) to High(TExGridMode) do - for i := FGrids[GridMode].Count-1 downto 0 do - TExternalGrid(FGrids[GridMode].Items[i]).GroupLinked := Value; -end; - -end. diff --git a/plugins/HistoryPlusPlus/hpp_externalgrid.pas b/plugins/HistoryPlusPlus/hpp_externalgrid.pas index 0c9365961c..2a2e78a474 100644 --- a/plugins/HistoryPlusPlus/hpp_externalgrid.pas +++ b/plugins/HistoryPlusPlus/hpp_externalgrid.pas @@ -29,8 +29,6 @@ uses hpp_global, HistoryGrid, RichEdit, Menus, ShellAPI; type - TExGridMode = (gmNative, gmIEView); - PExtCustomItem = ^TExtCustomItem; TExtCustomItem = record @@ -85,7 +83,6 @@ type pmLink: TPopupMenu; miEventsFilter: TMenuItem; WasKeyPressed: Boolean; - FGridMode: TExGridMode; FUseHistoryRTLMode: Boolean; FExternalRTLMode: TRTLMode; FUseHistoryCodepage: Boolean; @@ -153,7 +150,6 @@ type procedure Clear; property ParentWindow: HWND read FParentWindow; property GridHandle: HWND read GetGridHandle; - property GridMode: TExGridMode read FGridMode write FGridMode; property UseHistoryRTLMode: Boolean read FUseHistoryRTLMode write SetUseHistoryRTLMode; property UseHistoryCodepage: Boolean read FUseHistoryCodepage write SetUseHistoryCodepage; function Perform(Msg: Cardinal; WParam:WPARAM; LParam: LPARAM): LRESULT; @@ -350,7 +346,6 @@ constructor TExternalGrid.Create(AParentWindow: HWND; ControlID: Cardinal = 0); begin FParentWindow := AParentWindow; WasKeyPressed := False; - FGridMode := gmNative; FUseHistoryRTLMode := False; FExternalRTLMode := hppRTLDefault; FUseHistoryCodepage := False; diff --git a/plugins/HistoryPlusPlus/hpp_forms.pas b/plugins/HistoryPlusPlus/hpp_forms.pas index 8d4803c984..0b0ff75b43 100644 --- a/plugins/HistoryPlusPlus/hpp_forms.pas +++ b/plugins/HistoryPlusPlus/hpp_forms.pas @@ -59,7 +59,6 @@ implementation uses hpp_services, hpp_opt_dialog, hpp_database, hpp_mescatcher, HistoryForm, GlobalSearch, m_api, - {$IFNDEF NO_EXTERNALGRID}hpp_external,{$ENDIF} CustomizeFiltersForm, CustomizeToolbar; {procedure AddMenu(M: TMenuItem; FromM,ToM: TPopupMenu; Index: integer); @@ -215,11 +214,6 @@ begin // we are going backwards here because history forms way want to // close themselves on the message, so we would have AVs if go from 0 to Count - - {$IFNDEF NO_EXTERNALGRID} - ExternalGrids.Perform(Msg,wParam,lParam); - {$ENDIF} - for i := HstWindowList.Count - 1 downto 0 do begin if Assigned(THistoryFrm(HstWindowList[i]).EventDetailForm) then diff --git a/plugins/HistoryPlusPlus/hpp_opt_dialog.pas b/plugins/HistoryPlusPlus/hpp_opt_dialog.pas index ce3bc0e47a..9a0d2ba09b 100644 --- a/plugins/HistoryPlusPlus/hpp_opt_dialog.pas +++ b/plugins/HistoryPlusPlus/hpp_opt_dialog.pas @@ -39,8 +39,7 @@ implementation uses Messages, CommCtrl, m_api, - hpp_global, hpp_options, hpp_services, hpp_database - {$IFNDEF NO_EXTERNALGRID}, hpp_external{$ENDIF}, + hpp_global, hpp_options, hpp_services, hpp_database, HistoryForm, GlobalSearch; const @@ -58,7 +57,6 @@ const IDC_AVATARSHISTORY = 205; // "Display chanage avatars" checkbox ID_MESSAGELOG_GROUP = 300; // "Message log options" group - IDC_IEVIEWAPI = 301; // "Imitate IEView API" checkbox IDC_GROUPLOGITEMS = 302; // "Group messages" checkbox IDC_DISABLEBORDER = 303; // "Disable border" checkbox IDC_DISABLESCROLL = 304; // "Disable scrollbar" checkbox @@ -122,7 +120,6 @@ begin if GetChecked(IDC_GROUPHISTITEMS) <> GetDBBool(hppDBName,'GroupHistoryItems',false) then exit; {$IFNDEF NO_EXTERNALGRID} - if GetChecked(IDC_IEVIEWAPI) <> GetDBBool(hppDBName,'IEViewAPI',false) then exit; if GetChecked(IDC_GROUPLOGITEMS) <> GetDBBool(hppDBName,'GroupLogItems',false) then exit; if GetChecked(IDC_DISABLEBORDER) <> GetDBBool(hppDBName,'NoLogBorder',false) then exit; if GetChecked(IDC_DISABLESCROLL) <> GetDBBool(hppDBName,'NoLogScrollBar',false) then exit; @@ -181,30 +178,6 @@ begin THistoryFrm(HstWindowList[i]).hg.GroupLinked := Checked; end; - {$IFNDEF NO_EXTERNALGRID} - Checked := GetChecked(IDC_IEVIEWAPI); - if Checked <> GetDBBool(hppDBName,'IEViewAPI',false) then - WriteDBBool(hppDBName,'IEViewAPI',Checked); - ShowRestart := ShowRestart or (Checked <> ImitateIEView); - - Checked := GetChecked(IDC_GROUPLOGITEMS); - if Checked <> GetDBBool(hppDBName,'GroupLogItems',false) then - begin - WriteDBBool(hppDBName,'GroupLogItems',Checked); - ExternalGrids.GroupLinked := Checked; - end; - - Checked := GetChecked(IDC_DISABLEBORDER); - if Checked <> GetDBBool(hppDBName,'NoLogBorder',false) then - WriteDBBool(hppDBName,'NoLogBorder',Checked); - //ShowRestart := ShowRestart or (Checked <> DisableLogBorder); - - Checked := GetChecked(IDC_DISABLESCROLL); - if Checked <> GetDBBool(hppDBName,'NoLogScrollBar',false) then - WriteDBBool(hppDBName,'NoLogScrollBar',Checked); - //ShowRestart := ShowRestart or (Checked <> DisableLogScrollbar); - {$ENDIF} - if ShowRestart then ShowWindow(GetDlgItem(hDlg,ID_NEED_RESTART),SW_SHOW) else @@ -235,7 +208,6 @@ begin SetChecked(IDC_RECENTONTOP,GetDBBool(hppDBName,'SortOrder',false)); SetChecked(IDC_GROUPHISTITEMS,GetDBBool(hppDBName,'GroupHistoryItems',false)); - SetChecked(IDC_IEVIEWAPI ,GetDBBool(hppDBName,'IEViewAPI',false)); SetChecked(IDC_GROUPLOGITEMS,GetDBBool(hppDBName,'GroupLogItems',false)); SetChecked(IDC_DISABLEBORDER,GetDBBool(hppDBName,'NoLogBorder',false)); SetChecked(IDC_DISABLESCROLL,GetDBBool(hppDBName,'NoLogScrollBar',false)); diff --git a/plugins/HistoryPlusPlus/hpp_opt_dialog.rc b/plugins/HistoryPlusPlus/hpp_opt_dialog.rc index 68321f40e2..d1e946a00a 100644 --- a/plugins/HistoryPlusPlus/hpp_opt_dialog.rc +++ b/plugins/HistoryPlusPlus/hpp_opt_dialog.rc @@ -21,7 +21,6 @@ FONT 8, "MS SHELL DLG" CONTROL "Display changed avatars", 205, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 166, 64, 140, 11 CONTROL "Message log options", 300, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 160, 82, 148, 55 - CONTROL "Imitate IEView API", 301, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 166, 92, 140, 11 CONTROL "Group messages", 302, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 166, 102, 140, 11 CONTROL "Disable border", 303, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 166, 112, 140, 11 CONTROL "Disable scroll bar", 304, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 166, 122, 140, 11 -- cgit v1.2.3