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

Fix Unicode issue on main tabs: databases and tables with international characters were broken on tab captions. This just converts the main TPageControl to a TTntPageControl, plus its TTabSheets to TTntTabSheets.

Browse Source
This commit is contained in:
Ansgar Becker
2009-12-09 00:13:55 +00:00
parent a3aae38d2e
commit a24c2bb847
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/main.dfm
View File

@ -464,7 +464,7 @@ object MainForm: TMainForm
OnChange = editFilterVTChange
end
end
object PageControlMain: TPageControl
object PageControlMain: TTntPageControl
Left = 0
Top = 0
Width = 583
@ -480,7 +480,7 @@ object MainForm: TMainForm
OnChange = PageControlMainChange
OnContextPopup = PageControlMainContextPopup
OnMouseUp = PageControlMainMouseUp
object tabHost: TTabSheet
object tabHost: TTntTabSheet
Caption = 'Host'
ImageIndex = 1
object PageControlHost: TPageControl
@ -813,7 +813,7 @@ object MainForm: TMainForm
end
end
end
object tabDatabase: TTabSheet
object tabDatabase: TTntTabSheet
Caption = 'Database'
ImageIndex = 5
object ListTables: TVirtualStringTree
@ -969,11 +969,11 @@ object MainForm: TMainForm
end>
end
end
object tabEditor: TTabSheet
object tabEditor: TTntTabSheet
Caption = 'Table'
ImageIndex = 14
end
object tabData: TTabSheet
object tabData: TTntTabSheet
Caption = 'Data'
ImageIndex = 41
object lblSorryNoData: TLabel
@ -1213,7 +1213,7 @@ object MainForm: TMainForm
Columns = <>
end
end
object tabQuery: TTabSheet
object tabQuery: TTntTabSheet
Caption = 'Query'
ImageIndex = 57
object spltQuery: TSplitter

24
source/main.pas
View File

@ -22,7 +22,7 @@ uses
createdatabase, table_editor, SynRegExpr,
WideStrUtils, ExtActns, CommCtrl, routine_editor, options,
Contnrs, PngSpeedButton, connections, SynEditKeyCmds,
mysql_connection, mysql_api, insertfiles;
mysql_connection, mysql_api, insertfiles, TntComCtrls;
type
@ -41,7 +41,7 @@ type
spltQuery: TSplitter;
LabelResultInfo: TLabel;
Grid: TVirtualStringTree;
TabSheet: TTabSheet;
TabSheet: TTntTabSheet;
GridResult: TGridResult;
FilterText: WideString;
end;
@ -209,14 +209,14 @@ type
DBtree: TVirtualStringTree;
comboOnlyDBs: TTntComboBox;
Splitter1: TSplitter;
PageControlMain: TPageControl;
tabData: TTabSheet;
tabDatabase: TTabSheet;
PageControlMain: TTntPageControl;
tabData: TTntTabSheet;
tabDatabase: TTntTabSheet;
splitterTopBottom: TSplitter;
tabQuery: TTabSheet;
tabQuery: TTntTabSheet;
popupDB: TPopupMenu;
menuRefreshDB: TMenuItem;
tabHost: TTabSheet;
tabHost: TTntTabSheet;
PageControlHost: TPageControl;
tabVariables: TTabSheet;
tabProcessList: TTabSheet;
@ -420,7 +420,7 @@ type
menuCreateTableCopy: TMenuItem;
menuCreateView: TMenuItem;
menuCreateRoutine: TMenuItem;
tabEditor: TTabSheet;
tabEditor: TTntTabSheet;
popupRefresh: TPopupMenu;
menuAutoRefreshSetInterval: TMenuItem;
menuAutoRefresh: TMenuItem;
@ -736,7 +736,7 @@ type
procedure ToggleFilterPanel(ForceVisible: Boolean = False);
procedure AutoCalcColWidths(Tree: TVirtualStringTree; PrevLayout: TWideStringlist = nil);
procedure PlaceObjectEditor(Which: TListNodeType);
procedure SetTabCaption(PageIndex: Integer; Text: String);
procedure SetTabCaption(PageIndex: Integer; Text: WideString);
function ConfirmTabClose(PageIndex: Integer): Boolean;
procedure SaveQueryMemo(Tab: TQueryTab; Filename: String; OnlySelection: Boolean);
procedure UpdateFilterPanel(Sender: TObject);
@ -8237,7 +8237,7 @@ begin
QueryTab.Number := i;
QueryTab.GridResult := TGridResult.Create;
QueryTab.TabSheet := TTabSheet.Create(PageControlMain);
QueryTab.TabSheet := TTntTabSheet.Create(PageControlMain);
QueryTab.TabSheet.PageControl := PageControlMain;
QueryTab.TabSheet.ImageIndex := tabQuery.ImageIndex;
@ -8618,7 +8618,7 @@ begin
end;
procedure TMainForm.SetTabCaption(PageIndex: Integer; Text: String);
procedure TMainForm.SetTabCaption(PageIndex: Integer; Text: WideString);
begin
// Special case if passed text is empty: Reset query tab caption to "Query #123"
if (PageIndex = tabQuery.PageIndex) and (Text = '') then
@ -8629,7 +8629,7 @@ begin
// Leave space for close button on closable query tabs
Text := Text + ' ';
end;
PageControlMain.Pages[PageIndex].Caption := Text;
TTntTabSheet(PageControlMain.Pages[PageIndex]).Caption := Text;
FixQueryTabCloseButtons;
end;