paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-27 17:00:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: In Project Options -> Application, add divider for Windows and Darwin specific settings

Browse Source 
git-svn-id: trunk@47320 -
This commit is contained in:
juha 2015-01-08 20:56:29 +00:00
parent 5aa14d0a7e
commit ac935867c3
4 changed files with 126 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

193
ide/frames/project_application_options.lfm
View File

@ -1,32 +1,31 @@
object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
Left = 0 Left = 0
Height = 425 Height = 477
Top = 0 Top = 0
Width = 522 Width = 487
ClientHeight = 425 ClientHeight = 477
ClientWidth = 522 ClientWidth = 487
TabOrder = 0 TabOrder = 0
DesignLeft = 1197 DesignLeft = 392
DesignTop = 317 DesignTop = 251
object AppSettingsGroupBox: TGroupBox object AppSettingsGroupBox: TGroupBox
Left = 0 Left = 0
Height = 356 Height = 469
Top = 0 Top = 0
Width = 522 Width = 487
Align = alTop Align = alTop
AutoSize = True
Caption = 'AppSettingsGroupBox' Caption = 'AppSettingsGroupBox'
ClientHeight = 338 ClientHeight = 444
ClientWidth = 518 ClientWidth = 483
TabOrder = 0 TabOrder = 0
object TitleLabel: TLabel object TitleLabel: TLabel
AnchorSideLeft.Control = AppSettingsGroupBox AnchorSideLeft.Control = AppSettingsGroupBox
AnchorSideTop.Control = TitleEdit AnchorSideTop.Control = TitleEdit
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 6 Left = 6
Height = 15 Height = 20
Top = 10 Top = 10
Width = 51 Width = 65
BorderSpacing.Left = 6 BorderSpacing.Left = 6
Caption = 'TitleLabel' Caption = 'TitleLabel'
ParentColor = False ParentColor = False
@ -35,9 +34,9 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
AnchorSideLeft.Control = AppSettingsGroupBox AnchorSideLeft.Control = AppSettingsGroupBox
AnchorSideTop.Control = IconPanel AnchorSideTop.Control = IconPanel
Left = 6 Left = 6
Height = 15 Height = 20
Top = 35 Top = 40
Width = 51 Width = 64
BorderSpacing.Left = 6 BorderSpacing.Left = 6
Caption = 'IconLabel' Caption = 'IconLabel'
ParentColor = False ParentColor = False
@ -49,9 +48,9 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = IconTrack AnchorSideRight.Control = IconTrack
Left = 240 Left = 240
Height = 15 Height = 20
Top = 176 Top = 178
Width = 80 Width = 99
BorderSpacing.Left = 6 BorderSpacing.Left = 6
BorderSpacing.Right = 6 BorderSpacing.Right = 6
Caption = 'IconTrackLabel' Caption = 'IconTrackLabel'
@ -59,9 +58,9 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
end end
object TitleEdit: TEdit object TitleEdit: TEdit
Left = 106 Left = 106
Height = 23 Height = 28
Top = 6 Top = 6
Width = 406 Width = 371
Align = alTop Align = alTop
BorderSpacing.Left = 100 BorderSpacing.Left = 100
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -70,25 +69,27 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
end end
object UseAppBundleCheckBox: TCheckBox object UseAppBundleCheckBox: TCheckBox
AnchorSideLeft.Control = AppSettingsGroupBox AnchorSideLeft.Control = AppSettingsGroupBox
AnchorSideTop.Control = IconTrack AnchorSideTop.Control = DarwinDividerBevel
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 19 Height = 24
Top = 209 Top = 372
Width = 150 Width = 186
BorderSpacing.Around = 6 BorderSpacing.Left = 6
BorderSpacing.Top = 3
Caption = 'UseAppBundleCheckBox' Caption = 'UseAppBundleCheckBox'
TabOrder = 6 TabOrder = 6
end end
object UseXPManifestCheckBox: TCheckBox object UseXPManifestCheckBox: TCheckBox
AnchorSideLeft.Control = AppSettingsGroupBox AnchorSideLeft.Control = AppSettingsGroupBox
AnchorSideTop.Control = UseAppBundleCheckBox AnchorSideTop.Control = WindowsDividerBevel
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 19 Height = 24
Top = 234 Top = 234
Width = 151 Width = 186
BorderSpacing.Around = 6 BorderSpacing.Left = 6
BorderSpacing.Top = 3
Caption = 'UseXPManifestCheckBox' Caption = 'UseXPManifestCheckBox'
OnChange = UseXPManifestCheckBoxChange OnChange = UseXPManifestCheckBoxChange
TabOrder = 7 TabOrder = 7
@ -99,7 +100,7 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 106 Left = 106
Height = 128 Height = 128
Top = 35 Top = 40
Width = 128 Width = 128
BorderSpacing.Left = 106 BorderSpacing.Left = 106
BorderSpacing.Top = 6 BorderSpacing.Top = 6
@ -127,9 +128,9 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
AnchorSideBottom.Control = IconPanel AnchorSideBottom.Control = IconPanel
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 240 Left = 240
Height = 25 Height = 30
Top = 35 Top = 40
Width = 111 Width = 131
AutoSize = True AutoSize = True
BorderSpacing.Left = 6 BorderSpacing.Left = 6
Caption = 'LoadIconButton' Caption = 'LoadIconButton'
@ -141,9 +142,9 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
AnchorSideTop.Control = DefaultIconButton AnchorSideTop.Control = DefaultIconButton
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 240 Left = 240
Height = 25 Height = 30
Top = 97 Top = 112
Width = 109 Width = 129
AutoSize = True AutoSize = True
BorderSpacing.Top = 6 BorderSpacing.Top = 6
Caption = 'SaveIconButton' Caption = 'SaveIconButton'
@ -155,9 +156,9 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
AnchorSideTop.Control = SaveIconButton AnchorSideTop.Control = SaveIconButton
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 240 Left = 240
Height = 25 Height = 30
Top = 128 Top = 148
Width = 112 Width = 132
AutoSize = True AutoSize = True
BorderSpacing.Top = 6 BorderSpacing.Top = 6
Caption = 'ClearIconButton' Caption = 'ClearIconButton'
@ -172,7 +173,7 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 106 Left = 106
Height = 40 Height = 40
Top = 163 Top = 168
Width = 128 Width = 128
Max = 0 Max = 0
OnChange = IconTrackChange OnChange = IconTrackChange
@ -186,11 +187,11 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
AnchorSideTop.Control = UseXPManifestCheckBox AnchorSideTop.Control = UseXPManifestCheckBox
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 27 Left = 27
Height = 19 Height = 24
Top = 259 Top = 261
Width = 123 Width = 154
BorderSpacing.Left = 15 BorderSpacing.Left = 21
BorderSpacing.Around = 6 BorderSpacing.Top = 3
Caption = 'DpiAwareCheckBox' Caption = 'DpiAwareCheckBox'
TabOrder = 8 TabOrder = 8
end end
@ -199,11 +200,10 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
AnchorSideTop.Control = ExecutionLevelComboBox AnchorSideTop.Control = ExecutionLevelComboBox
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 27 Left = 27
Height = 19 Height = 24
Top = 313 Top = 319
Width = 119 Width = 146
BorderSpacing.Top = 6 BorderSpacing.Top = 3
BorderSpacing.Bottom = 6
Caption = 'UIAccessCheckBox' Caption = 'UIAccessCheckBox'
TabOrder = 10 TabOrder = 10
end end
@ -212,12 +212,14 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = DpiAwareCheckBox AnchorSideTop.Control = DpiAwareCheckBox
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 139 Left = 167
Height = 23 Height = 28
Top = 284 Top = 288
Width = 223 Width = 310
BorderSpacing.Around = 6 Anchors = [akTop, akLeft, akRight]
ItemHeight = 15 BorderSpacing.Left = 6
BorderSpacing.Top = 3
ItemHeight = 20
Style = csDropDownList Style = csDropDownList
TabOrder = 9 TabOrder = 9
end end
@ -226,11 +228,9 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
AnchorSideTop.Control = ExecutionLevelComboBox AnchorSideTop.Control = ExecutionLevelComboBox
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 27 Left = 27
Height = 15 Height = 20
Top = 288 Top = 292
Width = 106 Width = 134
BorderSpacing.Top = 6
BorderSpacing.Bottom = 6
Caption = 'ExecutionLevelLabel' Caption = 'ExecutionLevelLabel'
ParentColor = False ParentColor = False
end end
@ -239,36 +239,63 @@ object ProjectApplicationOptionsFrame: TProjectApplicationOptionsFrame
AnchorSideTop.Control = LoadIconButton AnchorSideTop.Control = LoadIconButton
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 240 Left = 240
Height = 25 Height = 30
Top = 66 Top = 76
Width = 123 Width = 147
AutoSize = True AutoSize = True
BorderSpacing.Top = 6 BorderSpacing.Top = 6
Caption = 'DefaultIconButton' Caption = 'DefaultIconButton'
OnClick = DefaultIconButtonClick OnClick = DefaultIconButtonClick
TabOrder = 11 TabOrder = 11
end end
end object WindowsDividerBevel: TDividerBevel
object CreateAppBundleButton: TBitBtn AnchorSideTop.Control = IconTrack
AnchorSideLeft.Control = Owner AnchorSideTop.Side = asrBottom
AnchorSideTop.Control = AppSettingsGroupBox Left = 6
AnchorSideTop.Side = asrBottom Height = 20
Left = 0 Top = 211
Height = 25 Width = 471
Top = 362 Caption = 'For Windows'
Width = 155 Anchors = [akTop, akLeft, akRight]
AutoSize = True BorderSpacing.Top = 3
BorderSpacing.Top = 6 Font.Style = [fsBold]
Caption = 'CreateAppBundleButton' ParentFont = False
OnClick = CreateAppBundleButtonClick end
TabOrder = 1 object DarwinDividerBevel: TDividerBevel
AnchorSideTop.Control = UIAccessCheckBox
AnchorSideTop.Side = asrBottom
Left = 6
Height = 20
Top = 349
Width = 471
Caption = 'For Darwin'
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6
Font.Style = [fsBold]
ParentFont = False
end
object CreateAppBundleButton: TBitBtn
AnchorSideLeft.Control = UseAppBundleCheckBox
AnchorSideTop.Control = UseAppBundleCheckBox
AnchorSideTop.Side = asrBottom
Left = 27
Height = 30
Top = 402
Width = 187
AutoSize = True
BorderSpacing.Left = 21
BorderSpacing.Top = 6
Caption = 'CreateAppBundleButton'
OnClick = CreateAppBundleButtonClick
TabOrder = 12
end
end end
object OpenPictureDialog1: TOpenPictureDialog object OpenPictureDialog1: TOpenPictureDialog
left = 8 left = 385
top = 392 top = 190
end end
object SavePictureDialog1: TSavePictureDialog object SavePictureDialog1: TSavePictureDialog
left = 37 left = 385
top = 392 top = 249
end end
end end

15
ide/frames/project_application_options.pas
View File

@ -7,8 +7,8 @@ interface
uses uses
Classes, SysUtils, LCLProc, FileUtil, Forms, Controls, Graphics, Dialogs, Classes, SysUtils, LCLProc, FileUtil, Forms, Controls, Graphics, Dialogs,
ExtCtrls, StdCtrls, Buttons, ComCtrls, ExtDlgs, Math, LCLType, IDEOptionsIntf, ExtCtrls, StdCtrls, Buttons, ComCtrls, ExtDlgs, Math, LCLType, IDEOptionsIntf,
LazIDEIntf, IDEDialogs, Project, LazarusIDEStrConsts, EnvironmentOpts, LazIDEIntf, IDEDialogs, DividerBevel, Project, LazarusIDEStrConsts,
ApplicationBundle, ProjectIcon, W32Manifest, CompilerOptions; EnvironmentOpts, ApplicationBundle, ProjectIcon, W32Manifest, CompilerOptions;
type type
@ -16,12 +16,14 @@ type
TProjectApplicationOptionsFrame = class(TAbstractIDEOptionsEditor) TProjectApplicationOptionsFrame = class(TAbstractIDEOptionsEditor)
AppSettingsGroupBox: TGroupBox; AppSettingsGroupBox: TGroupBox;
CreateAppBundleButton: TBitBtn;
DefaultIconButton: TButton; DefaultIconButton: TButton;
WindowsDividerBevel: TDividerBevel;
DarwinDividerBevel: TDividerBevel;
UIAccessCheckBox: TCheckBox; UIAccessCheckBox: TCheckBox;
ExecutionLevelComboBox: TComboBox; ExecutionLevelComboBox: TComboBox;
DpiAwareCheckBox: TCheckBox; DpiAwareCheckBox: TCheckBox;
ClearIconButton: TBitBtn; ClearIconButton: TBitBtn;
CreateAppBundleButton: TBitBtn;
IconImage: TImage; IconImage: TImage;
IconLabel: TLabel; IconLabel: TLabel;
IconPanel: TPanel; IconPanel: TPanel;
@ -215,7 +217,8 @@ begin
UseAppBundleCheckBox.Caption := dlgPOUseAppBundle; UseAppBundleCheckBox.Caption := dlgPOUseAppBundle;
UseAppBundleCheckBox.Checked := False; UseAppBundleCheckBox.Checked := False;
// manifest // Windows specific, Manifest
WindowsDividerBevel.Caption := lisForWindows;
UseXPManifestCheckBox.Caption := dlgPOUseManifest; UseXPManifestCheckBox.Caption := dlgPOUseManifest;
DpiAwareCheckBox.Caption := dlgPODpiAware; DpiAwareCheckBox.Caption := dlgPODpiAware;
ExecutionLevelLabel.Caption := dlgPOExecutionLevel; ExecutionLevelLabel.Caption := dlgPOExecutionLevel;
@ -223,10 +226,12 @@ begin
ExecutionLevelComboBox.Items.Add(ExecutionLevelToCaption[ExecutionLevel]^); ExecutionLevelComboBox.Items.Add(ExecutionLevelToCaption[ExecutionLevel]^);
UIAccessCheckBox.Caption := dlgPOUIAccess; UIAccessCheckBox.Caption := dlgPOUIAccess;
// Darwin specific, Application Bundle
DarwinDividerBevel.Caption := lisForDarwin;
CreateAppBundleButton.Caption := dlgPOCreateAppBundle; CreateAppBundleButton.Caption := dlgPOCreateAppBundle;
CreateAppBundleButton.LoadGlyphFromResourceName(HInstance, 'pkg_compile'); CreateAppBundleButton.LoadGlyphFromResourceName(HInstance, 'pkg_compile');
// icon // Icon
IconLabel.Caption := dlgPOIcon; IconLabel.Caption := dlgPOIcon;
LoadIconButton.Caption := dlgPOLoadIcon; LoadIconButton.Caption := dlgPOLoadIcon;
DefaultIconButton.Caption := dlgPODefaultIcon; DefaultIconButton.Caption := dlgPODefaultIcon;

6
ide/lazarusidestrconsts.pas
View File

@ -2374,9 +2374,11 @@ resourcestring
lisTheOtherSourcesContainsADirectoryWhichIsAlreadyInT = 'The "Other sources" ' lisTheOtherSourcesContainsADirectoryWhichIsAlreadyInT = 'The "Other sources" '
+'contains a directory which is already in the "Other unit files".%s%s'; +'contains a directory which is already in the "Other unit files".%s%s';
lisRemoveThePathsFromOtherSources = 'Remove the paths from "Other sources"'; lisRemoveThePathsFromOtherSources = 'Remove the paths from "Other sources"';
dlgPOUseAppBundle = 'Use Application Bundle for running and debugging (Darwin only)'; lisForWindows = 'For Windows';
lisForDarwin = 'For Darwin';
dlgPOUseAppBundle = 'Use Application Bundle for running and debugging';
dlgPOCreateAppBundle = 'Create Application Bundle'; dlgPOCreateAppBundle = 'Create Application Bundle';
dlgPOUseManifest = 'Use manifest file to enable themes (Windows only)'; dlgPOUseManifest = 'Use manifest file to enable themes';
dlgPODpiAware = 'Enabled DPI Awareness (for Vista+)'; dlgPODpiAware = 'Enabled DPI Awareness (for Vista+)';
dlgPOUIAccess = 'UI Access (uiAccess)'; dlgPOUIAccess = 'UI Access (uiAccess)';
dlgPOAsInvoker = 'as invoker (asInvoker)'; dlgPOAsInvoker = 'as invoker (asInvoker)';

4
languages/lazaruside.fi.po
View File

@ -2728,11 +2728,11 @@ msgstr ""
#: lazarusidestrconsts.dlgpouseappbundle #: lazarusidestrconsts.dlgpouseappbundle
msgid "Use Application Bundle for running and debugging (Darwin only)" msgid "Use Application Bundle for running and debugging (Darwin only)"
msgstr "Käytä \"Application Bundle\" ajoon ja virheiden jäljitykseen (Darwin)" msgstr "Käytä \"Application Bundle\" ajoon ja virheiden jäljitykseen"
#: lazarusidestrconsts.dlgpousemanifest #: lazarusidestrconsts.dlgpousemanifest
msgid "Use manifest file to enable themes (Windows only)" msgid "Use manifest file to enable themes (Windows only)"
msgstr "Käytä manifest-tiedostoa teemoja varten (vain Windows)" msgstr "Käytä manifest-tiedostoa teemoja varten"
#: lazarusidestrconsts.dlgpreferdoubleclickoversingleclick #: lazarusidestrconsts.dlgpreferdoubleclickoversingleclick
msgid "Prefer double-click over single-click" msgid "Prefer double-click over single-click"