opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-14 01:56:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Decide to refresh data if the OK button in any of the two dialogs (column_selection, data_sorting) was pressed. Don't call viewdata in the dialogs, but in ChildWin itself. Saves some superflous procedures / code.

Browse Source
This commit is contained in:
Ansgar Becker
2007-07-12 22:44:05 +00:00
parent cc84963b25
commit 064ed3b4da
4 changed files with 9 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/childwin.pas
View File

@ -5544,8 +5544,9 @@ begin
frm.Top := btn.ClientOrigin.Y + btn.Height; frm.Top := btn.ClientOrigin.Y + btn.Height;
frm.Left := btn.ClientOrigin.X; frm.Left := btn.ClientOrigin.X;
// Display form // Display form and refresh data if needed
frm.ShowModal; if frm.ShowModal = mrOK then
ViewData(self);
btn.Down := False; btn.Down := False;
end; end;

3
source/column_selection.dfm
View File

@ -12,7 +12,6 @@ object ColumnSelectionForm: TColumnSelectionForm
Font.Name = 'Tahoma' Font.Name = 'Tahoma'
Font.Style = [] Font.Style = []
OldCreateOrder = False OldCreateOrder = False
OnClose = FormClose
OnShow = FormShow OnShow = FormShow
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
@ -31,8 +30,8 @@ object ColumnSelectionForm: TColumnSelectionForm
Height = 25 Height = 25
Cancel = True Cancel = True
Caption = 'Cancel' Caption = 'Cancel'
ModalResult = 2
TabOrder = 3 TabOrder = 3
OnClick = btnCancelClick
end end
object btnOK: TButton object btnOK: TButton
Left = 4 Left = 4

31
source/column_selection.pas
View File

@ -16,9 +16,7 @@ type
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
procedure chklistColumnsClickCheck(Sender: TObject); procedure chklistColumnsClickCheck(Sender: TObject);
procedure chkSelectAllClick(Sender: TObject); procedure chkSelectAllClick(Sender: TObject);
procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure btnOKClick(Sender: TObject); procedure btnOKClick(Sender: TObject);
procedure btnCancelClick(Sender: TObject);
private private
{ Private declarations } { Private declarations }
public public
@ -76,15 +74,6 @@ begin
end; end;
{**
Cancel clicked
}
procedure TColumnSelectionForm.btnCancelClick(Sender: TObject);
begin
ModalResult := mrCancel;
end;
{** {**
OK clicked OK clicked
} }
@ -138,27 +127,15 @@ begin
reg.WriteString( reg_name, reg_newvalue ); reg.WriteString( reg_name, reg_newvalue );
end; end;
try // Signalizes childwin to refresh grid-data
// Reload grid-data if column selection has changed
if reg_oldvalue <> reg_newvalue then if reg_oldvalue <> reg_newvalue then
Mainform.Childwin.viewdata( Sender ); ModalResult := mrOk
finally else
ModalResult := mrOk; ModalResult := mrCancel;
end;
end; end;
{**
Form is closing
}
procedure TColumnSelectionForm.FormClose(Sender: TObject;
var Action: TCloseAction);
begin
Mainform.Childwin.btnColumnSelection.Down := False;
end;
{** {**
Select / Deselect all Select / Deselect all
} }

3
source/data_sorting.pas
View File

@ -341,9 +341,6 @@ begin
reg_name := 'ORDERCLAUSE_' + Mainform.Childwin.ActualDatabase + '.' + Mainform.Childwin.ActualTable; reg_name := 'ORDERCLAUSE_' + Mainform.Childwin.ActualDatabase + '.' + Mainform.Childwin.ActualTable;
reg.WriteString( reg_name, reg_value ); reg.WriteString( reg_name, reg_value );
reg.CloseKey; reg.CloseKey;
// Refresh data
Mainform.Childwin.viewdata(self);
end; end;