opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-06 18:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename two forms so these comply to my own code convention: TDataSortingForm=>TfrmDataSorting and TColumnSelectionForm=>TfrmColumnSelection

Browse Source
This commit is contained in:
Ansgar Becker
2020-12-27 12:56:37 +01:00
parent e66121a1c3
commit 90739a895b
7 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Delphi10.4/heidisql.dpr vendored
View File

@ -19,8 +19,8 @@ uses
apphelpers in '..\..\source\apphelpers.pas', apphelpers in '..\..\source\apphelpers.pas',
sqlhelp in '..\..\source\sqlhelp.pas' {frmSQLhelp}, sqlhelp in '..\..\source\sqlhelp.pas' {frmSQLhelp},
dbstructures in '..\..\source\dbstructures.pas', dbstructures in '..\..\source\dbstructures.pas',
column_selection in '..\..\source\column_selection.pas' {ColumnSelectionForm}, column_selection in '..\..\source\column_selection.pas' {frmColumnSelection},
data_sorting in '..\..\source\data_sorting.pas' {DataSortingForm}, data_sorting in '..\..\source\data_sorting.pas' {frmDataSorting},
createdatabase in '..\..\source\createdatabase.pas' {CreateDatabaseForm}, createdatabase in '..\..\source\createdatabase.pas' {CreateDatabaseForm},
updatecheck in '..\..\source\updatecheck.pas' {frmUpdateCheck}, updatecheck in '..\..\source\updatecheck.pas' {frmUpdateCheck},
editvar in '..\..\source\editvar.pas' {frmEditVariable}, editvar in '..\..\source\editvar.pas' {frmEditVariable},

4
packages/Delphi10.4/heidisql.dproj vendored
View File

@ -170,10 +170,10 @@
</DCCReference> </DCCReference>
<DCCReference Include="..\..\source\dbstructures.pas"/> <DCCReference Include="..\..\source\dbstructures.pas"/>
<DCCReference Include="..\..\source\column_selection.pas"> <DCCReference Include="..\..\source\column_selection.pas">
<Form>ColumnSelectionForm</Form> <Form>frmColumnSelection</Form>
</DCCReference> </DCCReference>
<DCCReference Include="..\..\source\data_sorting.pas"> <DCCReference Include="..\..\source\data_sorting.pas">
<Form>DataSortingForm</Form> <Form>frmDataSorting</Form>
</DCCReference> </DCCReference>
<DCCReference Include="..\..\source\createdatabase.pas"> <DCCReference Include="..\..\source\createdatabase.pas">
<Form>CreateDatabaseForm</Form> <Form>CreateDatabaseForm</Form>

2
source/column_selection.dfm
View File

@ -1,4 +1,4 @@
object ColumnSelectionForm: TColumnSelectionForm object frmColumnSelection: TfrmColumnSelection
Left = 0 Left = 0
Top = 0 Top = 0
BorderStyle = bsSizeToolWin BorderStyle = bsSizeToolWin

24
source/column_selection.pas
View File

@ -7,7 +7,7 @@ uses
apphelpers, gnugettext, extra_controls; apphelpers, gnugettext, extra_controls;
type type
TColumnSelectionForm = class(TExtForm) TfrmColumnSelection = class(TExtForm)
btnCancel: TButton; btnCancel: TButton;
btnOK: TButton; btnOK: TButton;
chkSelectAll: TCheckBox; chkSelectAll: TCheckBox;
@ -43,7 +43,7 @@ uses main;
procedure TColumnSelectionForm.FormCreate(Sender: TObject); procedure TfrmColumnSelection.FormCreate(Sender: TObject);
begin begin
HasSizeGrip := True; HasSizeGrip := True;
Width := AppSettings.ReadInt(asColumnSelectorWidth); Width := AppSettings.ReadInt(asColumnSelectorWidth);
@ -52,7 +52,7 @@ begin
end; end;
procedure TColumnSelectionForm.FormDestroy(Sender: TObject); procedure TfrmColumnSelection.FormDestroy(Sender: TObject);
begin begin
AppSettings.WriteInt(asColumnSelectorWidth, Width); AppSettings.WriteInt(asColumnSelectorWidth, Width);
AppSettings.WriteInt(asColumnSelectorHeight, Height); AppSettings.WriteInt(asColumnSelectorHeight, Height);
@ -63,7 +63,7 @@ end;
{** {**
FormShow FormShow
} }
procedure TColumnSelectionForm.FormShow(Sender: TObject); procedure TfrmColumnSelection.FormShow(Sender: TObject);
var var
i: Integer; i: Integer;
Col: String; Col: String;
@ -91,7 +91,7 @@ end;
{** {**
OK clicked OK clicked
} }
procedure TColumnSelectionForm.btnOKClick(Sender: TObject); procedure TfrmColumnSelection.btnOKClick(Sender: TObject);
var var
i: Integer; i: Integer;
Col: String; Col: String;
@ -113,7 +113,7 @@ end;
{** {**
Select / Deselect all Select / Deselect all
} }
procedure TColumnSelectionForm.chkSelectAllClick(Sender: TObject); procedure TfrmColumnSelection.chkSelectAllClick(Sender: TObject);
var var
cb: TCheckBox; cb: TCheckBox;
i: Integer; i: Integer;
@ -132,7 +132,7 @@ begin
end; end;
procedure TColumnSelectionForm.editFilterLeftButtonClick(Sender: TObject); procedure TfrmColumnSelection.editFilterLeftButtonClick(Sender: TObject);
begin begin
if IsNotEmpty(editFilter.Text) then begin if IsNotEmpty(editFilter.Text) then begin
FLastFilter := editFilter.Text; FLastFilter := editFilter.Text;
@ -148,7 +148,7 @@ end;
Click within column list Click within column list
Updates state of "Select / deselect all" checkbox Updates state of "Select / deselect all" checkbox
} }
procedure TColumnSelectionForm.chklistColumnsClickCheck(Sender: TObject); procedure TfrmColumnSelection.chklistColumnsClickCheck(Sender: TObject);
var var
i : Integer; i : Integer;
AllSelected, NoneSelected : Boolean; AllSelected, NoneSelected : Boolean;
@ -187,7 +187,7 @@ end;
{** {**
Sort / Unsort the list with fields Sort / Unsort the list with fields
} }
procedure TColumnSelectionForm.PopulateList(Sender: TObject); procedure TfrmColumnSelection.PopulateList(Sender: TObject);
var var
i: Integer; i: Integer;
Col: String; Col: String;
@ -212,7 +212,7 @@ begin
end; end;
procedure TColumnSelectionForm.btnCancelClick(Sender: TObject); procedure TfrmColumnSelection.btnCancelClick(Sender: TObject);
begin begin
Mainform.tbtnDataColumns.Down := False; Mainform.tbtnDataColumns.Down := False;
Close; Close;
@ -222,7 +222,7 @@ end;
{** {**
Cancel this dialog if the user clicks elsewhere on mainform Cancel this dialog if the user clicks elsewhere on mainform
} }
procedure TColumnSelectionForm.FormDeactivate(Sender: TObject); procedure TfrmColumnSelection.FormDeactivate(Sender: TObject);
begin begin
btnCancel.OnClick(Sender); btnCancel.OnClick(Sender);
end; end;
@ -231,7 +231,7 @@ end;
{** {**
Be sure the form is destroyed after closing. Be sure the form is destroyed after closing.
} }
procedure TColumnSelectionForm.FormClose(Sender: TObject; var Action: procedure TfrmColumnSelection.FormClose(Sender: TObject; var Action:
TCloseAction); TCloseAction);
begin begin
Action := caFree; Action := caFree;

2
source/data_sorting.dfm
View File

@ -1,4 +1,4 @@
object DataSortingForm: TDataSortingForm object frmDataSortingForm: TfrmDataSorting
Left = 0 Left = 0
Top = 0 Top = 0
BorderStyle = bsNone BorderStyle = bsNone

24
source/data_sorting.pas
View File

@ -8,7 +8,7 @@ uses
type type
TDataSortingForm = class(TExtForm) TfrmDataSorting = class(TExtForm)
pnlBevel: TPanel; pnlBevel: TPanel;
btnOK: TButton; btnOK: TButton;
btnCancel: TButton; btnCancel: TButton;
@ -43,7 +43,7 @@ uses main;
{$R *.dfm} {$R *.dfm}
procedure TDataSortingForm.FormCreate(Sender: TObject); procedure TfrmDataSorting.FormCreate(Sender: TObject);
var var
i: Integer; i: Integer;
begin begin
@ -64,7 +64,7 @@ end;
{** {**
Create controls for order columns Create controls for order columns
} }
procedure TDataSortingForm.DisplaySortingControls(Sender: TObject); procedure TfrmDataSorting.DisplaySortingControls(Sender: TObject);
var var
lblNumber: TLabel; lblNumber: TLabel;
btnDelete: TButton; btnDelete: TButton;
@ -195,7 +195,7 @@ end;
{** {**
Dropdown for column selection was changed Dropdown for column selection was changed
} }
procedure TDataSortingForm.comboColumnsChange( Sender: TObject ); procedure TfrmDataSorting.comboColumnsChange( Sender: TObject );
var var
combo : TComboBox; combo : TComboBox;
begin begin
@ -210,7 +210,7 @@ end;
{** {**
Button for selecting sort-direction was clicked Button for selecting sort-direction was clicked
} }
procedure TDataSortingForm.btnOrderClick( Sender: TObject ); procedure TfrmDataSorting.btnOrderClick( Sender: TObject );
var var
btn: TSpeedButton; btn: TSpeedButton;
begin begin
@ -232,7 +232,7 @@ end;
{** {**
Delete order column Delete order column
} }
procedure TDataSortingForm.btnDeleteClick( Sender: TObject ); procedure TfrmDataSorting.btnDeleteClick( Sender: TObject );
var var
btn : TButton; btn : TButton;
i : Integer; i : Integer;
@ -261,7 +261,7 @@ end;
{** {**
Add a new order column Add a new order column
} }
procedure TDataSortingForm.btnAddColClick(Sender: TObject); procedure TfrmDataSorting.btnAddColClick(Sender: TObject);
var var
i, new : Integer; i, new : Integer;
UnusedColumns : TStringList; UnusedColumns : TStringList;
@ -300,7 +300,7 @@ end;
Gets called when any option has changed. Gets called when any option has changed.
Enables the OK button if ORDER options have changed Enables the OK button if ORDER options have changed
} }
procedure TDataSortingForm.Modified; procedure TfrmDataSorting.Modified;
begin begin
btnOk.Enabled := ComposeOrderClause(FOrderColumns) <> FOldOrderClause; btnOk.Enabled := ComposeOrderClause(FOrderColumns) <> FOldOrderClause;
end; end;
@ -309,7 +309,7 @@ end;
{** {**
OK clicked: Write ORDER clause to registry OK clicked: Write ORDER clause to registry
} }
procedure TDataSortingForm.btnOKClick(Sender: TObject); procedure TfrmDataSorting.btnOKClick(Sender: TObject);
begin begin
// TODO: apply ordering // TODO: apply ordering
Mainform.DataGridSortColumns := FOrderColumns; Mainform.DataGridSortColumns := FOrderColumns;
@ -318,7 +318,7 @@ begin
end; end;
procedure TDataSortingForm.btnCancelClick(Sender: TObject); procedure TfrmDataSorting.btnCancelClick(Sender: TObject);
begin begin
Mainform.tbtnDataSorting.Down := False; Mainform.tbtnDataSorting.Down := False;
Close; Close;
@ -328,7 +328,7 @@ end;
{** {**
Be sure the form is destroyed after closing. Be sure the form is destroyed after closing.
} }
procedure TDataSortingForm.FormClose(Sender: TObject; var Action: TCloseAction); procedure TfrmDataSorting.FormClose(Sender: TObject; var Action: TCloseAction);
begin begin
Action := caFree; Action := caFree;
end; end;
@ -337,7 +337,7 @@ end;
{** {**
Cancel this dialog if the user clicks elsewhere on mainform Cancel this dialog if the user clicks elsewhere on mainform
} }
procedure TDataSortingForm.FormDeactivate(Sender: TObject); procedure TfrmDataSorting.FormDeactivate(Sender: TObject);
begin begin
btnCancel.OnClick(Sender); btnCancel.OnClick(Sender);
end; end;

6
source/main.pas
View File

@ -7848,9 +7848,9 @@ begin
btn.Down := not btn.Down; btn.Down := not btn.Down;
if not btn.Down then Exit; if not btn.Down then Exit;
if btn = tbtnDataColumns then if btn = tbtnDataColumns then
frm := TColumnSelectionForm.Create(self) frm := TfrmColumnSelection.Create(self)
else if btn = tbtnDataSorting then else if btn = tbtnDataSorting then
frm := TDataSortingForm.Create(self) frm := TfrmDataSorting.Create(self)
else else
frm := TForm.Create(self); // Dummy fallback, should never get created frm := TForm.Create(self); // Dummy fallback, should never get created
// Position new form relative to btn's position // Position new form relative to btn's position
@ -9891,7 +9891,7 @@ begin
InvalidateVT(DataGrid, VTREE_NOTLOADED_PURGECACHE, False); InvalidateVT(DataGrid, VTREE_NOTLOADED_PURGECACHE, False);
end else begin end else begin
frm := TColumnSelectionForm.Create(self); frm := TfrmColumnSelection.Create(Self);
// Position new form relative to btn's position // Position new form relative to btn's position
frm.Top := HitInfo.Y + DataGrid.ClientOrigin.Y - Integer(DataGrid.Header.Height); frm.Top := HitInfo.Y + DataGrid.ClientOrigin.Y - Integer(DataGrid.Header.Height);
frm.Left := HitInfo.X + DataGrid.ClientOrigin.X; frm.Left := HitInfo.X + DataGrid.ClientOrigin.X;