JCF2, Global Settings dialog: improved i18n and layout

components/jcf2/IdePlugin/lazarus/jcfuiconsts.pas

@@ -360,9 +360,9 @@ resourcestring
   lisCnfLogFile='File';
   lisCnfLogToken='Token';
   lisCnfLogFileDir='Log file directory';
-  lisCnfLogTemp='Temp';
-  lisCnfLogApplication='Application';
-  lisCnfLogSpecified='Specified';
+  lisCnfLogTemp='Temp: %s';
+  lisCnfLogApplication='Application: %s';
+  lisCnfLogSpecified='Specified: %s';
   lisCnfLogSelectDir='Select specified directory';
   lisCnfLogViewLog='View log after each run';
   lisCnfLogTime='Log time taken to process';

components/jcf2/Ui/Settings/fRegistrySettings.lfm

@@ -8,15 +8,13 @@ object fmRegistrySettings: TfmRegistrySettings
   ClientHeight = 389
   ClientWidth = 771
   Color = clBtnFace
-  DesignTimePPI = 120
   Position = poScreenCenter
-  LCLVersion = '3.99.0.0'
   Scaled = False
   OnCreate = FormCreate
   OnResize = FormResize
   object pgPages: TPageControl
     Left = 0
-    Height = 343
+    Height = 335
     Top = 0
     Width = 771
     ActivePage = tsGeneral
@@ -25,12 +23,12 @@ object fmRegistrySettings: TfmRegistrySettings
     TabOrder = 0
     object tsGeneral: TTabSheet
       Caption = '&General'
-      ClientHeight = 310
-      ClientWidth = 763
+      ClientHeight = 305
+      ClientWidth = 761
       object sbFile: TSpeedButton
         AnchorSideLeft.Control = eSettingsFile
         AnchorSideLeft.Side = asrBottom
-        Left = 639
+        Left = 625
         Height = 25
         Top = 13
         Width = 28
@@ -40,24 +38,24 @@ object fmRegistrySettings: TfmRegistrySettings
       end
       object Label1: TLabel
         Left = 11
-        Height = 20
+        Height = 16
         Top = 12
-        Width = 131
+        Width = 117
         Caption = 'Convert settings file'
       end
       object Label2: TLabel
         Left = 11
-        Height = 20
+        Height = 16
         Top = 252
-        Width = 104
+        Width = 96
         Caption = 'MRU max items'
         Visible = False
       end
       object eSettingsFile: TEdit
         AnchorSideLeft.Control = Label1
         AnchorSideLeft.Side = asrBottom
-        Left = 148
-        Height = 28
+        Left = 134
+        Height = 33
         Top = 11
         Width = 485
         BorderSpacing.Around = 6
@@ -67,7 +65,7 @@ object fmRegistrySettings: TfmRegistrySettings
       object btnClearMRU: TButton
         AnchorSideLeft.Control = eMRUMaxItems
         AnchorSideLeft.Side = asrBottom
-        Left = 184
+        Left = 176
         Height = 25
         Top = 250
         Width = 92
@@ -91,8 +89,8 @@ object fmRegistrySettings: TfmRegistrySettings
         ChildSizing.ShrinkVertical = crsScaleChilds
         ChildSizing.Layout = cclLeftToRightThenTopToBottom
         ChildSizing.ControlsPerLine = 1
-        ClientHeight = 67
-        ClientWidth = 366
+        ClientHeight = 75
+        ClientWidth = 368
         Items.Strings = (
           '&Always'
           '&On parse error'
@@ -115,8 +113,8 @@ object fmRegistrySettings: TfmRegistrySettings
         ChildSizing.ShrinkVertical = crsScaleChilds
         ChildSizing.Layout = cclLeftToRightThenTopToBottom
         ChildSizing.ControlsPerLine = 1
-        ClientHeight = 69
-        ClientWidth = 366
+        ClientHeight = 77
+        ClientWidth = 368
         Items.Strings = (
           '&Always'
           '&Fail quietly'
@@ -127,9 +125,9 @@ object fmRegistrySettings: TfmRegistrySettings
       end
       object cbCheckMultibyteChars: TCheckBox
         Left = 411
-        Height = 24
+        Height = 23
         Top = 49
-        Width = 188
+        Width = 176
         Caption = 'Check for &multibyte chars'
         TabOrder = 4
         Visible = False
@@ -137,8 +135,8 @@ object fmRegistrySettings: TfmRegistrySettings
       object eMRUMaxItems: TSpinEdit
         AnchorSideLeft.Control = Label2
         AnchorSideLeft.Side = asrBottom
-        Left = 121
-        Height = 28
+        Left = 113
+        Height = 33
         Top = 248
         Width = 57
         BorderSpacing.Around = 6
@@ -148,13 +146,13 @@ object fmRegistrySettings: TfmRegistrySettings
     end
     object tsLogFile: TTabSheet
       Caption = '&Log file'
-      ClientHeight = 310
-      ClientWidth = 763
+      ClientHeight = 305
+      ClientWidth = 761
       ImageIndex = 1
       object sbSpecifedDir: TSpeedButton
         AnchorSideLeft.Control = Label3
         AnchorSideLeft.Side = asrBottom
-        Left = 180
+        Left = 160
         Height = 25
         Top = 197
         Width = 29
@@ -164,23 +162,23 @@ object fmRegistrySettings: TfmRegistrySettings
       end
       object Label3: TLabel
         Left = 7
-        Height = 20
+        Height = 16
         Top = 199
-        Width = 167
+        Width = 147
         Caption = 'Select specified directory'
       end
       object lblBackupFileExt: TLabel
         Left = 306
-        Height = 20
+        Height = 16
         Top = 20
-        Width = 140
+        Width = 125
         Caption = 'Backup file extension'
       end
       object lblOutputFileExt: TLabel
         Left = 306
-        Height = 20
+        Height = 16
         Top = 49
-        Width = 138
+        Width = 120
         Caption = 'Output file extension'
       end
       object rgLogLevel: TRadioGroup
@@ -197,8 +195,8 @@ object fmRegistrySettings: TfmRegistrySettings
         ChildSizing.ShrinkVertical = crsScaleChilds
         ChildSizing.Layout = cclLeftToRightThenTopToBottom
         ChildSizing.ControlsPerLine = 1
-        ClientHeight = 65
-        ClientWidth = 277
+        ClientHeight = 73
+        ClientWidth = 279
         Items.Strings = (
           'Errors only'
           'File'
@@ -221,8 +219,8 @@ object fmRegistrySettings: TfmRegistrySettings
         ChildSizing.ShrinkVertical = crsScaleChilds
         ChildSizing.Layout = cclLeftToRightThenTopToBottom
         ChildSizing.ControlsPerLine = 1
-        ClientHeight = 72
-        ClientWidth = 742
+        ClientHeight = 80
+        ClientWidth = 744
         Items.Strings = (
           'Temp'
           'Application'
@@ -233,26 +231,27 @@ object fmRegistrySettings: TfmRegistrySettings
       end
       object btnViewLog: TButton
         Left = 392
-        Height = 25
+        Height = 32
         Top = 255
-        Width = 110
+        Width = 98
+        AutoSize = True
         Caption = 'View Log now'
         TabOrder = 6
         OnClick = btnViewLogClick
       end
       object cbViewLog: TCheckBox
         Left = 7
-        Height = 24
+        Height = 23
         Top = 231
-        Width = 174
+        Width = 160
         Caption = 'View log after each run'
         TabOrder = 4
       end
       object edtBackupExt: TEdit
         AnchorSideLeft.Control = lblBackupFileExt
         AnchorSideLeft.Side = asrBottom
-        Left = 452
-        Height = 28
+        Left = 437
+        Height = 33
         Top = 15
         Width = 55
         BorderSpacing.Around = 6
@@ -262,8 +261,8 @@ object fmRegistrySettings: TfmRegistrySettings
       object edtOutputExt: TEdit
         AnchorSideLeft.Control = lblOutputFileExt
         AnchorSideLeft.Side = asrBottom
-        Left = 450
-        Height = 28
+        Left = 432
+        Height = 33
         Top = 49
         Width = 55
         BorderSpacing.Around = 6
@@ -272,31 +271,31 @@ object fmRegistrySettings: TfmRegistrySettings
       end
       object cbLogTime: TCheckBox
         Left = 7
-        Height = 24
+        Height = 23
         Top = 256
-        Width = 192
+        Width = 177
         Caption = 'Log time taken to process'
         TabOrder = 5
       end
     end
     object tsExclusions: TTabSheet
       Caption = '&Exclusions'
-      ClientHeight = 310
-      ClientWidth = 763
+      ClientHeight = 305
+      ClientWidth = 761
       ImageIndex = 2
       OnResize = tsExclusionsResize
       object lblFilesCaption: TLabel
         Left = 11
-        Height = 20
+        Height = 16
         Top = 5
-        Width = 324
+        Width = 284
         Caption = 'Individual files to exclude from batch processing:'
       end
       object lblDirsCaption: TLabel
         Left = 11
-        Height = 20
+        Height = 16
         Top = 148
-        Width = 300
+        Width = 264
         Caption = 'Directories to exclude from batch processing:'
       end
       object mFiles: TMemo
@@ -316,32 +315,32 @@ object fmRegistrySettings: TfmRegistrySettings
     end
     object tsIde: TTabSheet
       Caption = 'IDE'
-      ClientHeight = 310
-      ClientWidth = 763
+      ClientHeight = 305
+      ClientWidth = 761
       ImageIndex = 3
       TabVisible = False
       object cbEditorIntegration: TCheckBox
         Left = 11
-        Height = 24
+        Height = 23
         Top = 15
-        Width = 138
+        Width = 125
         Caption = '&Editor Integration'
         TabOrder = 0
       end
       object cbFormatBeforeSave: TCheckBox
         Left = 11
-        Height = 24
+        Height = 23
         Top = 59
-        Width = 151
+        Width = 141
         Caption = 'Format before &Save'
         TabOrder = 1
         OnClick = cbFormatBeforeSaveClick
       end
       object cbFormatAfterLoad: TCheckBox
         Left = 11
-        Height = 24
+        Height = 23
         Top = 37
-        Width = 140
+        Width = 129
         Caption = 'Format after &Load'
         TabOrder = 2
         OnClick = cbFormatAfterLoadClick
@@ -350,8 +349,8 @@ object fmRegistrySettings: TfmRegistrySettings
   end
   object ButtonPanel: TButtonPanel
     Left = 8
-    Height = 30
-    Top = 351
+    Height = 38
+    Top = 343
     Width = 755
     BorderSpacing.Around = 8
     OKButton.Name = 'OKButton'

components/jcf2/Ui/Settings/fRegistrySettings.pas

@@ -247,9 +247,6 @@ begin
   rgLogLevel.Items[1] := lisCnfLogFile;
   rgLogLevel.Items[2] := lisCnfLogToken;
   rgLogDir.Caption := lisCnfLogFileDir;
-  rgLogDir.Items[0] := lisCnfLogTemp;
-  rgLogDir.Items[1] := lisCnfLogApplication;
-  rgLogDir.Items[2] := lisCnfLogSpecified;
   Label3.Caption := lisCnfLogSelectDir;
 
   cbViewLog.Caption := lisCnfLogViewLog;
@@ -312,10 +309,10 @@ end;
 
 procedure TfmRegistrySettings.ShowDirs;
 begin
-  rgLogDir.Items[0] := 'Temp: ' + GetTempDir;
-  rgLogDir.Items[1] := 'Application: ' + IncludeTrailingPathDelimiter(
-    ExtractFileDir(ParamStr(0)));
-  rgLogDir.Items[2] := 'Specified: ' + fsSpecifiedDirectory;
+  rgLogDir.Items[0] := Format(lisCnfLogTemp, [GetTempDir]);
+  rgLogDir.Items[1] := Format(lisCnfLogApplication, [IncludeTrailingPathDelimiter(
+    ExtractFileDir(ParamStr(0)))]);
+  rgLogDir.Items[2] := Format(lisCnfLogSpecified, [fsSpecifiedDirectory]);
 end;
 
 procedure TfmRegistrySettings.tsExclusionsResize(Sender: TObject);