old perversion with metas removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@9509 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 5 insertions, 39 deletions

diff --git a/plugins/HistoryPlusPlus/EmptyHistoryForm.dfm b/plugins/HistoryPlusPlus/EmptyHistoryForm.dfm
index 8bc9997da0..559f5cf366 100644
--- a/plugins/HistoryPlusPlus/EmptyHistoryForm.dfm
+++ b/plugins/HistoryPlusPlus/EmptyHistoryForm.dfm
@@ -4,7 +4,7 @@ object EmptyHistoryFrm: TEmptyHistoryFrm
   BorderStyle = bsDialog

   BorderWidth = 8

   Caption = 'Empty History'

-  ClientHeight = 79

+  ClientHeight = 65

   ClientWidth = 274

   Color = clBtnFace

   DefaultMonitor = dmDesktop

@@ -22,7 +22,7 @@ object EmptyHistoryFrm: TEmptyHistoryFrm
   OnShow = FormShow

   DesignSize = (

     274

-    79)

+    65)

   PixelsPerInch = 96

   TextHeight = 13

   object Image: TImage

@@ -43,13 +43,14 @@ object EmptyHistoryFrm: TEmptyHistoryFrm
   end

   object paButtons: TPanel

     Left = 0

-    Top = 54

+    Top = 40

     Width = 274

     Height = 25

     Align = alBottom

     AutoSize = True

     BevelOuter = bvNone

     TabOrder = 0

+    ExplicitTop = 54

     object btYes: TButton

       Left = 0

       Top = 0

@@ -71,24 +72,4 @@ object EmptyHistoryFrm: TEmptyHistoryFrm
       TabOrder = 1

     end

   end

-  object paContacts: TPanel

-    Left = 0

-    Top = 31

-    Width = 274

-    Height = 23

-    Align = alBottom

-    BevelOuter = bvNone

-    TabOrder = 1

-    Visible = False

-    object cbInclude: TCheckBox

-      Left = 0

-      Top = 0

-      Width = 274

-      Height = 23

-      Caption = 'Empty history of subcontacts also'

-      Checked = True

-      State = cbChecked

-      TabOrder = 0

-    end

-  end

 end

diff --git a/plugins/HistoryPlusPlus/EmptyHistoryForm.pas b/plugins/HistoryPlusPlus/EmptyHistoryForm.pas
index 33fe30105b..6e6b563ea2 100644
--- a/plugins/HistoryPlusPlus/EmptyHistoryForm.pas
+++ b/plugins/HistoryPlusPlus/EmptyHistoryForm.pas
@@ -54,18 +54,15 @@ type
   TEmptyHistoryFrm = class(TForm)

     btYes: TButton;

     btNo: TButton;

-    paContacts: TPanel;

     paButtons: TPanel;

     Image: TImage;

     Text: TLabel;

-    cbInclude: TCheckBox;

     procedure FormCreate(Sender: TObject);

     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);

     procedure FormShow(Sender: TObject);

     procedure btYesClick(Sender: TObject);

   private

     FContact: TMCONTACT;

-    FContacts: Array of TMCONTACT;

     procedure TranslateForm;

     procedure PrepareForm;

     procedure SetContact(const Value: TMCONTACT);

@@ -100,7 +97,7 @@ end;
 

 function TEmptyHistoryFrm.GetFormText: String;

 var

-  DividerLine, ButtonCaptions, IncludeContacts: String;

+  DividerLine, ButtonCaptions: String;

   I: integer;

 begin

   DividerLine := StringOfChar('-', 27) + sLineBreak;

@@ -109,19 +106,8 @@ begin
       ButtonCaptions := ButtonCaptions +

                         TButton(Components[I]).Caption + StringOfChar(' ', 3);

   ButtonCaptions := StringReplace(ButtonCaptions,'&','', [rfReplaceAll]);

-  if paContacts.Visible then

-  begin

-    if cbInclude.Checked then

-      IncludeContacts := '[x]'

-    else

-      IncludeContacts := '[ ]';

-    IncludeContacts := sLineBreak + IncludeContacts + ' ' + cbInclude.Caption + sLineBreak;

-  end

-  else

-    IncludeContacts := '';

   Result := DividerLine + Caption + sLineBreak +

             DividerLine + Text.Caption + sLineBreak +

-            IncludeContacts +

             DividerLine + ButtonCaptions + sLineBreak +

             DividerLine;

 end;

@@ -129,7 +115,6 @@ end;
 procedure TEmptyHistoryFrm.TranslateForm;

 begin

   Caption           := TranslateUnicodeString(Caption);

-  cbInclude.Caption := TranslateUnicodeString(cbInclude.Caption);

   btYes.Caption     := TranslateUnicodeString(btYes.Caption);

   btNo.Caption      := TranslateUnicodeString(btNo.Caption);

 end;