From 3e48acddb3697ecf6a1dd936b94d21ad59847f03 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Thu, 3 Mar 2022 10:19:37 +1100 Subject: [PATCH] chore(developer): Keyman Developer Server terminology Fixes #6326. Tweaks wording and layout of screens relating to Keyman Developer Server for consistency. --- .../developer/TIKE/actions/dmActionsMain.dfm | 2 +- .../developer/TIKE/actions/dmActionsMain.pas | 2 +- .../Keyman.Developer.UI.UfrmModelEditor.dfm | 45 ++++++++++----- .../Keyman.Developer.UI.UfrmModelEditor.pas | 14 +++++ .../developer/TIKE/child/UfrmKeymanWizard.dfm | 4 +- .../TIKE/child/UfrmPackageEditor.dfm | 40 ++++++++++--- .../TIKE/child/UfrmPackageEditor.pas | 32 ++++++++++- .../Keyman.Developer.UI.UfrmServerOptions.dfm | 25 +++++---- .../developer/TIKE/dialogs/UfrmOptions.dfm | 56 ++++++++++--------- .../developer/TIKE/dialogs/UfrmOptions.pas | 9 +-- windows/src/developer/TIKE/main/UfrmMain.dfm | 2 +- 11 files changed, 162 insertions(+), 69 deletions(-) diff --git a/windows/src/developer/TIKE/actions/dmActionsMain.dfm b/windows/src/developer/TIKE/actions/dmActionsMain.dfm index e0288cc8a6..8f9651c265 100644 --- a/windows/src/developer/TIKE/actions/dmActionsMain.dfm +++ b/windows/src/developer/TIKE/actions/dmActionsMain.dfm @@ -479,7 +479,7 @@ object modActionsMain: TmodActionsMain end object actToolsWebCopyPublicUrl: TAction Category = 'Tools' - Caption = '&Copy to clipboard' + Caption = '&Copy URL to clipboard' OnExecute = actToolsWebCopyPublicUrlExecute OnUpdate = actToolsWebCopyPublicUrlUpdate end diff --git a/windows/src/developer/TIKE/actions/dmActionsMain.pas b/windows/src/developer/TIKE/actions/dmActionsMain.pas index 396d60d14f..c248529e97 100644 --- a/windows/src/developer/TIKE/actions/dmActionsMain.pas +++ b/windows/src/developer/TIKE/actions/dmActionsMain.pas @@ -755,7 +755,7 @@ procedure TmodActionsMain.actToolsWebConfigureExecute(Sender: TObject); begin with TfrmOptions.Create(frmKeymanDeveloper) do try - FocusDebuggerTab; + FocusServerTab; if ShowModal = mrOk then begin frmKeymanDeveloper.RefreshOptions; diff --git a/windows/src/developer/TIKE/child/Keyman.Developer.UI.UfrmModelEditor.dfm b/windows/src/developer/TIKE/child/Keyman.Developer.UI.UfrmModelEditor.dfm index d07f24d186..21cd0512f8 100644 --- a/windows/src/developer/TIKE/child/Keyman.Developer.UI.UfrmModelEditor.dfm +++ b/windows/src/developer/TIKE/child/Keyman.Developer.UI.UfrmModelEditor.dfm @@ -334,9 +334,9 @@ inherited frmModelEditor: TfrmModelEditor object lblDebugHostCaption: TLabel Left = 12 Top = 158 - Width = 252 + Width = 222 Height = 13 - Caption = 'Debug host is active at following web addresses:' + Caption = 'Server is active at following web addresses:' end object lblCrossPlatform: TLabel Left = 12 @@ -388,10 +388,10 @@ inherited frmModelEditor: TfrmModelEditor object cmdOpenDebugHost: TButton Left = 12 Top = 286 - Width = 189 + Width = 109 Height = 25 - Caption = 'Open &debugger in local browser' - TabOrder = 3 + Caption = 'Open in browser' + TabOrder = 5 OnClick = cmdOpenDebugHostClick end object lbDebugHosts: TListBox @@ -404,12 +404,12 @@ inherited frmModelEditor: TfrmModelEditor OnClick = lbDebugHostsClick end object cmdSendURLsToEmail: TButton - Left = 12 - Top = 317 - Width = 189 + Left = 127 + Top = 286 + Width = 109 Height = 25 - Caption = 'Send addresses to &email...' - TabOrder = 5 + Caption = 'Send to &email...' + TabOrder = 6 OnClick = cmdSendURLsToEmailClick end object editTestKeyboard: TEdit @@ -429,6 +429,23 @@ inherited frmModelEditor: TfrmModelEditor TabOrder = 1 OnClick = cmdBrowseTestKeyboardClick end + object cmdCopyDebuggerLink: TButton + Left = 242 + Top = 286 + Width = 109 + Height = 25 + Caption = 'Copy &link' + TabOrder = 7 + OnClick = cmdCopyDebuggerLinkClick + end + object cmdConfigureWebDebugger: TButton + Left = 168 + Top = 122 + Width = 153 + Height = 25 + Action = modActionsMain.actToolsWebConfigure + TabOrder = 3 + end end object panOpenInExplorer: TPanel Left = 10 @@ -542,15 +559,15 @@ inherited frmModelEditor: TfrmModelEditor object dlgAddWordlist: TOpenDialog Options = [ofHideReadOnly, ofPathMustExist, ofEnableSizing] Title = 'Create or Add Wordlist' - Left = 344 - Top = 344 + Left = 32 + Top = 216 end object dlgBrowseTestKeyboard: TOpenDialog DefaultExt = 'js' Filter = 'Compiled keyboard files (*.js)|*.js|All files (*.*)|*.*' Options = [ofHideReadOnly, ofPathMustExist, ofFileMustExist, ofEnableSizing] Title = 'Select compiled keyboard to test with' - Left = 488 - Top = 120 + Left = 32 + Top = 280 end end diff --git a/windows/src/developer/TIKE/child/Keyman.Developer.UI.UfrmModelEditor.pas b/windows/src/developer/TIKE/child/Keyman.Developer.UI.UfrmModelEditor.pas index 3d2e20d855..5dbf19d004 100644 --- a/windows/src/developer/TIKE/child/Keyman.Developer.UI.UfrmModelEditor.pas +++ b/windows/src/developer/TIKE/child/Keyman.Developer.UI.UfrmModelEditor.pas @@ -88,6 +88,8 @@ type cmdCompile: TButton; Label5: TLabel; editOutPath: TEdit; + cmdCopyDebuggerLink: TButton; + cmdConfigureWebDebugger: TButton; procedure FormDestroy(Sender: TObject); procedure cmdAddWordlistClick(Sender: TObject); procedure cmdRemoveWordlistClick(Sender: TObject); @@ -115,6 +117,7 @@ type procedure cmdOpenSourceFolderClick(Sender: TObject); procedure cmdOpenBuildFolderClick(Sender: TObject); procedure cmdOpenProjectFolderClick(Sender: TObject); + procedure cmdCopyDebuggerLinkClick(Sender: TObject); private type TWordlist = class @@ -173,6 +176,7 @@ implementation uses System.UITypes, + Vcl.Clipbrd, Keyman.Developer.System.HelpTopics, Keyman.Developer.System.Project.modeltsProjectFileAction, @@ -800,6 +804,16 @@ begin editTestKeyboard.Text := dlgBrowseTestKeyboard.FileName; end; +procedure TfrmModelEditor.cmdCopyDebuggerLinkClick(Sender: TObject); +begin + try + Clipboard.AsText := lbDebugHosts.Items[lbDebugHosts.ItemIndex]; + except + on E:Exception do + ShowMessage(E.Message); + end; +end; + procedure TfrmModelEditor.cmdOpenDebugHostClick(Sender: TObject); begin TUtilExecute.URL(lbDebugHosts.Items[lbDebugHosts.ItemIndex]); diff --git a/windows/src/developer/TIKE/child/UfrmKeymanWizard.dfm b/windows/src/developer/TIKE/child/UfrmKeymanWizard.dfm index 22d545385b..9bb4ba4ed8 100644 --- a/windows/src/developer/TIKE/child/UfrmKeymanWizard.dfm +++ b/windows/src/developer/TIKE/child/UfrmKeymanWizard.dfm @@ -1155,9 +1155,9 @@ inherited frmKeymanWizard: TfrmKeymanWizard object lblDebugHostCaption: TLabel Left = 12 Top = 70 - Width = 252 + Width = 222 Height = 13 - Caption = 'Debug host is active at following web addresses:' + Caption = 'Server is active at following web addresses:' end object lblCrossPlatform: TLabel Left = 12 diff --git a/windows/src/developer/TIKE/child/UfrmPackageEditor.dfm b/windows/src/developer/TIKE/child/UfrmPackageEditor.dfm index 36134ab3ff..6dc7a0a297 100644 --- a/windows/src/developer/TIKE/child/UfrmPackageEditor.dfm +++ b/windows/src/developer/TIKE/child/UfrmPackageEditor.dfm @@ -1167,9 +1167,9 @@ inherited frmPackageEditor: TfrmPackageEditor object lblDebugHostCaption: TLabel Left = 12 Top = 70 - Width = 252 + Width = 222 Height = 13 - Caption = 'Debug host is active at following web addresses:' + Caption = 'Server is active at following web addresses:' end object lblCrossPlatform: TLabel Left = 12 @@ -1197,17 +1197,17 @@ inherited frmPackageEditor: TfrmPackageEditor Top = 34 Width = 150 Height = 25 - Caption = 'Test &Package Online' + Caption = 'Test &package on web' TabOrder = 0 OnClick = cmdStartTestOnlineClick end object cmdOpenDebugHost: TButton Left = 12 Top = 240 - Width = 221 + Width = 109 Height = 25 - Caption = 'Open packages page in local &browser' - TabOrder = 2 + Caption = 'Open in &browser' + TabOrder = 3 OnClick = cmdOpenDebugHostClick end object lbDebugHosts: TListBox @@ -1216,9 +1216,35 @@ inherited frmPackageEditor: TfrmPackageEditor Width = 289 Height = 142 ItemHeight = 13 - TabOrder = 1 + TabOrder = 2 OnClick = lbDebugHostsClick end + object cmdConfigureWebDebugger: TButton + Left = 168 + Top = 34 + Width = 153 + Height = 25 + Action = modActionsMain.actToolsWebConfigure + TabOrder = 1 + end + object cmdSendURLsToEmail: TButton + Left = 127 + Top = 240 + Width = 109 + Height = 25 + Caption = 'Send to &email...' + TabOrder = 4 + OnClick = cmdSendURLsToEmailClick + end + object cmdCopyDebuggerLink: TButton + Left = 242 + Top = 240 + Width = 109 + Height = 25 + Caption = 'Copy &link' + TabOrder = 5 + OnClick = cmdCopyDebuggerLinkClick + end end object panBuildDesktop: TPanel Left = 15 diff --git a/windows/src/developer/TIKE/child/UfrmPackageEditor.pas b/windows/src/developer/TIKE/child/UfrmPackageEditor.pas index c73df761ec..43a078a0dc 100644 --- a/windows/src/developer/TIKE/child/UfrmPackageEditor.pas +++ b/windows/src/developer/TIKE/child/UfrmPackageEditor.pas @@ -1,4 +1,4 @@ -(* +(* Name: UfrmPackageEditor Copyright: Copyright (C) SIL International. Documentation: @@ -204,6 +204,9 @@ type cmdAddToProject: TButton; cmdBuildPackage: TButton; Label5: TLabel; + cmdConfigureWebDebugger: TButton; + cmdSendURLsToEmail: TButton; + cmdCopyDebuggerLink: TButton; procedure cmdCloseClick(Sender: TObject); procedure cmdAddFileClick(Sender: TObject); procedure cmdRemoveFileClick(Sender: TObject); @@ -264,6 +267,8 @@ type procedure cmdOpenSourceFolderClick(Sender: TObject); procedure cmdOpenBuildFolderClick(Sender: TObject); procedure cmdOpenProjectFolderClick(Sender: TObject); + procedure cmdSendURLsToEmailClick(Sender: TObject); + procedure cmdCopyDebuggerLinkClick(Sender: TObject); private pack: TKPSFile; FSetup: Integer; @@ -339,6 +344,8 @@ type implementation uses + Vcl.Clipbrd, + Keyman.Developer.System.HelpTopics, CharMapDropTool, @@ -363,6 +370,7 @@ uses utilsystem, UfrmMain, UfrmMessages, + UfrmSendURLsToEmail, utilexecute, Keyman.Developer.UI.UfrmSelectBCP47Language, xmldoc; @@ -442,6 +450,16 @@ begin end; end; +procedure TfrmPackageEditor.cmdCopyDebuggerLinkClick(Sender: TObject); +begin + try + Clipboard.AsText := lbDebugHosts.Items[lbDebugHosts.ItemIndex]; + except + on E:Exception do + ShowMessage(E.Message); + end; +end; + procedure TfrmPackageEditor.FormDestroy(Sender: TObject); begin inherited; @@ -762,6 +780,18 @@ begin end; end; +procedure TfrmPackageEditor.cmdSendURLsToEmailClick(Sender: TObject); +begin + with TfrmSendURLsToEmail.Create(Application.MainForm) do + try + //TODO: KeyboardName := Self.FKeyboardParser.GetSystemStoreValue(ssName); + Hosts.Assign(lbDebugHosts.Items); + ShowModal; + finally + Free; + end; +end; + procedure TfrmPackageEditor.cmdStartTestOnlineClick(Sender: TObject); begin DoAction(pfaTestKeymanWeb); diff --git a/windows/src/developer/TIKE/dialogs/Keyman.Developer.UI.UfrmServerOptions.dfm b/windows/src/developer/TIKE/dialogs/Keyman.Developer.UI.UfrmServerOptions.dfm index e1ab140048..ce82269653 100644 --- a/windows/src/developer/TIKE/dialogs/Keyman.Developer.UI.UfrmServerOptions.dfm +++ b/windows/src/developer/TIKE/dialogs/Keyman.Developer.UI.UfrmServerOptions.dfm @@ -4,7 +4,7 @@ object frmServerOptions: TfrmServerOptions BorderIcons = [biSystemMenu] BorderStyle = bsDialog Caption = 'Keyman Developer Server Options' - ClientHeight = 436 + ClientHeight = 402 ClientWidth = 433 Color = clBtnFace Font.Charset = DEFAULT_CHARSET @@ -22,11 +22,12 @@ object frmServerOptions: TfrmServerOptions Top = 96 Width = 403 Height = 39 + AutoSize = False Caption = - 'ngrok is a service that allows you to temporarily share your loc' + - 'al web debugger site with a public URL, so that you can access i' + - 't from any device or share it with other users for testing your ' + - 'keyboards, models and packages.' + 'ngrok is a service that allows you to temporarily make your loca' + + 'l Server instance public accessible, so that you can view it fro' + + 'm any device or share it with other users for testing your keybo' + + 'ards, models and packages.' WordWrap = True end object lblDefaultPort: TLabel @@ -39,7 +40,7 @@ object frmServerOptions: TfrmServerOptions end object cmdOK: TButton Left = 272 - Top = 403 + Top = 367 Width = 73 Height = 25 Caption = 'OK' @@ -50,7 +51,7 @@ object frmServerOptions: TfrmServerOptions end object cmdCancel: TButton Left = 352 - Top = 403 + Top = 367 Width = 73 Height = 25 Cancel = True @@ -149,7 +150,7 @@ object frmServerOptions: TfrmServerOptions Left = 8 Top = 300 Width = 417 - Height = 90 + Height = 61 Caption = 'Advanced Options' TabOrder = 4 object chkServerShowConsoleWindow: TCheckBox @@ -157,7 +158,7 @@ object frmServerOptions: TfrmServerOptions Top = 27 Width = 257 Height = 17 - Caption = '&Show server console window on start' + Caption = '&Show Server console window on start' TabOrder = 0 end end @@ -172,9 +173,9 @@ object frmServerOptions: TfrmServerOptions object chkUseNgrok: TCheckBox Left = 8 Top = 73 - Width = 257 + Width = 313 Height = 17 - Caption = 'Use &ngrok to provide public url for web debugger' + Caption = 'Use &ngrok to provide public url for Server' TabOrder = 2 end object chkLeaveServerRunning: TCheckBox @@ -182,7 +183,7 @@ object frmServerOptions: TfrmServerOptions Top = 43 Width = 257 Height = 17 - Caption = '&Leave server running after closing IDE' + Caption = '&Leave Server running after closing IDE' TabOrder = 1 end end diff --git a/windows/src/developer/TIKE/dialogs/UfrmOptions.dfm b/windows/src/developer/TIKE/dialogs/UfrmOptions.dfm index b347eb791c..5968496f38 100644 --- a/windows/src/developer/TIKE/dialogs/UfrmOptions.dfm +++ b/windows/src/developer/TIKE/dialogs/UfrmOptions.dfm @@ -19,7 +19,7 @@ inherited frmOptions: TfrmOptions Top = 8 Width = 425 Height = 392 - ActivePage = tabDebugger + ActivePage = tabGeneral TabOrder = 0 object tabGeneral: TTabSheet Caption = 'General' @@ -332,31 +332,6 @@ inherited frmOptions: TfrmOptions TabOrder = 5 end end - object gbServer: TGroupBox - Left = 8 - Top = 159 - Width = 313 - Height = 138 - Caption = 'Web Host' - TabOrder = 1 - object chkListLocalURLs: TCheckBox - Left = 8 - Top = 55 - Width = 257 - Height = 17 - Caption = 'List local &URLs in web debugger' - TabOrder = 0 - end - object cmdConfigureServer: TButton - Left = 24 - Top = 101 - Width = 121 - Height = 25 - Caption = '&Configure server...' - TabOrder = 1 - OnClick = cmdConfigureServerClick - end - end end object tabCharMap: TTabSheet Caption = 'Character Map' @@ -419,6 +394,35 @@ inherited frmOptions: TfrmOptions end end end + object tabServer: TTabSheet + Caption = 'Server' + ImageIndex = 4 + object gbServer: TGroupBox + Left = 8 + Top = 8 + Width = 313 + Height = 97 + Caption = 'Keyman Developer Server' + TabOrder = 0 + object chkListLocalURLs: TCheckBox + Left = 9 + Top = 60 + Width = 257 + Height = 17 + Caption = 'List local &URLs for Server' + TabOrder = 1 + end + object cmdConfigureServer: TButton + Left = 9 + Top = 21 + Width = 121 + Height = 25 + Caption = '&Configure Server...' + TabOrder = 0 + OnClick = cmdConfigureServerClick + end + end + end end object cmdCancel: TButton Left = 356 diff --git a/windows/src/developer/TIKE/dialogs/UfrmOptions.pas b/windows/src/developer/TIKE/dialogs/UfrmOptions.pas index 733b82c62d..d7d0707f4f 100644 --- a/windows/src/developer/TIKE/dialogs/UfrmOptions.pas +++ b/windows/src/developer/TIKE/dialogs/UfrmOptions.pas @@ -72,7 +72,6 @@ type TntLabel1: TLabel; editDatabasePath: TEdit; dlgBrowseUnicodeData: TOpenDialog; - gbServer: TGroupBox; cmdSMTPSettings: TButton; chkOpenKeyboardFilesInSourceView: TCheckBox; cmdResetToolWindows: TButton; @@ -102,6 +101,8 @@ type gbPrivacy: TGroupBox; chkReportUsage: TCheckBox; chkReportErrors: TCheckBox; + tabServer: TTabSheet; + gbServer: TGroupBox; chkListLocalURLs: TCheckBox; cmdConfigureServer: TButton; procedure FormCreate(Sender: TObject); @@ -122,7 +123,7 @@ type function GetHelpTopic: string; override; public { Public declarations } - procedure FocusDebuggerTab; + procedure FocusServerTab; end; implementation @@ -154,9 +155,9 @@ uses { General functions } -procedure TfrmOptions.FocusDebuggerTab; +procedure TfrmOptions.FocusServerTab; begin - pages.ActivePage := tabDebugger; + pages.ActivePage := tabServer; end; procedure TfrmOptions.FormCreate(Sender: TObject); diff --git a/windows/src/developer/TIKE/main/UfrmMain.dfm b/windows/src/developer/TIKE/main/UfrmMain.dfm index cc41ad857f..73c5faef68 100644 --- a/windows/src/developer/TIKE/main/UfrmMain.dfm +++ b/windows/src/developer/TIKE/main/UfrmMain.dfm @@ -3080,7 +3080,7 @@ inherited frmKeymanDeveloper: TfrmKeymanDeveloper Caption = '-' end object mnuToolsWebDebugger: TMenuItem - Caption = '&Web Debugger' + Caption = '&Server' object mnuToolsWebDebuggerOpenInBrowser: TMenuItem Action = modActionsMain.actToolsWebOpenPublicUrl end