Changeset 419

Timestamp:

Sep 12, 2012, 7:50:33 AM (12 years ago)

Author:

chronos

Message:

• Modified: ConfirmationForm package now use text identificator instead of numeric index.

Location:

ConfirmationDialog

Files:

• UConfirmationForm.lfm (modified) (2 diffs)
• UConfirmationForm.pas (modified) (11 diffs)

ConfirmationDialog/UConfirmationForm.lfm

@@ -10 +10 @@
   OnDestroy = FormDestroy
   Position = poMainFormCenter
-  LCLVersion = '0.9.30'
+  LCLVersion = '1.1'
   object LabelDescription: TLabel
     Left = 56
@@ -25 +25 @@
     Height = 17
     Top = 88
-    Width = 141
+    Width = 139
     Anchors = [akLeft, akBottom]
     Caption = 'Do same action next time'

ConfirmationDialog/UConfirmationForm.pas

@@ -13 +13 @@
 
   TConfirmMessage = class
-    Index: Integer;
+    SysName: string;
     Enabled: Boolean;
     Title: string;
@@ -27 +27 @@
   public
     constructor Create; override;
-    function AddItem(Index: Integer; Title, Text: string; Buttons: TMsgDlgButtons;
+    function AddItem(SysName: string; Title, Text: string; Buttons: TMsgDlgButtons;
       DefaultAction: TModalResult = mrNone): TConfirmMessage;
     procedure Register(Message: TConfirmMessage);
@@ -33 +33 @@
     procedure LoadFromRegistry(Context: TRegistryContext);
     procedure SaveToRegistry(Context: TRegistryContext);
-    function SearchByIndex(Index: Integer): TConfirmMessage;
+    function SearchByName(Name: string): TConfirmMessage;
   end;
 
@@ -68 +68 @@
   SCancel = 'Cancel';
   SOk = 'Ok';
+  SAbort = 'Abort';
+  SRetry = 'Retry';
+  SIgnore = 'Ignore';
+  SClose = 'Close';
   SConfirmMessageNotFound = 'Confirm message id %s not found';
 
@@ -85 +89 @@
 var
   RightPos: Integer;
-  I: Integer;
 const
   Space = 10;
@@ -135 +138 @@
 end;
 
-function TConfirmMessageList.AddItem(Index: Integer; Title, Text: string;
+function TConfirmMessageList.AddItem(SysName: string; Title, Text: string;
   Buttons: TMsgDlgButtons; DefaultAction: TModalResult = mrNone): TConfirmMessage;
 var
@@ -141 +144 @@
 begin
   NewMessage := TConfirmMessage.Create;
-  NewMessage.Index := Index;
+  NewMessage.SysName := SysName;
   NewMessage.Title := Title;
   NewMessage.Text := Text;
@@ -171 +174 @@
       with TConfirmMessage(Items[I]) do
       begin
-        OpenKey(Context.Key + '\' + IntToStr(Index), True);
+        OpenKey(Context.Key + '\' + SysName, True);
         Enabled := ReadBoolWithDefault('Enabled', Enabled);
         DefaultAction := ReadIntegerWithDefault('DefaultAction', DefaultAction);
@@ -190 +193 @@
       with TConfirmMessage(Items[I]) do
       begin
-        OpenKey(Context.Key + '\' + IntToStr(Index), True);
+        OpenKey(Context.Key + '\' + SysName, True);
         WriteBool('Enabled', Enabled);
         WriteInteger('DefaultAction', DefaultAction);
@@ -199 +202 @@
 end;
 
-function TConfirmMessageList.SearchByIndex(Index: Integer): TConfirmMessage;
+function TConfirmMessageList.SearchByName(Name: string): TConfirmMessage;
 var
   I: Integer;
 begin
   I := 0;
-  while (I < Count) and (TConfirmMessage(Items[I]).Index <> Index) do Inc(I);
+  while (I < Count) and (TConfirmMessage(Items[I]).SysName <> Name) do Inc(I);
   if I < Count then Result := TConfirmMessage(Items[I])
     else Result := nil;
@@ -217 +220 @@
   else if DefaultAction = mrNo then Result := SNo
   else if DefaultAction = mrCancel then Result := SCancel
-  else if DefaultAction = mrOK then Result := SOk;
+  else if DefaultAction = mrOK then Result := SOk
+  else if DefaultAction = mrAbort then Result := SAbort
+  else if DefaultAction = mrRetry then Result := SRetry
+  else if DefaultAction = mrIgnore then Result := SIgnore
+  else if DefaultAction = mrClose then Result := SClose;
 end;