From 0dc1ef2ac0ccec676cc19d1cdb293268b3c12476 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Thu, 30 Jan 2025 13:58:14 +0700 Subject: [PATCH 1/2] chore(developer): handle forward slashes in paths in package editor --- .../src/tike/child/UfrmPackageEditor.dfm | 24 ++++++++++++++++--- .../src/tike/child/UfrmPackageEditor.pas | 9 +++---- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/developer/src/tike/child/UfrmPackageEditor.dfm b/developer/src/tike/child/UfrmPackageEditor.dfm index 911781c298..884af89ae3 100644 --- a/developer/src/tike/child/UfrmPackageEditor.dfm +++ b/developer/src/tike/child/UfrmPackageEditor.dfm @@ -197,6 +197,9 @@ inherited frmPackageEditor: TfrmPackageEditor object pageFiles: TTabSheet Caption = 'Files' ImageIndex = 3 + ExplicitLeft = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object Panel1: TPanel Left = 0 Top = 0 @@ -261,7 +264,7 @@ inherited frmPackageEditor: TfrmPackageEditor object lblFileType: TLabel Left = 256 Top = 107 - Width = 47 + Width = 46 Height = 13 Caption = 'File Type:' FocusControl = editFilePath @@ -353,6 +356,9 @@ inherited frmPackageEditor: TfrmPackageEditor object pageKeyboards: TTabSheet Caption = 'Keyboards' ImageIndex = 5 + ExplicitLeft = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object Panel5: TPanel Left = 0 Top = 0 @@ -658,6 +664,9 @@ inherited frmPackageEditor: TfrmPackageEditor object pageLexicalModels: TTabSheet Caption = 'Lexical Models' ImageIndex = 17 + ExplicitLeft = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object panLexicalModels: TPanel Left = 0 Top = 0 @@ -944,7 +953,7 @@ inherited frmPackageEditor: TfrmPackageEditor object lblDescriptionMarkdown: TLabel Left = 114 Top = 497 - Width = 215 + Width = 214 Height = 13 Caption = 'Markdown accepted, no embedded HTML' Transparent = True @@ -1157,6 +1166,9 @@ inherited frmPackageEditor: TfrmPackageEditor object pageShortcuts: TTabSheet Caption = 'Shortcuts' ImageIndex = 8 + ExplicitLeft = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object Panel3: TPanel Left = 0 Top = 0 @@ -1320,10 +1332,16 @@ inherited frmPackageEditor: TfrmPackageEditor object pageSource: TTabSheet Caption = 'Source' ImageIndex = 9 + ExplicitLeft = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 end object pageCompile: TTabSheet Caption = 'Build' ImageIndex = 1 + ExplicitLeft = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object sbCompile: TScrollBox Left = 0 Top = 0 @@ -1575,7 +1593,7 @@ inherited frmPackageEditor: TfrmPackageEditor object Label5: TLabel Left = 9 Top = 73 - Width = 82 + Width = 81 Height = 13 Caption = 'Target filename:' end diff --git a/developer/src/tike/child/UfrmPackageEditor.pas b/developer/src/tike/child/UfrmPackageEditor.pas index 5aa02b50b3..4f3a096bd9 100644 --- a/developer/src/tike/child/UfrmPackageEditor.pas +++ b/developer/src/tike/child/UfrmPackageEditor.pas @@ -319,7 +319,7 @@ type procedure UpdateStartMenuPrograms; procedure FillFileList(combo: TComboBox; obj: TObject; FileType: TKMFileType = ftOther); procedure UpdateImagePreviews; - procedure AddFile(FileName: WideString); + procedure AddFile(FileName: string); procedure SourceChanged(Sender: TObject); procedure MovePackageToSource; function MoveSourceToPackage: Boolean; @@ -381,6 +381,7 @@ implementation uses System.Math, + System.StrUtils, Vcl.Clipbrd, Vcl.Imaging.GifImg, @@ -708,7 +709,7 @@ begin mtConfirmation, mbOkCancel, 0) = mrOk; end; -procedure TfrmPackageEditor.AddFile(FileName: WideString); +procedure TfrmPackageEditor.AddFile(FileName: string); var f: TPackageContentFile; ki: TKeyboardInfo; @@ -771,7 +772,7 @@ begin end; pack.Files.Add(f); - lbFiles.ItemIndex := lbFiles.Items.AddObject(ExtractFileName(FileName), f); + lbFiles.ItemIndex := lbFiles.Items.AddObject(ExtractFileName(FileName.Replace('/','\',[rfReplaceAll])), f); lbFilesClick(lbFiles); UpdateWelcomeFile; UpdateReadme; @@ -1315,7 +1316,7 @@ begin lbFiles.Clear; for i := 0 to pack.Files.Count - 1 do - lbFiles.Items.AddObject(ExtractFileName(pack.Files[i].FileName), pack.Files[i]); + lbFiles.Items.AddObject(ExtractFileName(ReplaceStr(pack.Files[i].FileName,'/','\')), pack.Files[i]); UpdateOutPath; UpdateWelcomeFile; From 46be7a8b109d97c44ab4df1bac4e8abab3def33d Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Fri, 31 Jan 2025 08:58:19 +0700 Subject: [PATCH 2/2] chore(developer): roll back unwanted package editor form changes --- .../src/tike/child/UfrmPackageEditor.dfm | 24 +++---------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/developer/src/tike/child/UfrmPackageEditor.dfm b/developer/src/tike/child/UfrmPackageEditor.dfm index 884af89ae3..911781c298 100644 --- a/developer/src/tike/child/UfrmPackageEditor.dfm +++ b/developer/src/tike/child/UfrmPackageEditor.dfm @@ -197,9 +197,6 @@ inherited frmPackageEditor: TfrmPackageEditor object pageFiles: TTabSheet Caption = 'Files' ImageIndex = 3 - ExplicitLeft = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 object Panel1: TPanel Left = 0 Top = 0 @@ -264,7 +261,7 @@ inherited frmPackageEditor: TfrmPackageEditor object lblFileType: TLabel Left = 256 Top = 107 - Width = 46 + Width = 47 Height = 13 Caption = 'File Type:' FocusControl = editFilePath @@ -356,9 +353,6 @@ inherited frmPackageEditor: TfrmPackageEditor object pageKeyboards: TTabSheet Caption = 'Keyboards' ImageIndex = 5 - ExplicitLeft = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 object Panel5: TPanel Left = 0 Top = 0 @@ -664,9 +658,6 @@ inherited frmPackageEditor: TfrmPackageEditor object pageLexicalModels: TTabSheet Caption = 'Lexical Models' ImageIndex = 17 - ExplicitLeft = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 object panLexicalModels: TPanel Left = 0 Top = 0 @@ -953,7 +944,7 @@ inherited frmPackageEditor: TfrmPackageEditor object lblDescriptionMarkdown: TLabel Left = 114 Top = 497 - Width = 214 + Width = 215 Height = 13 Caption = 'Markdown accepted, no embedded HTML' Transparent = True @@ -1166,9 +1157,6 @@ inherited frmPackageEditor: TfrmPackageEditor object pageShortcuts: TTabSheet Caption = 'Shortcuts' ImageIndex = 8 - ExplicitLeft = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 object Panel3: TPanel Left = 0 Top = 0 @@ -1332,16 +1320,10 @@ inherited frmPackageEditor: TfrmPackageEditor object pageSource: TTabSheet Caption = 'Source' ImageIndex = 9 - ExplicitLeft = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 end object pageCompile: TTabSheet Caption = 'Build' ImageIndex = 1 - ExplicitLeft = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 object sbCompile: TScrollBox Left = 0 Top = 0 @@ -1593,7 +1575,7 @@ inherited frmPackageEditor: TfrmPackageEditor object Label5: TLabel Left = 9 Top = 73 - Width = 81 + Width = 82 Height = 13 Caption = 'Target filename:' end