Fixing broken forms and corrupt binary license form.

git-svn-id: svn://svn.code.sf.net/p/ekeyfinder/code/trunk@80 b14f650f-2e60-4330-827c-04cc947f8aee

License.pas

@@ -65,7 +65,7 @@ procedure TOKBottomDlg.Button1Click(Sender: TObject);
 procedure TOKBottomDlg.FormClose(Sender: TObject;
   var Action: TCloseAction);
 begin
-  Form1.Enabled := True;
+  frmMain.Enabled := True;
 end;
 
 end.

Main.pas

@@ -830,7 +830,7 @@ procedure TfrmMain.FindWinVersion;
 
 {  if RemotePC1.Checked then
   begin
-    if MyReg.RegistryConnect(Form4.Edit1.Text) = False then
+    if MyReg.RegistryConnect(frmRemote.Edit1.Text) = False then
     begin
       ShowMessage('Unable to connect to remote mchine.');
       RemotePC1.Checked := False;
@@ -1646,7 +1646,7 @@ procedure TfrmMain.ParseConfig;
   end; }
 
   StatusBar1.Panels.Items[2].Text := 'Detected: ' + IntToStr(ListBox2.Items.Count);
-end; // TForm1.ParseConfig
+end; // TfrmMain.ParseConfig
 
 procedure TfrmMain.OfficeList;
 var

Options.dfm

@@ -1,4 +1,4 @@
-object Form2: TForm2
+object frmOptions: TfrmOptions
   Left = 465
   Top = 306
   BorderIcons = []

Options.pas

@@ -34,7 +34,7 @@ function SetFont1(F_Font: TFont): boolean;
 function SetFont2(F_Font: TFont): boolean;}
 
 type
-  TForm2 = class(TForm)
+  TfrmOptions = class(TForm)
     Button1: TButton;
     Button2: TButton;
     Button3: TButton;
@@ -66,7 +66,7 @@   TForm2 = class(TForm)
   end;
 
 var
-  Form2: TForm2;
+  frmOptions: TfrmOptions;
 
 implementation
 
@@ -75,50 +75,50 @@ implementation
 
 {$R *.dfm}
 
-procedure TForm2.Button1Click(Sender: TObject);
+procedure TfrmOptions.Button1Click(Sender: TObject);
 begin
-  Form1.FontDialog.Font := Form1.ListBox1.Font;
-  Form1.FontDialog.Execute;
-  Form1.ListBox1.Font := Form1.FontDialog.Font;
-  //Button1.Font := Form1.ListBox1.Font;
-  LblAppList.Font := Form1.ListBox1.Font;
+  frmMain.FontDialog.Font := frmMain.ListBox1.Font;
+  frmMain.FontDialog.Execute;
+  frmMain.ListBox1.Font := frmMain.FontDialog.Font;
+  //Button1.Font := frmMain.ListBox1.Font;
+  LblAppList.Font := frmMain.ListBox1.Font;
 end;
 
-procedure TForm2.FormClose(Sender: TObject; var Action: TCloseAction);
+procedure TfrmOptions.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
-  Form1.Enabled := True;
+  frmMain.Enabled := True;
 end;
 
-procedure TForm2.FormCreate(Sender: TObject);
+procedure TfrmOptions.FormCreate(Sender: TObject);
 begin
-  Label2.Font     := Form1.ListBox1.Font;
-  LblAppList.Font := Form1.ListBox1.Font;
-  Label3.Font     := Form1.Memo1.Font;
-  LblKeyDisp.Font := Form1.Memo1.Font;
-  {SetFont1(Form1.ListBox1.Font);
-  SetFont2(Form1.Memo1.Font);}
-  LblAppList.Font := Form1.ListBox1.Font;
-  LblKeyDisp.Font := Form1.Memo1.Font;
-  //Button1.Font := Form1.ListBox1.Font;
-  //Button2.Font := Form1.Memo1.Font;
-  EdtCSV1.Text     := Form1.sDelimCSV;
+  Label2.Font     := frmMain.ListBox1.Font;
+  LblAppList.Font := frmMain.ListBox1.Font;
+  Label3.Font     := frmMain.Memo1.Font;
+  LblKeyDisp.Font := frmMain.Memo1.Font;
+  {SetFont1(frmMain.ListBox1.Font);
+  SetFont2(frmMain.Memo1.Font);}
+  LblAppList.Font := frmMain.ListBox1.Font;
+  LblKeyDisp.Font := frmMain.Memo1.Font;
+  //Button1.Font := frmMain.ListBox1.Font;
+  //Button2.Font := frmMain.Memo1.Font;
+  EdtCSV1.Text     := frmMain.sDelimCSV;
   EdtLogPath.Text := sLogFilePath;
   OptChkBxErrLog.Checked := bLogging;
   Button5.Enabled := OptChkBxErrLog.Checked;
   EdtLogPath.Enabled := OptChkBxErrLog.Checked;
 
 end;
 
-procedure TForm2.Button2Click(Sender: TObject);
+procedure TfrmOptions.Button2Click(Sender: TObject);
 begin
-  Form1.FontDialog.Font := Form1.Memo1.Font;
-  Form1.FontDialog.Execute;
-  Form1.Memo1.Font := Form1.FontDialog.Font;
-  LblKeyDisp.Font  := Form1.Memo1.Font;
-  //Button2.Font := Form1.Memo1.Font;
+  frmMain.FontDialog.Font := frmMain.Memo1.Font;
+  frmMain.FontDialog.Execute;
+  frmMain.Memo1.Font := frmMain.FontDialog.Font;
+  LblKeyDisp.Font  := frmMain.Memo1.Font;
+  //Button2.Font := frmMain.Memo1.Font;
 end;
 
-procedure TForm2.Button3Click(Sender: TObject);
+procedure TfrmOptions.Button3Click(Sender: TObject);
 {var
   MyINI: TINIFile;}
 begin
@@ -127,8 +127,8 @@ procedure TForm2.Button3Click(Sender: TObject);
   SaveFont2(Button2.Font);}
   {try
     myINI := TINIFile.Create(ChangeFileExt(Application.ExeName, '.ini'));
-    SaveFont(myINI, 'AppListFont', Form1.ListBox1.Font);
-    SaveFont(myINI, 'KeyListFont', Form1.Memo1.Font);
+    SaveFont(myINI, 'AppListFont', frmMain.ListBox1.Font);
+    SaveFont(myINI, 'KeyListFont', frmMain.Memo1.Font);
   finally
     myINI.Free;
   end;     }
@@ -138,56 +138,56 @@ procedure TForm2.Button3Click(Sender: TObject);
     Exit;
   end;
   if EdtCSV1.Text <> '' then
-    Form1.sDelimCSV := EdtCSV1.Text;
+    frmMain.sDelimCSV := EdtCSV1.Text;
   if EdtLogPath.Text <> '' then
-    Form1.sLogPath := EdtLogPath.Text;
-  Form1.SaveSettings(Form1);
+    frmMain.sLogPath := EdtLogPath.Text;
+  frmMain.SaveSettings(frmMain);
   Close;
 end;
 
-procedure TForm2.Button5Click(Sender: TObject);
+procedure TfrmOptions.Button5Click(Sender: TObject);
 //var
   //bBrowse: boolean;
 begin
-  //bBrowse := BrowseForFolder(Form1.sLogPath, 'Select The Log Directory...');
-  BrowseForFolder(Form1.sLogPath, 'Select The Log Directory...');
-  EdtLogPath.Text := Form1.sLogPath;
-  sLogFilePath := Form1.sLogPath;
+  //bBrowse := BrowseForFolder(frmMain.sLogPath, 'Select The Log Directory...');
+  BrowseForFolder(frmMain.sLogPath, 'Select The Log Directory...');
+  EdtLogPath.Text := frmMain.sLogPath;
+  sLogFilePath := frmMain.sLogPath;
 end;
 
-procedure TForm2.OptChkBxErrLogClick(Sender: TObject);
+procedure TfrmOptions.OptChkBxErrLogClick(Sender: TObject);
 begin
   Button5.Enabled := OptChkBxErrLog.Checked;
   EdtLogPath.Enabled := OptChkBxErrLog.Checked;
   bLogging := OptChkBxErrLog.Checked;
 end;
 
-procedure TForm2.OptChkBxSaveClick(Sender: TObject);
+procedure TfrmOptions.OptChkBxSaveClick(Sender: TObject);
 begin
   bSaveSettings := OptChkBxSave.Checked; 
 end;
 
-procedure TForm2.ButOptRestDefClick(Sender: TObject);
+procedure TfrmOptions.ButOptRestDefClick(Sender: TObject);
 //var
   //MyINI: TINIFile;
 begin
-  Form1.ListBox1.Font := Label2.Font;
-  Form1.Memo1.Font    := Label3.Font;
-  {SaveFont1(Form1.ListBox1.Font);
-  SaveFont2(Form1.Memo1.Font);}
+  frmMain.ListBox1.Font := Label2.Font;
+  frmMain.Memo1.Font    := Label3.Font;
+  {SaveFont1(frmMain.ListBox1.Font);
+  SaveFont2(frmMain.Memo1.Font);}
   {try
     myINI := TINIFile.Create(ChangeFileExt(Application.ExeName, '.ini'));
-    SaveFont(myINI, 'AppListFont', Form1.ListBox1.Font);
-    SaveFont(myINI, 'KeyListFont', Form1.Memo1.Font);
+    SaveFont(myINI, 'AppListFont', frmMain.ListBox1.Font);
+    SaveFont(myINI, 'KeyListFont', frmMain.Memo1.Font);
   finally
     myINI.Free;
   end;    }
-  Form2.FormCreate(Form2);
+  frmOptions.FormCreate(frmOptions);
   EdtCSV1.Text     := DefDelimCSV;
   EdtLogPath.Text := DefLogPath;
   OptChkBxErrLog.Checked := False;
   OptChkBxSave.Checked := False;
-  Form2.OptChkBxErrLogClick(Form2);
+  frmOptions.OptChkBxErrLogClick(frmOptions);
 end;
 
 //old method for storing font settings.

Registration.dfm

@@ -1,4 +1,4 @@
-object Form3: TForm3
+object frmRegistration: TfrmRegistration
   Left = 279
   Top = 314
   BorderIcons = []

Registration.pas

@@ -29,7 +29,7 @@ interface
   Dialogs, StdCtrls, Registry;
 
 type
-  TForm3 = class(TForm)
+  TfrmRegistration = class(TForm)
     Button1: TButton;
     Button2: TButton;
     Edit2: TEdit;
@@ -50,7 +50,7 @@   TForm3 = class(TForm)
   end;
 
 var
-  Form3: TForm3;
+  frmRegistration: TfrmRegistration;
   keychange, ownerchange, organizationchange: boolean;
 
 implementation
@@ -60,14 +60,14 @@ implementation
 
 {$R *.dfm}
 
-procedure TForm3.Button1Click(Sender: TObject);
+procedure TfrmRegistration.Button1Click(Sender: TObject);
 var
   Registry: TRegistry;
 
 begin
   if ownerchange = true then
   begin
-    if Form1.ListBox2.Items.Strings[0] = 'WinXP' then
+    if frmMain.ListBox2.Items.Strings[0] = 'WinXP' then
     begin
       Registry:=TRegistry.Create;
       Registry.RootKey:=HKEY_LOCAL_MACHINE;
@@ -79,7 +79,7 @@ procedure TForm3.Button1Click(Sender: TObject);
       Registry.Free;
     end;
 
-    if Form1.ListBox2.Items.Strings[0] = 'Win9x' then
+    if frmMain.ListBox2.Items.Strings[0] = 'Win9x' then
     begin
       Registry:=TRegistry.Create;
       Registry.RootKey:=HKEY_LOCAL_MACHINE;
@@ -94,7 +94,7 @@ procedure TForm3.Button1Click(Sender: TObject);
 
   if organizationchange = true then
   begin
-    if Form1.ListBox2.Items.Strings[0] = 'WinXP' then
+    if frmMain.ListBox2.Items.Strings[0] = 'WinXP' then
     begin
       Registry:=TRegistry.Create;
       Registry.RootKey:=HKEY_LOCAL_MACHINE;
@@ -106,7 +106,7 @@ procedure TForm3.Button1Click(Sender: TObject);
       Registry.Free;
     end;
 
-    if Form1.ListBox2.Items.Strings[0] = 'Win9x' then
+    if frmMain.ListBox2.Items.Strings[0] = 'Win9x' then
     begin
       Registry:=TRegistry.Create;
       Registry.RootKey:=HKEY_LOCAL_MACHINE;
@@ -120,41 +120,41 @@ procedure TForm3.Button1Click(Sender: TObject);
   end;
 
   Close;
-  Form1.ListBox1.Selected[0] := True;
-  Form1.ListBox1Click(Form1);
+  frmMain.ListBox1.Selected[0] := True;
+  frmMain.ListBox1Click(frmMain);
 end;
 
-procedure TForm3.Button2Click(Sender: TObject);
+procedure TfrmRegistration.Button2Click(Sender: TObject);
 begin
   Button1.Enabled := False;
   Close;
 end;
 
-procedure TForm3.FormClose(Sender: TObject; var Action: TCloseAction);
+procedure TfrmRegistration.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
-  Form1.Enabled := True;
+  frmMain.Enabled := True;
 end;
 
-procedure TForm3.Edit2KeyPress(Sender: TObject; var Key: Char);
+procedure TfrmRegistration.Edit2KeyPress(Sender: TObject; var Key: Char);
 begin
   ownerchange := true;
   Button1.Enabled := true;
 end;
 
-procedure TForm3.Edit3KeyPress(Sender: TObject; var Key: Char);
+procedure TfrmRegistration.Edit3KeyPress(Sender: TObject; var Key: Char);
 begin
   organizationchange := true;
   Button1.Enabled := True;
 end;
 
-procedure TForm3.FormShow(Sender: TObject);
+procedure TfrmRegistration.FormShow(Sender: TObject);
 begin
   keychange := False;
   ownerchange := false;
   organizationchange := false;
 end;
 
-procedure TForm3.Edit1KeyPress(Sender: TObject; var Key: Char);
+procedure TfrmRegistration.Edit1KeyPress(Sender: TObject; var Key: Char);
 begin
   keychange := true;
   Button1.Enabled := True

Remote.dfm

@@ -1,4 +1,4 @@
-object Form4: TForm4
+object frmRemote: TfrmRemote
   Left = 347
   Top = 424
   BorderIcons = [biSystemMenu]

Remote.pas

@@ -27,7 +27,7 @@ interface
   Dialogs, StdCtrls, Registry;
 
 type
-  TForm4 = class(TForm)
+  TfrmRemote = class(TForm)
     Label2: TLabel;
     PaswrdLbl: TLabel;
     Label3: TLabel;
@@ -50,7 +50,7 @@   TForm4 = class(TForm)
   end;
 
 var
-  Form4: TForm4;
+  frmRemote: TfrmRemote;
 
 implementation
 
@@ -59,18 +59,18 @@ implementation
 
 {$R *.dfm}
 
-procedure TForm4.FormClose(Sender: TObject; var Action: TCloseAction);
+procedure TfrmRemote.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
-  Form1.Enabled := True;
+  frmMain.Enabled := True;
 end;
 
-procedure TForm4.Button2Click(Sender: TObject);
+procedure TfrmRemote.Button2Click(Sender: TObject);
 begin
   Edit1.Text := '';
   Close;
 end;
 
-procedure TForm4.Button1Click(Sender: TObject);
+procedure TfrmRemote.Button1Click(Sender: TObject);
 var
   s1: string;
 begin
@@ -81,8 +81,8 @@ procedure TForm4.Button1Click(Sender: TObject);
   end
   else
   begin
-    Form1.RemotePC1.Checked := True;
-    Form1.ProgramInit;
+    frmMain.RemotePC1.Checked := True;
+    frmMain.ProgramInit;
     Close;
   end;
 end;