From 17642b44ab98a01d2b1f3768430992f00f524ae7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 30 Jan 2019 21:12:21 +0300 Subject: mtEmailExpress support removed --- plugins/HistoryPlusPlus/CustomizeFiltersForm.pas | 2 +- plugins/HistoryPlusPlus/HistoryForm.pas | 5 ----- plugins/HistoryPlusPlus/HistoryGrid.pas | 2 -- plugins/HistoryPlusPlus/hpp_events.pas | 23 +---------------------- plugins/HistoryPlusPlus/hpp_global.pas | 2 +- plugins/HistoryPlusPlus/hpp_options.pas | 15 ++------------- 6 files changed, 5 insertions(+), 44 deletions(-) (limited to 'plugins/HistoryPlusPlus') diff --git a/plugins/HistoryPlusPlus/CustomizeFiltersForm.pas b/plugins/HistoryPlusPlus/CustomizeFiltersForm.pas index 393356a81d..a2bdc64c30 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, mtEmailExpress]; + //IgnoreEvents: TMessageTypes = [mtSystem, mtWebPager]; IgnoreEvents: TMessageTypes = []; {$R *.dfm} diff --git a/plugins/HistoryPlusPlus/HistoryForm.pas b/plugins/HistoryPlusPlus/HistoryForm.pas index 6a737a7b3e..a25609e604 100644 --- a/plugins/HistoryPlusPlus/HistoryForm.pas +++ b/plugins/HistoryPlusPlus/HistoryForm.pas @@ -51,11 +51,6 @@ closing history window without closing find dialog don't throws exception - [ Known Issues ] - - * Not very good support of EmailExpress events (togeter - with HistoryGrid.pas) - Contributors: theMIROn, Art Fedorov ----------------------------------------------------------------------------- } diff --git a/plugins/HistoryPlusPlus/HistoryGrid.pas b/plugins/HistoryPlusPlus/HistoryGrid.pas index 0076e33b1c..366d6e8a05 100644 --- a/plugins/HistoryPlusPlus/HistoryGrid.pas +++ b/plugins/HistoryPlusPlus/HistoryGrid.pas @@ -62,8 +62,6 @@ [ Known Issues ] * Some visual bugs when track-scrolling. See WMVScroll for details. - * Not very good support of EmailExpress events (togeter - with HistoryForm.pas) Contributors: theMIROn, Art Fedorov ----------------------------------------------------------------------------- } diff --git a/plugins/HistoryPlusPlus/hpp_events.pas b/plugins/HistoryPlusPlus/hpp_events.pas index 3415906d2e..5d0131a742 100644 --- a/plugins/HistoryPlusPlus/hpp_events.pas +++ b/plugins/HistoryPlusPlus/hpp_events.pas @@ -77,7 +77,6 @@ const (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:'EMail Express message'; XML:'ICQEX'; i:HPP_ICON_EVENT_EEXPRESS; iName:'hppevn_icqex'; 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), @@ -181,7 +180,7 @@ type end; var - EventTable: array[0..25] of TEventTableItem = ( + EventTable: array[0..24] of TEventTableItem = ( // must be the first item in array for unknown events (EventType: MaxWord; MessageType: mtOther; TextFunction: GetEventTextForOther), // events definitions @@ -192,7 +191,6 @@ var (EventType: EVENTTYPE_CONTACTS; MessageType: mtContacts; TextFunction: GetEventTextForContacts), (EventType: EVENTTYPE_STATUSCHANGE; MessageType: mtStatus; TextFunction: GetEventTextForStatusChange), (EventType: EVENTTYPE_SMTPSIMPLE; MessageType: mtSMTPSimple; TextFunction: GetEventTextForMessage), - (EventType: EVENTTYPE_SMS; MessageType: mtSMS; TextFunction: GetEventTextForSMS), (EventType: EVENTTYPE_NICKNAMECHANGE; MessageType: mtNickChange; TextFunction: GetEventTextForMessage), (EventType: EVENTTYPE_STATUSMESSAGECHANGE; MessageType: mtStatusMessage; TextFunction: GetEventTextForMessage), (EventType: EVENTTYPE_AVATARCHANGE; MessageType: mtAvatarChange; TextFunction: GetEventTextForAvatarChange), @@ -680,25 +678,6 @@ begin AnsiToWideString(#13#10+Body,cp)]); end; -procedure GetEventTextForEmailExpress(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('Email express 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 3d2c44f32b..c2d93bc613 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, mtEmailExpress, mtStatus, mtSMTPSimple, + mtContacts, mtSMS, mtWebPager, mtStatus, mtSMTPSimple, mtOther, mtNickChange,mtAvatarChange,mtWATrack,mtStatusMessage,mtVoiceCall,mtCustom); diff --git a/plugins/HistoryPlusPlus/hpp_options.pas b/plugins/HistoryPlusPlus/hpp_options.pas index cd072da153..2f47378e9d 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..29] of ThppFontsRec = ( + hppFontItems: array[0..28] of ThppFontsRec = ( (_type: [hppFont,hppColor]; name: 'Incoming nick'; nameColor: 'Divider'; Mes: []; style:DBFONTF_BOLD; size: -11; color: $6B3FC8; back: clGray), @@ -219,9 +219,6 @@ const (_type: [hppFont,hppColor]; name: 'Webpager message'; Mes: [mtWebPager,mtIncoming,mtOutgoing]; style:0; size: -11; color: $000000; back: $FFFFFF), - (_type: [hppFont,hppColor]; name: 'EMail Express message'; - Mes: [mtEmailExpress,mtIncoming,mtOutgoing]; style:0; size: -11; color: $000000; back: $FFFFFF), - (_type: [hppColor]; nameColor: 'Link'; Mes: []; back: clBlue) ); @@ -377,7 +374,6 @@ begin try // load fonts LoadFont(0, GridOptions.FontContact); - // GridOptions.FontSelected := LoadFont(2,GridOptions.FontSelected); GridOptions.FontProfile := LoadFont(1, GridOptions.FontProfile); GridOptions.FontSessHeader := LoadFont(17, GridOptions.FontSessHeader); GridOptions.FontIncomingTimestamp := LoadFont(20, GridOptions.FontIncomingTimestamp); @@ -389,7 +385,7 @@ begin GridOptions.ColorSelected := LoadColorDB(2); GridOptions.ColorSessHeader := LoadColorDB(17); GridOptions.ColorBackground := LoadColorDB(22); - GridOptions.ColorLink := LoadColorDB(29); + GridOptions.ColorLink := LoadColorDB(28); // load mestype-related index := 0; @@ -409,13 +405,6 @@ begin end; end; - // for i := 3 to High(hppFontItems)-1 do begin - // if (i-3) > High(GridOptions.ItemOptions) then GridOptions.AddItemOptions; - // GridOptions.ItemOptions[i-3].MessageType := hppFontItems[i].Mes; - // LoadFont(i,GridOptions.ItemOptions[i-3].textFont); - // GridOptions.ItemOptions[i-3].textColor := LoadColorDB(i); - // end; - // load others GridOptions.ShowIcons := GetDBBool(hppDBName, 'ShowIcons', true); GridOptions.RTLEnabled := GetContactRTLMode(0, ''); -- cgit v1.2.3