From 238a645bbb05e5cd7116480803cf68e204046e1f Mon Sep 17 00:00:00 2001 From: dartraiden Date: Wed, 30 Jan 2019 22:34:17 +0300 Subject: HistoryPP: remove WebPager support --- plugins/HistoryPlusPlus/CustomizeFiltersForm.pas | 2 +- plugins/HistoryPlusPlus/hpp_events.pas | 21 --------------------- plugins/HistoryPlusPlus/hpp_global.pas | 2 +- plugins/HistoryPlusPlus/hpp_options.pas | 7 ++----- 4 files changed, 4 insertions(+), 28 deletions(-) (limited to 'plugins') diff --git a/plugins/HistoryPlusPlus/CustomizeFiltersForm.pas b/plugins/HistoryPlusPlus/CustomizeFiltersForm.pas index a2bdc64c30..01bcd7a689 100644 --- a/plugins/HistoryPlusPlus/CustomizeFiltersForm.pas +++ b/plugins/HistoryPlusPlus/CustomizeFiltersForm.pas @@ -108,7 +108,7 @@ uses const // commented to use all events in system history - //IgnoreEvents: TMessageTypes = [mtSystem, mtWebPager]; + //IgnoreEvents: TMessageTypes = [mtSystem]; IgnoreEvents: TMessageTypes = []; {$R *.dfm} diff --git a/plugins/HistoryPlusPlus/hpp_events.pas b/plugins/HistoryPlusPlus/hpp_events.pas index 5d0131a742..36603472a6 100644 --- a/plugins/HistoryPlusPlus/hpp_events.pas +++ b/plugins/HistoryPlusPlus/hpp_events.pas @@ -76,7 +76,6 @@ const (Name:'System message'; XML:'SYS'; i:HPP_ICON_EVENT_SYSTEM; iName:'hppevn_sys'; iSkin:-1), (Name:'Contacts'; XML:'ICQCNT'; i:HPP_ICON_EVENT_CONTACTS; iName:'hppevn_icqcnt'; iSkin:-1), (Name:'SMS message'; XML:'SMS'; i:HPP_ICON_EVENT_SMS; iName:'hppevn_sms'; iSkin:-1), - (Name:'Webpager message'; XML:'ICQWP'; i:HPP_ICON_EVENT_WEBPAGER; iName:'hppevn_icqwp'; iSkin:-1), (Name:'Status changes'; XML:'STATUSCNG'; i:HPP_ICON_EVENT_STATUS; iName:'hppevn_status'; iSkin:-1), (Name:'SMTP Simple Email'; XML:'SMTP'; i:HPP_ICON_EVENT_SMTPSIMPLE;iName:'hppevn_smtp'; iSkin:-1), (Name:'Other events (unknown)';XML:'OTHER'; i:HPP_SKIN_OTHER_MIRANDA; iSkin:SKINICON_OTHER_MIRANDA), @@ -658,26 +657,6 @@ begin hi.Text := Format(TranslateUnicodeString(hi.Text),[AnsiToWideString(Contacts,cp)]); end; -procedure GetEventTextForWebPager(EventInfo: TDBEventInfo; var Hi: THistoryItem); -var - BytePos: LongWord; - Body,Name,Email: AnsiString; - cp: Cardinal; -begin - BytePos := 0; - ReadStringTillZeroA(Pointer(EventInfo.pBlob),EventInfo.cbBlob,Body,BytePos); - ReadStringTillZeroA(Pointer(EventInfo.pBlob),EventInfo.cbBlob,Name,BytePos); - ReadStringTillZeroA(Pointer(EventInfo.pBlob),EventInfo.cbBlob,Email,BytePos); - if Boolean(EventInfo.flags and DBEF_UTF) then - cp := CP_UTF8 - else - cp := hppCodepage; - hi.Text := Format(TranslateW('Webpager message from %s (%s): %s'), - [AnsiToWideString(Name,cp), - AnsiToWideString(Email,cp), - AnsiToWideString(#13#10+Body,cp)]); -end; - procedure GetEventTextForStatusChange(EventInfo: TDBEventInfo; var Hi: THistoryItem); var tmp: THistoryItem; diff --git a/plugins/HistoryPlusPlus/hpp_global.pas b/plugins/HistoryPlusPlus/hpp_global.pas index c2d93bc613..ca49d88e61 100644 --- a/plugins/HistoryPlusPlus/hpp_global.pas +++ b/plugins/HistoryPlusPlus/hpp_global.pas @@ -64,7 +64,7 @@ type TMessageType = (mtUnknown, mtIncoming, mtOutgoing, mtMessage, mtFile, mtSystem, - mtContacts, mtSMS, mtWebPager, mtStatus, mtSMTPSimple, + mtContacts, mtSMS, mtStatus, mtSMTPSimple, mtOther, mtNickChange,mtAvatarChange,mtWATrack,mtStatusMessage,mtVoiceCall,mtCustom); diff --git a/plugins/HistoryPlusPlus/hpp_options.pas b/plugins/HistoryPlusPlus/hpp_options.pas index 2f47378e9d..a288afad57 100644 --- a/plugins/HistoryPlusPlus/hpp_options.pas +++ b/plugins/HistoryPlusPlus/hpp_options.pas @@ -134,7 +134,7 @@ const (name:'historypp_33'; desc:'Limit Search Range'; group: 'Toolbar'; i:HPP_ICON_SEARCHRANGE) ); - hppFontItems: array[0..28] of ThppFontsRec = ( + hppFontItems: array[0..27] of ThppFontsRec = ( (_type: [hppFont,hppColor]; name: 'Incoming nick'; nameColor: 'Divider'; Mes: []; style:DBFONTF_BOLD; size: -11; color: $6B3FC8; back: clGray), @@ -216,9 +216,6 @@ const (_type: [hppFont,hppColor]; name: 'Voice calls'; Mes: [mtVoiceCall,mtIncoming,mtOutgoing]; style:0; size: -11; color: $000000; back: $E9DFAB), - (_type: [hppFont,hppColor]; name: 'Webpager message'; - Mes: [mtWebPager,mtIncoming,mtOutgoing]; style:0; size: -11; color: $000000; back: $FFFFFF), - (_type: [hppColor]; nameColor: 'Link'; Mes: []; back: clBlue) ); @@ -385,7 +382,7 @@ begin GridOptions.ColorSelected := LoadColorDB(2); GridOptions.ColorSessHeader := LoadColorDB(17); GridOptions.ColorBackground := LoadColorDB(22); - GridOptions.ColorLink := LoadColorDB(28); + GridOptions.ColorLink := LoadColorDB(27); // load mestype-related index := 0; -- cgit v1.2.3