Cosmetic: Reset query tab caption to "Query #x" on Ctrl+W ("Clear editor"), so a filename is no longer kept in that case.

This commit is contained in:
Ansgar Becker
2009-10-15 18:52:51 +00:00
parent 1c35b39945
commit e812ffc209

View File

@ -1950,9 +1950,11 @@ procedure TMainForm.actClearEditorExecute(Sender: TObject);
var var
m: TSynMemo; m: TSynMemo;
begin begin
if Sender = actClearQueryEditor then if Sender = actClearQueryEditor then begin
m := ActiveQueryMemo m := ActiveQueryMemo;
else begin if QueryTabActive then
SetTabCaption(PageControlMain.ActivePageIndex, '');
end else begin
m := SynMemoFilter; m := SynMemoFilter;
editFilterSearch.Clear; editFilterSearch.Clear;
end; end;
@ -9139,7 +9141,7 @@ begin
QueryTab.CloseButton.Flat := True; QueryTab.CloseButton.Flat := True;
QueryTab.CloseButton.PngImage := PngImageListMain.PngImages[134].PngImage; QueryTab.CloseButton.PngImage := PngImageListMain.PngImages[134].PngImage;
QueryTab.CloseButton.OnMouseUp := CloseButtonOnMouseUp; QueryTab.CloseButton.OnMouseUp := CloseButtonOnMouseUp;
SetTabCaption(QueryTab.TabSheet.PageIndex, 'Query #'+IntToStr(i)); SetTabCaption(QueryTab.TabSheet.PageIndex, '');
// Dumb code which replicates all controls from tabQuery // Dumb code which replicates all controls from tabQuery
QueryTab.pnlMemo := TPanel.Create(QueryTab.TabSheet); QueryTab.pnlMemo := TPanel.Create(QueryTab.TabSheet);
@ -9509,9 +9511,15 @@ end;
procedure TMainForm.SetTabCaption(PageIndex: Integer; Text: String); procedure TMainForm.SetTabCaption(PageIndex: Integer; Text: String);
begin begin
// Leave space for close button on closable query tabs // Special case if passed text is empty: Reset query tab caption to "Query #123"
if IsQueryTab(PageIndex, False) then if (PageIndex = tabQuery.PageIndex) and (Text = '') then
Text := 'Query';
if IsQueryTab(PageIndex, False) then begin
if Text = '' then
Text := 'Query #'+IntToStr(PageIndex-tabQuery.PageIndex);
// Leave space for close button on closable query tabs
Text := Text + ' '; Text := Text + ' ';
end;
PageControlMain.Pages[PageIndex].Caption := Text; PageControlMain.Pages[PageIndex].Caption := Text;
FixQueryTabCloseButtons; FixQueryTabCloseButtons;
end; end;