Project options: Place name and description edits directly on application page. Issue #30977.

git-svn-id: trunk@54254 -

ide/frames/project_application_options.lfm

@@ -1,32 +1,32 @@
 object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
   Left = 0
-  Height = 492
+  Height = 516
   Top = 0
   Width = 487
-  ClientHeight = 492
+  ClientHeight = 516
   ClientWidth = 487
   TabOrder = 0
   DesignLeft = 437
   DesignTop = 182
   object AppSettingsGroupBox: TGroupBox
     Left = 0
-    Height = 456
+    Height = 506
     Top = 0
     Width = 487
     Align = alTop
+    Anchors = []
     AutoSize = True
     Caption = 'AppSettingsGroupBox'
-    ClientHeight = 436
+    ClientHeight = 487
     ClientWidth = 483
     TabOrder = 0
     object TitleLabel: TLabel
-      AnchorSideLeft.Control = AppSettingsGroupBox
       AnchorSideTop.Control = TitleEdit
       AnchorSideTop.Side = asrCenter
       Left = 6
-      Height = 15
-      Top = 10
-      Width = 51
+      Height = 14
+      Top = 13
+      Width = 59
       BorderSpacing.Left = 6
       Caption = 'TitleLabel'
       ParentColor = False
@@ -35,9 +35,9 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideLeft.Control = TitleLabel
       AnchorSideTop.Control = IconPanel
       Left = 6
-      Height = 15
-      Top = 35
-      Width = 51
+      Height = 14
+      Top = 40
+      Width = 58
       Caption = 'IconLabel'
       ParentColor = False
     end
@@ -47,16 +47,17 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = IconTrack
       Left = 240
-      Height = 15
-      Top = 159
-      Width = 79
+      Height = 14
+      Top = 163
+      Width = 89
       BorderSpacing.Top = 6
       Caption = 'IconTrackLabel'
       ParentColor = False
     end
     object TitleEdit: TEdit
+      AnchorSideRight.Side = asrBottom
       Left = 106
-      Height = 23
+      Height = 28
       Top = 6
       Width = 371
       Align = alTop
@@ -66,25 +67,25 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       Text = 'TitleEdit'
     end
     object UseAppBundleCheckBox: TCheckBox
-      AnchorSideLeft.Control = UseXPManifestCheckBox
+      AnchorSideLeft.Control = TitleLabel
       AnchorSideTop.Control = DarwinDividerBevel
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 19
-      Top = 380
-      Width = 150
+      Height = 20
+      Top = 430
+      Width = 176
       BorderSpacing.Top = 3
       Caption = 'UseAppBundleCheckBox'
-      TabOrder = 13
+      TabOrder = 12
     end
     object UseXPManifestCheckBox: TCheckBox
       AnchorSideLeft.Control = TitleLabel
       AnchorSideTop.Control = WindowsDividerBevel
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 19
-      Top = 235
-      Width = 151
+      Height = 20
+      Top = 240
+      Width = 177
       BorderSpacing.Top = 3
       Caption = 'UseXPManifestCheckBox'
       OnChange = UseXPManifestCheckBoxChange
@@ -96,7 +97,7 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideTop.Side = asrBottom
       Left = 106
       Height = 128
-      Top = 35
+      Top = 40
       Width = 128
       BorderSpacing.Left = 106
       BorderSpacing.Top = 6
@@ -125,8 +126,8 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideBottom.Side = asrBottom
       Left = 240
       Height = 25
-      Top = 35
-      Width = 111
+      Top = 40
+      Width = 109
       AutoSize = True
       BorderSpacing.Left = 6
       Caption = 'LoadIconButton'
@@ -139,7 +140,7 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideTop.Side = asrBottom
       Left = 240
       Height = 25
-      Top = 97
+      Top = 101
       Width = 109
       AutoSize = True
       BorderSpacing.Top = 6
@@ -153,8 +154,8 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideTop.Side = asrBottom
       Left = 240
       Height = 25
-      Top = 128
-      Width = 112
+      Top = 132
+      Width = 111
       AutoSize = True
       BorderSpacing.Top = 6
       Caption = 'ClearIconButton'
@@ -169,7 +170,7 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideRight.Side = asrBottom
       Left = 106
       Height = 29
-      Top = 163
+      Top = 168
       Width = 128
       Max = 0
       OnChange = IconTrackChange
@@ -183,9 +184,9 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideTop.Control = ExecutionLevelComboBox
       AnchorSideTop.Side = asrBottom
       Left = 27
-      Height = 19
-      Top = 309
-      Width = 119
+      Height = 20
+      Top = 325
+      Width = 142
       BorderSpacing.Top = 3
       Caption = 'UIAccessCheckBox'
       TabOrder = 11
@@ -196,13 +197,13 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = DpiAwareComboBox
       AnchorSideRight.Side = asrBottom
-      Left = 163
-      Height = 23
-      Top = 283
-      Width = 314
+      Left = 181
+      Height = 28
+      Top = 294
+      Width = 296
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Top = 3
-      ItemHeight = 15
+      ItemHeight = 14
       Style = csDropDownList
       TabOrder = 10
     end
@@ -211,9 +212,9 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideTop.Control = ExecutionLevelComboBox
       AnchorSideTop.Side = asrCenter
       Left = 27
-      Height = 15
-      Top = 287
-      Width = 106
+      Height = 14
+      Top = 301
+      Width = 124
       Caption = 'ExecutionLevelLabel'
       ParentColor = False
     end
@@ -222,8 +223,8 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideTop.Control = LoadIconButton
       AnchorSideTop.Side = asrBottom
       Left = 240
-      Height = 25
-      Top = 66
+      Height = 24
+      Top = 71
       Width = 123
       AutoSize = True
       BorderSpacing.Top = 6
@@ -232,14 +233,12 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       TabOrder = 4
     end
     object WindowsDividerBevel: TDividerBevel
-      AnchorSideLeft.Control = AppSettingsGroupBox
       AnchorSideTop.Control = UseLCLScalingCheckBox
       AnchorSideTop.Side = asrBottom
-      AnchorSideRight.Control = AppSettingsGroupBox
       AnchorSideRight.Side = asrBottom
       Left = 3
-      Height = 15
-      Top = 217
+      Height = 14
+      Top = 223
       Width = 477
       Caption = 'For Windows'
       Anchors = [akTop, akLeft, akRight]
@@ -249,48 +248,30 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       Font.Style = [fsBold]
       ParentFont = False
     end
-    object DarwinDividerBevel: TDividerBevel
-      AnchorSideLeft.Control = AppSettingsGroupBox
-      AnchorSideTop.Control = TextFieldButton
-      AnchorSideTop.Side = asrBottom
-      AnchorSideRight.Control = AppSettingsGroupBox
-      AnchorSideRight.Side = asrBottom
-      Left = 3
-      Height = 15
-      Top = 362
-      Width = 477
-      Caption = 'For macOS (Darwin)'
-      Anchors = [akTop, akLeft, akRight]
-      BorderSpacing.Left = 3
-      BorderSpacing.Top = 6
-      BorderSpacing.Right = 3
-      Font.Style = [fsBold]
-      ParentFont = False
-    end
     object CreateAppBundleButton: TBitBtn
       AnchorSideLeft.Control = UseAppBundleCheckBox
       AnchorSideTop.Control = UseAppBundleCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 27
       Height = 25
-      Top = 405
-      Width = 155
+      Top = 456
+      Width = 160
       AutoSize = True
       BorderSpacing.Left = 21
       BorderSpacing.Top = 6
       BorderSpacing.Bottom = 6
       Caption = 'CreateAppBundleButton'
       OnClick = CreateAppBundleButtonClick
-      TabOrder = 14
+      TabOrder = 13
     end
     object DpiAwareLabel: TLabel
       AnchorSideLeft.Control = UseXPManifestCheckBox
       AnchorSideTop.Control = DpiAwareComboBox
       AnchorSideTop.Side = asrCenter
       Left = 27
-      Height = 15
-      Top = 261
-      Width = 79
+      Height = 14
+      Top = 270
+      Width = 91
       BorderSpacing.Left = 21
       BorderSpacing.Top = 3
       Caption = 'DpiAwareLabel'
@@ -303,49 +284,103 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = TitleEdit
       AnchorSideRight.Side = asrBottom
-      Left = 163
-      Height = 23
-      Top = 257
-      Width = 314
+      Left = 181
+      Height = 28
+      Top = 263
+      Width = 296
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 30
       BorderSpacing.Top = 3
-      ItemHeight = 15
+      ItemHeight = 14
       Style = csDropDownList
       TabOrder = 9
     end
-    object TextFieldButton: TButton
-      AnchorSideLeft.Control = DpiAwareLabel
-      AnchorSideTop.Control = UIAccessCheckBox
-      AnchorSideTop.Side = asrBottom
-      Left = 27
-      Height = 25
-      Top = 331
-      Width = 109
-      AutoSize = True
-      BorderSpacing.Top = 3
-      Caption = 'TextFieldButton'
-      OnClick = TextFieldButtonClick
-      TabOrder = 12
-    end
     object UseLCLScalingCheckBox: TCheckBox
       AnchorSideLeft.Control = TitleLabel
       AnchorSideTop.Control = IconTrack
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 19
-      Top = 192
-      Width = 149
+      Height = 20
+      Top = 197
+      Width = 176
       Caption = 'UseLCLScalingCheckBox'
       TabOrder = 7
     end
+    object DarwinDividerBevel: TDividerBevel
+      AnchorSideTop.Control = DescriptionEdit
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Side = asrBottom
+      Left = 3
+      Height = 14
+      Top = 413
+      Width = 474
+      Caption = 'For macOS (Darwin)'
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Left = 3
+      BorderSpacing.Top = 6
+      BorderSpacing.Right = 3
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object NameLabel: TLabel
+      AnchorSideLeft.Control = DpiAwareLabel
+      AnchorSideTop.Control = NameEdit
+      AnchorSideTop.Side = asrCenter
+      Left = 27
+      Height = 14
+      Top = 355
+      Width = 68
+      Caption = 'NameLabel'
+      ParentColor = False
+    end
+    object DescriptionLabel: TLabel
+      AnchorSideLeft.Control = DpiAwareLabel
+      AnchorSideTop.Control = DescriptionEdit
+      AnchorSideTop.Side = asrCenter
+      Left = 27
+      Height = 14
+      Top = 386
+      Width = 101
+      Caption = 'DescriptionLabel'
+      ParentColor = False
+    end
+    object NameEdit: TEdit
+      AnchorSideLeft.Control = DpiAwareComboBox
+      AnchorSideTop.Control = UIAccessCheckBox
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = DpiAwareComboBox
+      AnchorSideRight.Side = asrBottom
+      Left = 181
+      Height = 28
+      Top = 348
+      Width = 296
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Top = 3
+      TabOrder = 14
+      Text = 'NameEdit'
+    end
+    object DescriptionEdit: TEdit
+      AnchorSideLeft.Control = DpiAwareComboBox
+      AnchorSideTop.Control = NameEdit
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = DpiAwareComboBox
+      AnchorSideRight.Side = asrBottom
+      Left = 181
+      Height = 28
+      Top = 379
+      Width = 296
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Top = 3
+      TabOrder = 15
+      Text = 'DescriptionEdit'
+    end
   end
   object OpenPictureDialog1: TOpenPictureDialog
-    Left = 385
-    Top = 190
+    left = 385
+    top = 190
   end
   object SavePictureDialog1: TSavePictureDialog
-    Left = 385
-    Top = 249
+    left = 385
+    top = 249
   end
 end

ide/frames/project_application_options.pas

@@ -16,14 +16,17 @@ type
 
   TProjectApplicationOptionsFrame = class(TAbstractIDEOptionsEditor)
     AppSettingsGroupBox: TGroupBox;
+    DarwinDividerBevel: TDividerBevel;
+    NameEdit: TEdit;
+    DescriptionEdit: TEdit;
+    NameLabel: TLabel;
+    DescriptionLabel: TLabel;
     UseLCLScalingCheckBox: TCheckBox;
-    TextFieldButton: TButton;
     CreateAppBundleButton: TBitBtn;
     DefaultIconButton: TButton;
     DpiAwareLabel: TLabel;
     DpiAwareComboBox: TComboBox;
     WindowsDividerBevel: TDividerBevel;
-    DarwinDividerBevel: TDividerBevel;
     UIAccessCheckBox: TCheckBox;
     ExecutionLevelComboBox: TComboBox;
     ClearIconButton: TBitBtn;
@@ -48,11 +51,11 @@ type
     procedure IconTrackChange(Sender: TObject);
     procedure LoadIconButtonClick(Sender: TObject);
     procedure SaveIconButtonClick(Sender: TObject);
-    procedure TextFieldButtonClick(Sender: TObject);
     procedure UseXPManifestCheckBoxChange(Sender: TObject);
   private
     FProject: TProject;
     fIconChanged: boolean;
+    procedure EnableManifest(aEnable: Boolean);
     procedure SetIconFromStream(Value: TStream);
     function GetIconAsStream: TStream;
   public
@@ -174,30 +177,20 @@ begin
     IconImage.Picture.SaveToFile(SavePictureDialog1.FileName);
 end;
 
-procedure TProjectApplicationOptionsFrame.TextFieldButtonClick(Sender: TObject);
-var
-  Caps, Values: array[0..1] of string;
+procedure TProjectApplicationOptionsFrame.EnableManifest(aEnable: Boolean);
 begin
-  Caps[0] := lisName;
-  Caps[1] := lisCodeHelpDescrTag;
-  Values[0] := FProject.ProjResources.XPManifest.TextName;
-  Values[1] := FProject.ProjResources.XPManifest.TextDesc;
-
-  if InputQuery(TextFieldButton.Caption, Caps, Values) then
-  begin
-    FProject.ProjResources.XPManifest.TextName := Values[0];
-    FProject.ProjResources.XPManifest.TextDesc := Values[1];
-  end;
+  DpiAwareLabel.Enabled := aEnable;
+  DpiAwareComboBox.Enabled := aEnable;
+  ExecutionLevelLabel.Enabled := aEnable;
+  ExecutionLevelComboBox.Enabled := aEnable;
+  UIAccessCheckBox.Enabled := aEnable;
+  NameEdit.Enabled := aEnable;
+  DescriptionEdit.Enabled := aEnable;
 end;
 
 procedure TProjectApplicationOptionsFrame.UseXPManifestCheckBoxChange(Sender: TObject);
 begin
-  DpiAwareLabel.Enabled := UseXPManifestCheckBox.Checked;
-  DpiAwareComboBox.Enabled := UseXPManifestCheckBox.Checked;
-  ExecutionLevelLabel.Enabled := UseXPManifestCheckBox.Checked;
-  ExecutionLevelComboBox.Enabled := UseXPManifestCheckBox.Checked;
-  UIAccessCheckBox.Enabled := UseXPManifestCheckBox.Checked;
-  TextFieldButton.Enabled := UseXPManifestCheckBox.Checked;
+  EnableManifest(UseXPManifestCheckBox.Checked);
 end;
 
 procedure TProjectApplicationOptionsFrame.SetIconFromStream(Value: TStream);
@@ -258,7 +251,8 @@ begin
   for DpiLevel in TXPManifestDpiAware do
     DpiAwareComboBox.Items.Add(DpiLevelNames[DpiLevel] + ' (' + ManifestDpiAwareValues[DpiLevel] + ')');
   UIAccessCheckBox.Caption := dlgPOUIAccess;
-  TextFieldButton.Caption := dlgPOTextFields;
+  NameLabel.Caption := lisName;
+  DescriptionLabel.Caption := lisCodeHelpDescrTag;
 
   // Darwin specific, Application Bundle
   DarwinDividerBevel.Caption := lisForMacOSDarwin;
@@ -293,26 +287,25 @@ begin
     TitleEdit.Text := Title;
     UseLCLScalingCheckBox.Checked := Scaled;
     UseAppBundleCheckBox.Checked := UseAppBundle;
+    // Manifest
     with ProjResources.XPManifest do
     begin
       UseXPManifestCheckBox.Checked := UseManifest;
       DpiAwareComboBox.ItemIndex := Ord(DpiAware);
       ExecutionLevelComboBox.ItemIndex := Ord(ExecutionLevel);
       UIAccessCheckBox.Checked := UIAccess;
+      NameEdit.Text := TextName;
+      DescriptionEdit.Text := TextDesc;
     end;
-    DpiAwareLabel.Enabled := UseXPManifestCheckBox.Checked;
-    DpiAwareComboBox.Enabled := UseXPManifestCheckBox.Checked;
-    ExecutionLevelLabel.Enabled := UseXPManifestCheckBox.Checked;
-    ExecutionLevelComboBox.Enabled := UseXPManifestCheckBox.Checked;
-    UIAccessCheckBox.Enabled := UseXPManifestCheckBox.Checked;
-    TextFieldButton.Enabled := UseXPManifestCheckBox.Checked;
+    EnableManifest(UseXPManifestCheckBox.Checked);
+    // Icon
     AStream := TProjectIcon(ProjResources[TProjectIcon]).GetStream;
     try
       SetIconFromStream(AStream);
     finally
       AStream.Free;
     end;
-    fIconChanged:=false;
+    fIconChanged := False;
   end;
 end;
 
@@ -320,7 +313,7 @@ procedure TProjectApplicationOptionsFrame.WriteSettings(AOptions: TAbstractIDEOp
 var
   AStream: TStream;
 begin
-  with (AOptions as TProjectIDEOptions).Project {AOptions as TProject} do
+  with (AOptions as TProjectIDEOptions).Project do
   begin
     Title := TitleEdit.Text;
     Scaled := UseLCLScalingCheckBox.Checked;
@@ -340,6 +333,8 @@ begin
       DpiAware := TXPManifestDpiAware(DpiAwareComboBox.ItemIndex);
       ExecutionLevel := TXPManifestExecutionLevel(ExecutionLevelComboBox.ItemIndex);
       UIAccess := UIAccessCheckBox.Checked;
+      TextName := NameEdit.Text;
+      TextDesc := DescriptionEdit.Text;
     end;
   end;
 end;

ide/lazarusidestrconsts.pas

@@ -2599,7 +2599,6 @@ resourcestring
   dlgPODpiAwarenessOldOffNewPerMonitor = 'Vista-8: off, 8.1+: per monitor';
   dlgPODpiAwarenessOldOnNewPerMonitor = 'Vista-8: on, 8.1+: per monitor';
   dlgPOUIAccess = 'UI Access (uiAccess)';
-  dlgPOTextFields = 'Text fields';
   dlgPOAsInvoker = 'as invoker (asInvoker)';
   dlgPOHighestAvailable = 'highest available (highestAvailable)';
   dlgPORequireAdministrator = 'require administrator (requireAdministrator)';