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

Terminology change: 'Changes' instead of 'Edit' in CancelChanges (and PostChanges), since 'edit' is used heftily in context of the data grid, where it means editing a single cell (as opposed to a whole row, which the former applies to).

Browse Source
This commit is contained in:
rosenfield.albert
2008-09-08 12:06:19 +00:00
parent 64dcdc14a7
commit 1812171221
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/childwin.dfm
View File

@ -1460,10 +1460,10 @@ object MDIChild: TMDIChild
Action = MainForm.actDataInsert
end
object DataPost1: TMenuItem
Action = MainForm.actDataPost
Action = MainForm.actDataPostChanges
end
object Cancelediting1: TMenuItem
Action = MainForm.actDataCancelEdit
Action = MainForm.actDataCancelChanges
end
object Delete1: TMenuItem
Action = MainForm.actDataDelete

20
source/childwin.pas
View File

@ -587,7 +587,7 @@ type
function GetKeyColumns(KeyList: TDataset): WideStrings.TWideStringlist;
function CheckUniqueKeyClause: Boolean;
procedure DataGridInsertRow;
procedure DataGridCancelEdit(Sender: TObject);
procedure DataGridCancel(Sender: TObject);
property FSelectedTableColumns: TDataset read GetSelTableColumns write FLastSelectedTableColumns;
property FSelectedTableKeys: TDataset read GetSelTableKeys write FLastSelectedTableKeys;
procedure CalcNullColors;
@ -2103,8 +2103,8 @@ begin
Mainform.actDataDelete.Enabled := inDataTab and (DataGrid.SelectedCount > 0);
Mainform.actDataFirst.Enabled := inDataTab;
Mainform.actDataLast.Enabled := inDataTab;
Mainform.actDataPost.Enabled := inDataTab and DataGridHasChanges;
Mainform.actDataCancelEdit.Enabled := inDataTab and DataGridHasChanges;
Mainform.actDataPostChanges.Enabled := inDataTab and DataGridHasChanges;
Mainform.actDataCancelChanges.Enabled := inDataTab and DataGridHasChanges;
// Activate export-options if we're on Data- or Query-tab
MainForm.actCopyAsCSV.Enabled := inDataOrQueryTabNotEmpty;
@ -6095,7 +6095,7 @@ end;
{**
DataGrid: cancel INSERT or UPDATE mode, reset modified node data
}
procedure TMDIChild.DataGridCancelEdit(Sender: TObject);
procedure TMDIChild.DataGridCancel(Sender: TObject);
var
i: Integer;
begin
@ -6178,8 +6178,8 @@ begin
Allowed := CheckUniqueKeyClause;
if Allowed then begin
// Move Esc shortcut from "Cancel row editing" to "Cancel cell editing"
Mainform.actDataCancelEdit.ShortCut := 0;
Mainform.actDataPost.ShortCut := 0;
Mainform.actDataCancelChanges.ShortCut := 0;
Mainform.actDataPostChanges.ShortCut := 0;
EnsureFullWidth(Sender, Column, Node);
end;
end;
@ -6188,16 +6188,16 @@ procedure TMDIChild.DataGridEdited(Sender: TBaseVirtualTree; Node:
PVirtualNode; Column: TColumnIndex);
begin
// Reassign Esc to "Cancel row editing" action
Mainform.actDataCancelEdit.ShortCut := TextToShortcut('Esc');
Mainform.actDataPost.ShortCut := TextToShortcut('Ctrl+Enter');
Mainform.actDataCancelChanges.ShortCut := TextToShortcut('Esc');
Mainform.actDataPostChanges.ShortCut := TextToShortcut('Ctrl+Enter');
end;
procedure TMDIChild.DataGridEditCancelled(Sender: TBaseVirtualTree; Column:
TColumnIndex);
begin
// Reassign Esc to "Cancel row editing" action
Mainform.actDataCancelEdit.ShortCut := TextToShortcut('Esc');
Mainform.actDataPost.ShortCut := TextToShortcut('Ctrl+Enter');
Mainform.actDataCancelChanges.ShortCut := TextToShortcut('Esc');
Mainform.actDataPostChanges.ShortCut := TextToShortcut('Ctrl+Enter');
end;
procedure TMDIChild.DataGridCreateEditor(Sender: TBaseVirtualTree; Node:

12
source/main.dfm
View File

@ -228,12 +228,12 @@ object MainForm: TMainForm
object ToolButton10: TToolButton
Left = 92
Top = 0
Action = actDataPost
Action = actDataPostChanges
end
object ToolButton1: TToolButton
Left = 115
Top = 0
Action = actDataCancelEdit
Action = actDataCancelChanges
end
end
object ToolBarDatabase: TToolBar
@ -850,14 +850,14 @@ object MainForm: TMainForm
ShortCut = 16430
OnExecute = actDataDeleteExecute
end
object actDataPost: TAction
object actDataPostChanges: TAction
Category = 'Data'
Caption = 'P&ost'
Enabled = False
Hint = 'Post'
ImageIndex = 55
ShortCut = 16397
OnExecute = actDataPostExecute
OnExecute = actDataPostChangesExecute
end
object actCreateTable: TAction
Category = 'Database'
@ -1187,14 +1187,14 @@ object MainForm: TMainForm
ShortCut = 120
OnExecute = actApplyFilterExecute
end
object actDataCancelEdit: TAction
object actDataCancelChanges: TAction
Category = 'Data'
Caption = 'Cancel editing'
Enabled = False
Hint = 'Cancel editing'
ImageIndex = 26
ShortCut = 27
OnExecute = actDataCancelEditExecute
OnExecute = actDataCancelChangesExecute
end
end
object SaveDialog2: TSaveDialog

14
source/main.pas
View File

@ -138,7 +138,7 @@ type
actDataLast: TAction;
actDataInsert: TAction;
actDataDelete: TAction;
actDataPost: TAction;
actDataPostChanges: TAction;
ToolButton4: TToolButton;
ToolButton7: TToolButton;
ToolButton8: TToolButton;
@ -216,7 +216,7 @@ type
btnExecuteLine: TToolButton;
actSetDelimiter: TAction;
btnSetDelimiter: TToolButton;
actDataCancelEdit: TAction;
actDataCancelChanges: TAction;
ToolButton1: TToolButton;
procedure refreshMonitorConfig;
procedure loadWindowConfig;
@ -251,7 +251,7 @@ type
procedure actExecuteSelectionExecute(Sender: TObject);
procedure actCopyAsXMLExecute(Sender: TObject);
procedure actCreateDatabaseExecute(Sender: TObject);
procedure actDataCancelEditExecute(Sender: TObject);
procedure actDataCancelChangesExecute(Sender: TObject);
procedure actExportDataExecute(Sender: TObject);
procedure actExecuteLineExecute(Sender: TObject);
procedure actHTMLviewExecute(Sender: TObject);
@ -261,7 +261,7 @@ type
procedure actDataFirstExecute(Sender: TObject);
procedure actDataInsertExecute(Sender: TObject);
procedure actDataLastExecute(Sender: TObject);
procedure actDataPostExecute(Sender: TObject);
procedure actDataPostChangesExecute(Sender: TObject);
procedure actDropDatabaseExecute(Sender: TObject);
procedure actDropFieldsExecute(Sender: TObject);
procedure actDropTablesAndViewsExecute(Sender: TObject);
@ -2208,7 +2208,7 @@ begin
end;
end;
procedure TMainForm.actDataPostExecute(Sender: TObject);
procedure TMainForm.actDataPostChangesExecute(Sender: TObject);
begin
Childwin.DataGridPostUpdateOrInsert(Childwin.Datagrid.FocusedNode);
end;
@ -2221,9 +2221,9 @@ begin
end;
procedure TMainForm.actDataCancelEditExecute(Sender: TObject);
procedure TMainForm.actDataCancelChangesExecute(Sender: TObject);
begin
Childwin.DataGridCancelEdit(Sender);
Childwin.DataGridCancel(Sender);
end;