ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/public/ibx/trunk/examples/DBAdmin/MainFormUnit.pas
(Generate patch)

Comparing ibx/trunk/examples/DBAdmin/MainFormUnit.pas (file contents):
Revision 208 by tony, Thu Mar 1 11:23:33 2018 UTC vs.
Revision 209 by tony, Wed Mar 14 12:48:51 2018 UTC

# Line 25 | Line 25 | uses
25    Classes, SysUtils, FileUtil, SynEdit, SynHighlighterSQL,
26    SynGutterCodeFolding, Forms, Controls, Graphics, Dialogs, Menus, ComCtrls,
27    ActnList, StdCtrls, DbCtrls, ExtCtrls, Buttons, db, IBLookupComboEditBox,
28 <  IBDynamicGrid, IBTreeView, IBDatabaseInfo, IBServices, IBExtract;
28 >  IBDynamicGrid, IBTreeView, IBDatabaseInfo, IBXServices, IBExtract, IB;
29  
30   type
31  
# Line 34 | Line 34 | type
34    TMainForm = class(TForm)
35      AccessRightsPopup: TPopupMenu;
36      AccessRightsSource: TDataSource;
37 +    AutoAdmin: TCheckBox;
38      DatabaseAliasName: TEdit;
39      DBEdit5: TDBEdit;
40      DBEdit6: TDBEdit;
# Line 132 | Line 133 | type
133      AddFileBtn: TButton;
134      AddShadowBtn: TButton;
135      AllocatedPages: TEdit;
135 –    AutoAdmin: TCheckBox;
136      Button1: TButton;
137      DatabaseOnline: TCheckBox;
138      DBCharacterSet: TIBLookupComboEditBox;
# Line 295 | Line 295 | type
295      procedure DropDatabaseExecute(Sender: TObject);
296      procedure DropDatabaseUpdate(Sender: TObject);
297      procedure AccessRightsTreeViewSelectionChanged(Sender: TObject);
298 +    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
299      procedure MappingsTabHide(Sender: TObject);
300      procedure MappingsTabShow(Sender: TObject);
301      procedure PageBuffersEditingDone(Sender: TObject);
302 +    procedure QuitExecute(Sender: TObject);
303      procedure RepairTabHide(Sender: TObject);
304      procedure RepairTabShow(Sender: TObject);
305      procedure RevokeAllExecute(Sender: TObject);
# Line 358 | Line 360 | implementation
360   {$R *.lfm}
361  
362   uses DataModule, ShutdownRegDlgUnit, AddSecondaryFileDlgUnit, NewUserDlgUnit,
363 <  ChgPasswordDlgUnit;
363 >  ChgPasswordDlgUnit, FBMessages;
364  
365   { TMainForm }
366  
367   procedure TMainForm.FormShow(Sender: TObject);
368   begin
369 +  {Set IB Exceptions to only show text message - omit SQLCode and Engine Code}
370 +  FirebirdAPI.GetStatus.SetIBDataBaseErrorMessages([ShowIBMessage]);
371 +  Application.ExceptionDialog := aedOkMessageBox;
372    PageControl1.ActivePage := Properties;
373    DatabaseData.AfterDBConnect := @HandleDBConnect;
374    DatabaseData.AfterDataReload := @HandleLoadData;
# Line 505 | Line 510 | begin
510    with UserListSource.DataSet do
511    begin
512      Append;
513 <    FieldByName('UserName').AsString := AnsiUpperCase(NewUserName);
514 <    FieldByName('USERPASSWORD').AsString := NewPassword;
513 >    FieldByName('SEC$USER_NAME').AsString := AnsiUpperCase(NewUserName);
514 >    FieldByName('SEC$PASSWORD').AsString := NewPassword;
515    end;
516   end;
517  
# Line 552 | Line 557 | begin
557    with UserListSource.DataSet do
558    begin
559      Edit;
560 <    FieldByName('USERPASSWORD').AsString := NewPassword;
560 >    FieldByName('SEC$PASSWORD').AsString := NewPassword;
561      try
562        Post
563      except
# Line 584 | Line 589 | begin
589   end;
590  
591   procedure TMainForm.DatabaseOnlineChange(Sender: TObject);
592 < var ShutDownMode: TShutDownMode;
592 > var ShutDownMode: TDBShutDownMode;
593      Delay: integer;
594   begin
595    if FLoading then Exit;
# Line 625 | Line 630 | end;
630  
631   procedure TMainForm.DeleteUserExecute(Sender: TObject);
632   begin
633 <  if MessageDlg('Do you really want to delete user ' + Trim(UserListSource.DataSet.FieldByName('UserName').AsString),
633 >  if MessageDlg('Do you really want to delete user ' + Trim(UserListSource.DataSet.FieldByName('SEC$USER_NAME').AsString),
634       mtConfirmation,[mbYes,mbNo],0) = mrYes then
635       UserListSource.DataSet.Delete;
636   end;
# Line 679 | Line 684 | begin
684    end;
685   end;
686  
687 + procedure TMainForm.FormClose(Sender: TObject; var CloseAction: TCloseAction);
688 + begin
689 +  DatabaseData.Disconnect;
690 + end;
691 +
692   procedure TMainForm.MappingsTabHide(Sender: TObject);
693   begin
694    AuthMapSource.DataSet.Active := false;
# Line 687 | Line 697 | end;
697   procedure TMainForm.MappingsTabShow(Sender: TObject);
698   begin
699    if not Visible or not IBDatabaseInfo.Database.Connected then Exit;
700 <  AuthMapSource.DataSet.Active := true;
700 >  AuthMapSource.DataSet.Active := IBDatabaseInfo.ODSMajorVersion > 11;
701   end;
702  
703   procedure TMainForm.PageBuffersEditingDone(Sender: TObject);
# Line 695 | Line 705 | begin
705    DatabaseData.PageBuffers := StrToInt(PageBuffers.Text);
706   end;
707  
708 + procedure TMainForm.QuitExecute(Sender: TObject);
709 + begin
710 +  Close;
711 + end;
712 +
713   procedure TMainForm.RepairTabHide(Sender: TObject);
714   begin
715    DBTablesSource.DataSet.Active := false;
# Line 1032 | Line 1047 | begin
1047      begin
1048        PagesUsed.Text := IntToStr(IBDatabaseInfo.PagesUsed);
1049        PagesAvail.Text := IntToStr(IBDatabaseInfo.PagesFree);
1050 <      AutoAdmin.Checked := DatabaseData.AutoAdmin;
1050 >      AutoAdmin.Checked := not DatabaseData.EmbeddedMode and DatabaseData.AutoAdmin;
1051      end
1052      else
1053      begin
# Line 1088 | Line 1103 | begin
1103  
1104    if IBDatabaseInfo.ODSMajorVersion >= 12 then
1105    begin
1091 –    MappingsTab.TabVisible := true;
1106      AttmtGrid.Columns[2].Visible := true;
1107      AttmntODS12Panel.Visible := true;
1108      DBCharacterSet.Visible := true;
# Line 1096 | Line 1110 | begin
1110    end
1111    else
1112    begin
1099 –    MappingsTab.TabVisible := false;
1113      AttmtGrid.Columns[2].Visible := false;
1114      AttmntODS12Panel.Visible := false;
1115      DBCharacterSet.Visible := false;
1116      DBCharSetRO.Visible := true;
1117    end;
1118 +  MappingsTab.TabVisible := not DatabaseData.EmbeddedMode and
1119 +  ((IBDatabaseInfo.ODSMajorVersion > 11) or
1120 +    ((IBDatabaseInfo.ODSMajorVersion = 11) and (IBDatabaseInfo.ODSMinorVersion > 0)));
1121    UserManagerTab.TabVisible := not DatabaseData.EmbeddedMode;
1122    AccessRightsTab.TabVisible := not DatabaseData.EmbeddedMode;
1123 +  AutoAdmin.Enabled := not DatabaseData.EmbeddedMode;
1124   end;
1125  
1126   procedure TMainForm.ConfigureOnlineValidation;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines