mirror of
				https://gitlab.com/freepascal.org/lazarus/lazarus.git
				synced 2025-10-30 18:01:53 +01:00 
			
		
		
		
	Package editor: Replace AddMore button with a popup menu. Step 1. to improve the GUI. Issue #28097, (modified) patch from Alexey Torgashin.
git-svn-id: trunk@49046 -
This commit is contained in:
		
							parent
							
								
									ed5a6cac42
								
							
						
					
					
						commit
						9bbdc4fec0
					
				| @ -4373,14 +4373,14 @@ resourcestring | |||||||
|   lisPckEditCompilerOptionsForPackage = 'Compiler Options for Package %s'; |   lisPckEditCompilerOptionsForPackage = 'Compiler Options for Package %s'; | ||||||
|   lisPckEditSavePackage = 'Save Package'; |   lisPckEditSavePackage = 'Save Package'; | ||||||
|   lisPckEditCompilePackage = 'Compile package'; |   lisPckEditCompilePackage = 'Compile package'; | ||||||
|   lisPckEditAddFiles = 'Add files from the file system'; |   lisPckEditAddFilesFromFileSystem = 'Add Files from File System'; | ||||||
|   lisPckEditAddOtherItems = 'Add other items'; |   lisPckEditAddOtherItems = 'Add other items'; | ||||||
|   lisPckEditRemoveSelectedItem = 'Remove selected item'; |   lisPckEditRemoveSelectedItem = 'Remove selected item'; | ||||||
|   lisPckEditInstallPackageInTheIDE = 'Install package in the IDE'; |  | ||||||
|   lisUseSub = 'Use >>'; |   lisUseSub = 'Use >>'; | ||||||
|   lisClickToSeeThePossibleUses = 'Click to see the possible uses'; |   lisAddSub = 'Add >>'; | ||||||
|   lisPckEditEditGeneralOptions = 'Edit General Options'; |   lisClickToSeeTheChoices = 'Click to see the choices'; | ||||||
|   lisPkgEdThereAreMoreFunctionsInThePopupmenu = 'There are more functions in the popupmenu'; |   lisPckEditEditGeneralOptions = 'Edit general options'; | ||||||
|  |   lisPkgEdMoreFunctionsForThePackage = 'More functions for the package'; | ||||||
|   lisPckEditRequiredPackages = 'Required Packages'; |   lisPckEditRequiredPackages = 'Required Packages'; | ||||||
|   lisPckEditFileProperties = 'File Properties'; |   lisPckEditFileProperties = 'File Properties'; | ||||||
|   lisPckEditRegisterUnit = 'Register unit'; |   lisPckEditRegisterUnit = 'Register unit'; | ||||||
|  | |||||||
| @ -9,7 +9,7 @@ object ProjectInspectorForm: TProjectInspectorForm | |||||||
|   ClientHeight = 456 |   ClientHeight = 456 | ||||||
|   ClientWidth = 299 |   ClientWidth = 299 | ||||||
|   OnDropFiles = FormDropFiles |   OnDropFiles = FormDropFiles | ||||||
|   LCLVersion = '1.3' |   LCLVersion = '1.5' | ||||||
|   object ItemsTreeView: TTreeView |   object ItemsTreeView: TTreeView | ||||||
|     Left = 0 |     Left = 0 | ||||||
|     Height = 378 |     Height = 378 | ||||||
| @ -18,7 +18,6 @@ object ProjectInspectorForm: TProjectInspectorForm | |||||||
|     Align = alClient |     Align = alClient | ||||||
|     Anchors = [akTop, akLeft, akBottom] |     Anchors = [akTop, akLeft, akBottom] | ||||||
|     BorderSpacing.Top = 2 |     BorderSpacing.Top = 2 | ||||||
|     DefaultItemHeight = 18 |  | ||||||
|     DragMode = dmAutomatic |     DragMode = dmAutomatic | ||||||
|     MultiSelect = True |     MultiSelect = True | ||||||
|     PopupMenu = ItemsPopupMenu |     PopupMenu = ItemsPopupMenu | ||||||
|  | |||||||
| @ -937,12 +937,12 @@ begin | |||||||
|   ToolBar.Images            := IDEImages.Images_16; |   ToolBar.Images            := IDEImages.Images_16; | ||||||
|   FilterEdit.OnGetImageIndex:=@OnTreeViewGetImageIndex; |   FilterEdit.OnGetImageIndex:=@OnTreeViewGetImageIndex; | ||||||
| 
 | 
 | ||||||
|   AddBitBtn     := CreateToolButton('AddBitBtn', lisAdd, lisPckEditAddFiles, 'laz_add', @AddBitBtnClick); |   AddBitBtn     := CreateToolButton('AddBitBtn', lisAdd, lisPckEditAddFilesFromFileSystem, 'laz_add', @AddBitBtnClick); | ||||||
|   AddMoreBitBtn := CreateToolButton('AddMoreBitBtn', lisDlgAdd, lisPckEditAddOtherItems, 'laz_addmore', @AddMoreBitBtnClick); |   AddMoreBitBtn := CreateToolButton('AddMoreBitBtn', lisDlgAdd, lisPckEditAddOtherItems, 'laz_addmore', @AddMoreBitBtnClick); | ||||||
|   RemoveBitBtn  := CreateToolButton('RemoveBitBtn', lisRemove, lisPckEditRemoveSelectedItem, 'laz_delete', @RemoveBitBtnClick); |   RemoveBitBtn  := CreateToolButton('RemoveBitBtn', lisRemove, lisPckEditRemoveSelectedItem, 'laz_delete', @RemoveBitBtnClick); | ||||||
|   CreateDivider; |   CreateDivider; | ||||||
|   OptionsBitBtn := CreateToolButton('OptionsBitBtn', lisOptions, lisPckEditEditGeneralOptions, 'menu_environment_options', @OptionsBitBtnClick); |   OptionsBitBtn := CreateToolButton('OptionsBitBtn', lisOptions, lisPckEditEditGeneralOptions, 'menu_environment_options', @OptionsBitBtnClick); | ||||||
|   HelpBitBtn    := CreateToolButton('HelpBitBtn', GetButtonCaption(idButtonHelp), lisPkgEdThereAreMoreFunctionsInThePopupmenu, 'menu_help', @HelpBitBtnClick); |   HelpBitBtn    := CreateToolButton('HelpBitBtn', GetButtonCaption(idButtonHelp), lisPkgEdMoreFunctionsForThePackage, 'menu_help', @HelpBitBtnClick); | ||||||
| 
 | 
 | ||||||
|   OpenButton.LoadGlyphFromResourceName(HInstance, 'laz_open'); |   OpenButton.LoadGlyphFromResourceName(HInstance, 'laz_open'); | ||||||
|   OpenButton.Caption:=''; |   OpenButton.Caption:=''; | ||||||
|  | |||||||
| @ -1,11 +1,12 @@ | |||||||
| object AddToPackageDlg: TAddToPackageDlg | object AddToPackageDlg: TAddToPackageDlg | ||||||
|   Left = 413 |   Left = 413 | ||||||
|   Height = 322 |   Height = 357 | ||||||
|   Top = 604 |   Top = 535 | ||||||
|   Width = 658 |   Width = 658 | ||||||
|   ActiveControl = PageControl1 |   ActiveControl = PageControl1 | ||||||
|  |   BorderIcons = [biSystemMenu, biMaximize] | ||||||
|   Caption = 'Add to package' |   Caption = 'Add to package' | ||||||
|   ClientHeight = 322 |   ClientHeight = 357 | ||||||
|   ClientWidth = 658 |   ClientWidth = 658 | ||||||
|   KeyPreview = True |   KeyPreview = True | ||||||
|   OnClose = AddToPackageDlgClose |   OnClose = AddToPackageDlgClose | ||||||
| @ -13,10 +14,10 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|   OnDestroy = FormDestroy |   OnDestroy = FormDestroy | ||||||
|   OnKeyDown = AddToPackageDlgKeyDown |   OnKeyDown = AddToPackageDlgKeyDown | ||||||
|   Position = poScreenCenter |   Position = poScreenCenter | ||||||
|   LCLVersion = '1.3' |   LCLVersion = '1.5' | ||||||
|   object PageControl1: TPageControl |   object PageControl1: TPageControl | ||||||
|     Left = 0 |     Left = 0 | ||||||
|     Height = 282 |     Height = 319 | ||||||
|     Top = 0 |     Top = 0 | ||||||
|     Width = 658 |     Width = 658 | ||||||
|     ActivePage = NewFilePage |     ActivePage = NewFilePage | ||||||
| @ -26,16 +27,17 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|     OnChange = PageControl1Change |     OnChange = PageControl1Change | ||||||
|     object NewFilePage: TTabSheet |     object NewFilePage: TTabSheet | ||||||
|       Caption = 'New File' |       Caption = 'New File' | ||||||
|       ClientHeight = 249 |       ClientHeight = 291 | ||||||
|       ClientWidth = 654 |       ClientWidth = 650 | ||||||
|       OnResize = NewFilePageResize |       OnResize = NewFilePageResize | ||||||
|       object NewFileTreeView: TTreeView |       object NewFileTreeView: TTreeView | ||||||
|         Left = 0 |         Left = 6 | ||||||
|         Height = 244 |         Height = 279 | ||||||
|         Top = 0 |         Top = 6 | ||||||
|         Width = 249 |         Width = 249 | ||||||
|         Align = alLeft |         Align = alLeft | ||||||
|         BorderSpacing.Bottom = 5 |         BorderSpacing.Around = 6 | ||||||
|  |         DefaultItemHeight = 18 | ||||||
|         ReadOnly = True |         ReadOnly = True | ||||||
|         RightClickSelect = True |         RightClickSelect = True | ||||||
|         TabOrder = 0 |         TabOrder = 0 | ||||||
| @ -46,22 +48,24 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|       end |       end | ||||||
|       object NewFileDescriptionGroupBox: TGroupBox |       object NewFileDescriptionGroupBox: TGroupBox | ||||||
|         AnchorSideLeft.Control = NewFileTreeView |         AnchorSideLeft.Control = NewFileTreeView | ||||||
|         Left = 249 |         Left = 261 | ||||||
|         Height = 244 |         Height = 279 | ||||||
|         Top = 0 |         Top = 6 | ||||||
|         Width = 405 |         Width = 383 | ||||||
|         Align = alClient |         Align = alClient | ||||||
|         BorderSpacing.Bottom = 5 |         BorderSpacing.Around = 6 | ||||||
|         Caption = 'NewFileDescriptionGroupBox' |         Caption = 'NewFileDescriptionGroupBox' | ||||||
|         ClientHeight = 223 |         ClientHeight = 259 | ||||||
|         ClientWidth = 397 |         ClientWidth = 379 | ||||||
|         TabOrder = 1 |         TabOrder = 1 | ||||||
|         object NewFileHelpLabel: TLabel |         object NewFileHelpLabel: TLabel | ||||||
|           Left = 0 |           Left = 4 | ||||||
|           Height = 223 |           Height = 251 | ||||||
|           Top = 0 |           Top = 4 | ||||||
|           Width = 397 |           Width = 371 | ||||||
|           Align = alClient |           Align = alClient | ||||||
|  |           Anchors = [] | ||||||
|  |           BorderSpacing.Around = 4 | ||||||
|           Caption = 'NewFileHelpLabel' |           Caption = 'NewFileHelpLabel' | ||||||
|           ParentColor = False |           ParentColor = False | ||||||
|           WordWrap = True |           WordWrap = True | ||||||
| @ -70,16 +74,16 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|     end |     end | ||||||
|     object NewComponentPage: TTabSheet |     object NewComponentPage: TTabSheet | ||||||
|       Caption = 'New Component' |       Caption = 'New Component' | ||||||
|       ClientHeight = 249 |       ClientHeight = 291 | ||||||
|       ClientWidth = 654 |       ClientWidth = 650 | ||||||
|       OnResize = NewComponentPageResize |       OnResize = NewComponentPageResize | ||||||
|       object AncestorTypeLabel: TLabel |       object AncestorTypeLabel: TLabel | ||||||
|         AnchorSideTop.Control = AncestorComboBox |         AnchorSideTop.Control = AncestorComboBox | ||||||
|         AnchorSideTop.Side = asrCenter |         AnchorSideTop.Side = asrCenter | ||||||
|         Left = 5 |         Left = 5 | ||||||
|         Height = 17 |         Height = 15 | ||||||
|         Top = 12 |         Top = 10 | ||||||
|         Width = 119 |         Width = 101 | ||||||
|         Caption = 'AncestorTypeLabel' |         Caption = 'AncestorTypeLabel' | ||||||
|         ParentColor = False |         ParentColor = False | ||||||
|       end |       end | ||||||
| @ -87,9 +91,9 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|         AnchorSideTop.Control = ClassNameEdit |         AnchorSideTop.Control = ClassNameEdit | ||||||
|         AnchorSideTop.Side = asrCenter |         AnchorSideTop.Side = asrCenter | ||||||
|         Left = 5 |         Left = 5 | ||||||
|         Height = 17 |         Height = 15 | ||||||
|         Top = 45 |         Top = 39 | ||||||
|         Width = 107 |         Width = 87 | ||||||
|         Caption = 'ClassNameLabel' |         Caption = 'ClassNameLabel' | ||||||
|         ParentColor = False |         ParentColor = False | ||||||
|       end |       end | ||||||
| @ -97,9 +101,9 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|         AnchorSideTop.Control = PalettePageCombobox |         AnchorSideTop.Control = PalettePageCombobox | ||||||
|         AnchorSideTop.Side = asrCenter |         AnchorSideTop.Side = asrCenter | ||||||
|         Left = 5 |         Left = 5 | ||||||
|         Height = 17 |         Height = 15 | ||||||
|         Top = 78 |         Top = 68 | ||||||
|         Width = 109 |         Width = 90 | ||||||
|         Caption = 'PalettePageLabel' |         Caption = 'PalettePageLabel' | ||||||
|         ParentColor = False |         ParentColor = False | ||||||
|       end |       end | ||||||
| @ -107,9 +111,9 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|         AnchorSideTop.Control = ComponentUnitFileEdit |         AnchorSideTop.Control = ComponentUnitFileEdit | ||||||
|         AnchorSideTop.Side = asrCenter |         AnchorSideTop.Side = asrCenter | ||||||
|         Left = 5 |         Left = 5 | ||||||
|         Height = 17 |         Height = 15 | ||||||
|         Top = 111 |         Top = 97 | ||||||
|         Width = 155 |         Width = 132 | ||||||
|         Caption = 'ComponentUnitFileLabel' |         Caption = 'ComponentUnitFileLabel' | ||||||
|         ParentColor = False |         ParentColor = False | ||||||
|       end |       end | ||||||
| @ -117,9 +121,9 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|         AnchorSideTop.Control = ComponentUnitNameEdit |         AnchorSideTop.Control = ComponentUnitNameEdit | ||||||
|         AnchorSideTop.Side = asrCenter |         AnchorSideTop.Side = asrCenter | ||||||
|         Left = 5 |         Left = 5 | ||||||
|         Height = 17 |         Height = 15 | ||||||
|         Top = 142 |         Top = 126 | ||||||
|         Width = 174 |         Width = 146 | ||||||
|         Caption = 'ComponentUnitNameLabel' |         Caption = 'ComponentUnitNameLabel' | ||||||
|         ParentColor = False |         ParentColor = False | ||||||
|       end |       end | ||||||
| @ -127,11 +131,11 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|         AnchorSideLeft.Side = asrBottom |         AnchorSideLeft.Side = asrBottom | ||||||
|         AnchorSideTop.Control = NewComponentPage |         AnchorSideTop.Control = NewComponentPage | ||||||
|         Left = 184 |         Left = 184 | ||||||
|         Height = 29 |         Height = 23 | ||||||
|         Top = 6 |         Top = 6 | ||||||
|         Width = 200 |         Width = 200 | ||||||
|         BorderSpacing.Top = 6 |         BorderSpacing.Top = 6 | ||||||
|         ItemHeight = 0 |         ItemHeight = 15 | ||||||
|         OnChange = AncestorComboBoxChange |         OnChange = AncestorComboBoxChange | ||||||
|         OnCloseUp = AncestorComboBoxCloseUp |         OnCloseUp = AncestorComboBoxCloseUp | ||||||
|         TabOrder = 0 |         TabOrder = 0 | ||||||
| @ -142,10 +146,11 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|         AnchorSideLeft.Side = asrBottom |         AnchorSideLeft.Side = asrBottom | ||||||
|         AnchorSideTop.Control = AncestorComboBox |         AnchorSideTop.Control = AncestorComboBox | ||||||
|         AnchorSideTop.Side = asrCenter |         AnchorSideTop.Side = asrCenter | ||||||
|         Left = 384 |         Left = 390 | ||||||
|         Height = 22 |         Height = 19 | ||||||
|         Top = 9 |         Top = 8 | ||||||
|         Width = 196 |         Width = 162 | ||||||
|  |         BorderSpacing.Left = 6 | ||||||
|         Caption = 'AncestorShowAllCheckBox' |         Caption = 'AncestorShowAllCheckBox' | ||||||
|         Checked = True |         Checked = True | ||||||
|         OnClick = AncestorShowAllCheckBoxClick |         OnClick = AncestorShowAllCheckBoxClick | ||||||
| @ -159,8 +164,8 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|         AnchorSideRight.Control = AncestorComboBox |         AnchorSideRight.Control = AncestorComboBox | ||||||
|         AnchorSideRight.Side = asrBottom |         AnchorSideRight.Side = asrBottom | ||||||
|         Left = 184 |         Left = 184 | ||||||
|         Height = 25 |         Height = 23 | ||||||
|         Top = 41 |         Top = 35 | ||||||
|         Width = 200 |         Width = 200 | ||||||
|         Anchors = [akTop, akLeft, akRight] |         Anchors = [akTop, akLeft, akRight] | ||||||
|         BorderSpacing.Top = 6 |         BorderSpacing.Top = 6 | ||||||
| @ -175,11 +180,11 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|         AnchorSideRight.Control = AncestorComboBox |         AnchorSideRight.Control = AncestorComboBox | ||||||
|         AnchorSideRight.Side = asrBottom |         AnchorSideRight.Side = asrBottom | ||||||
|         Left = 184 |         Left = 184 | ||||||
|         Height = 29 |         Height = 23 | ||||||
|         Top = 72 |         Top = 64 | ||||||
|         Width = 200 |         Width = 200 | ||||||
|         BorderSpacing.Top = 6 |         BorderSpacing.Top = 6 | ||||||
|         ItemHeight = 0 |         ItemHeight = 15 | ||||||
|         TabOrder = 3 |         TabOrder = 3 | ||||||
|         Text = 'PalettePageCombobox' |         Text = 'PalettePageCombobox' | ||||||
|       end |       end | ||||||
| @ -189,9 +194,9 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|         AnchorSideTop.Side = asrBottom |         AnchorSideTop.Side = asrBottom | ||||||
|         AnchorSideRight.Control = ComponentUnitFileBrowseButton |         AnchorSideRight.Control = ComponentUnitFileBrowseButton | ||||||
|         Left = 184 |         Left = 184 | ||||||
|         Height = 25 |         Height = 23 | ||||||
|         Top = 107 |         Top = 93 | ||||||
|         Width = 408 |         Width = 383 | ||||||
|         Anchors = [akTop, akLeft, akRight] |         Anchors = [akTop, akLeft, akRight] | ||||||
|         BorderSpacing.Top = 6 |         BorderSpacing.Top = 6 | ||||||
|         TabOrder = 4 |         TabOrder = 4 | ||||||
| @ -202,11 +207,11 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|         AnchorSideTop.Control = ComponentUnitFileEdit |         AnchorSideTop.Control = ComponentUnitFileEdit | ||||||
|         AnchorSideTop.Side = asrCenter |         AnchorSideTop.Side = asrCenter | ||||||
|         AnchorSideRight.Control = ComponentUnitFileShortenButton |         AnchorSideRight.Control = ComponentUnitFileShortenButton | ||||||
|         Left = 592 |         Left = 567 | ||||||
|         Height = 27 |         Height = 25 | ||||||
|         Hint = 'Save file dialog' |         Hint = 'Save file dialog' | ||||||
|         Top = 106 |         Top = 92 | ||||||
|         Width = 26 |         Width = 35 | ||||||
|         Anchors = [akTop, akRight] |         Anchors = [akTop, akRight] | ||||||
|         AutoSize = True |         AutoSize = True | ||||||
|         Caption = '...' |         Caption = '...' | ||||||
| @ -221,13 +226,14 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|         AnchorSideTop.Side = asrCenter |         AnchorSideTop.Side = asrCenter | ||||||
|         AnchorSideRight.Control = NewComponentPage |         AnchorSideRight.Control = NewComponentPage | ||||||
|         AnchorSideRight.Side = asrBottom |         AnchorSideRight.Side = asrBottom | ||||||
|         Left = 618 |         Left = 602 | ||||||
|         Height = 27 |         Height = 25 | ||||||
|         Hint = 'Shorten or expand filename' |         Hint = 'Shorten or expand filename' | ||||||
|         Top = 106 |         Top = 92 | ||||||
|         Width = 36 |         Width = 42 | ||||||
|         Anchors = [akTop, akRight] |         Anchors = [akTop, akRight] | ||||||
|         AutoSize = True |         AutoSize = True | ||||||
|  |         BorderSpacing.Right = 6 | ||||||
|         Caption = '<>' |         Caption = '<>' | ||||||
|         OnClick = ComponentUnitFileShortenButtonClick |         OnClick = ComponentUnitFileShortenButtonClick | ||||||
|         ParentShowHint = False |         ParentShowHint = False | ||||||
| @ -241,8 +247,8 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|         AnchorSideRight.Control = AncestorComboBox |         AnchorSideRight.Control = AncestorComboBox | ||||||
|         AnchorSideRight.Side = asrBottom |         AnchorSideRight.Side = asrBottom | ||||||
|         Left = 184 |         Left = 184 | ||||||
|         Height = 25 |         Height = 23 | ||||||
|         Top = 138 |         Top = 122 | ||||||
|         Width = 200 |         Width = 200 | ||||||
|         Anchors = [akTop, akLeft, akRight] |         Anchors = [akTop, akLeft, akRight] | ||||||
|         BorderSpacing.Top = 6 |         BorderSpacing.Top = 6 | ||||||
| @ -255,9 +261,9 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|         AnchorSideTop.Control = ComponentIconSpeedButton |         AnchorSideTop.Control = ComponentIconSpeedButton | ||||||
|         AnchorSideTop.Side = asrCenter |         AnchorSideTop.Side = asrCenter | ||||||
|         Left = 5 |         Left = 5 | ||||||
|         Height = 17 |         Height = 15 | ||||||
|         Top = 174 |         Top = 157 | ||||||
|         Width = 135 |         Width = 115 | ||||||
|         Caption = 'ComponentIconLabel' |         Caption = 'ComponentIconLabel' | ||||||
|         ParentColor = False |         ParentColor = False | ||||||
|       end |       end | ||||||
| @ -267,7 +273,7 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|         AnchorSideTop.Side = asrBottom |         AnchorSideTop.Side = asrBottom | ||||||
|         Left = 184 |         Left = 184 | ||||||
|         Height = 26 |         Height = 26 | ||||||
|         Top = 169 |         Top = 151 | ||||||
|         Width = 28 |         Width = 28 | ||||||
|         BorderSpacing.Top = 6 |         BorderSpacing.Top = 6 | ||||||
|         OnClick = ComponentIconSpeedButtonClick |         OnClick = ComponentIconSpeedButtonClick | ||||||
| @ -277,13 +283,13 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|     end |     end | ||||||
|     object NewRequirementPage: TTabSheet |     object NewRequirementPage: TTabSheet | ||||||
|       Caption = 'New Requirement' |       Caption = 'New Requirement' | ||||||
|       ClientHeight = 249 |       ClientHeight = 291 | ||||||
|       ClientWidth = 654 |       ClientWidth = 650 | ||||||
|       object NewDepPanel: TPanel |       object NewDepPanel: TPanel | ||||||
|         Left = 0 |         Left = 0 | ||||||
|         Height = 249 |         Height = 291 | ||||||
|         Top = 0 |         Top = 0 | ||||||
|         Width = 654 |         Width = 650 | ||||||
|         Align = alClient |         Align = alClient | ||||||
|         BevelOuter = bvNone |         BevelOuter = bvNone | ||||||
|         ChildSizing.LeftRightSpacing = 6 |         ChildSizing.LeftRightSpacing = 6 | ||||||
| @ -292,14 +298,14 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|         ChildSizing.VerticalSpacing = 6 |         ChildSizing.VerticalSpacing = 6 | ||||||
|         ChildSizing.Layout = cclLeftToRightThenTopToBottom |         ChildSizing.Layout = cclLeftToRightThenTopToBottom | ||||||
|         ChildSizing.ControlsPerLine = 2 |         ChildSizing.ControlsPerLine = 2 | ||||||
|         ClientHeight = 249 |         ClientHeight = 291 | ||||||
|         ClientWidth = 654 |         ClientWidth = 650 | ||||||
|         TabOrder = 0 |         TabOrder = 0 | ||||||
|         object DependPkgNameLabel: TLabel |         object DependPkgNameLabel: TLabel | ||||||
|           Left = 6 |           Left = 6 | ||||||
|           Height = 17 |           Height = 15 | ||||||
|           Top = 12 |           Top = 10 | ||||||
|           Width = 146 |           Width = 121 | ||||||
|           BorderSpacing.CellAlignHorizontal = ccaLeftTop |           BorderSpacing.CellAlignHorizontal = ccaLeftTop | ||||||
|           BorderSpacing.CellAlignVertical = ccaCenter |           BorderSpacing.CellAlignVertical = ccaCenter | ||||||
|           Caption = 'DependPkgNameLabel' |           Caption = 'DependPkgNameLabel' | ||||||
| @ -307,23 +313,23 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|         end |         end | ||||||
|         object DependPkgNameComboBox: TComboBox |         object DependPkgNameComboBox: TComboBox | ||||||
|           AnchorSideLeft.Side = asrBottom |           AnchorSideLeft.Side = asrBottom | ||||||
|           Left = 169 |           Left = 142 | ||||||
|           Height = 29 |           Height = 23 | ||||||
|           Top = 6 |           Top = 6 | ||||||
|           Width = 200 |           Width = 200 | ||||||
|           AutoComplete = True |           AutoComplete = True | ||||||
|           AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactSearchAscending] |           AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactSearchAscending] | ||||||
|           Constraints.MinWidth = 200 |           Constraints.MinWidth = 200 | ||||||
|           ItemHeight = 0 |           ItemHeight = 15 | ||||||
|           OnChange = DependPkgNameComboBoxChange |           OnChange = DependPkgNameComboBoxChange | ||||||
|           TabOrder = 0 |           TabOrder = 0 | ||||||
|           Text = 'DependPkgNameComboBox' |           Text = 'DependPkgNameComboBox' | ||||||
|         end |         end | ||||||
|         object DependMinVersionLabel: TLabel |         object DependMinVersionLabel: TLabel | ||||||
|           Left = 6 |           Left = 6 | ||||||
|           Height = 17 |           Height = 15 | ||||||
|           Top = 45 |           Top = 39 | ||||||
|           Width = 153 |           Width = 129 | ||||||
|           BorderSpacing.CellAlignHorizontal = ccaLeftTop |           BorderSpacing.CellAlignHorizontal = ccaLeftTop | ||||||
|           BorderSpacing.CellAlignVertical = ccaCenter |           BorderSpacing.CellAlignVertical = ccaCenter | ||||||
|           Caption = 'DependMinVersionLabel' |           Caption = 'DependMinVersionLabel' | ||||||
| @ -331,9 +337,9 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|         end |         end | ||||||
|         object DependMinVersionEdit: TEdit |         object DependMinVersionEdit: TEdit | ||||||
|           AnchorSideLeft.Side = asrBottom |           AnchorSideLeft.Side = asrBottom | ||||||
|           Left = 169 |           Left = 142 | ||||||
|           Height = 25 |           Height = 23 | ||||||
|           Top = 41 |           Top = 35 | ||||||
|           Width = 200 |           Width = 200 | ||||||
|           BorderSpacing.Top = 6 |           BorderSpacing.Top = 6 | ||||||
|           TabOrder = 1 |           TabOrder = 1 | ||||||
| @ -341,9 +347,9 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|         end |         end | ||||||
|         object DependMaxVersionLabel: TLabel |         object DependMaxVersionLabel: TLabel | ||||||
|           Left = 6 |           Left = 6 | ||||||
|           Height = 17 |           Height = 15 | ||||||
|           Top = 76 |           Top = 68 | ||||||
|           Width = 157 |           Width = 130 | ||||||
|           BorderSpacing.CellAlignHorizontal = ccaLeftTop |           BorderSpacing.CellAlignHorizontal = ccaLeftTop | ||||||
|           BorderSpacing.CellAlignVertical = ccaCenter |           BorderSpacing.CellAlignVertical = ccaCenter | ||||||
|           Caption = 'DependMaxVersionLabel' |           Caption = 'DependMaxVersionLabel' | ||||||
| @ -351,9 +357,9 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|         end |         end | ||||||
|         object DependMaxVersionEdit: TEdit |         object DependMaxVersionEdit: TEdit | ||||||
|           AnchorSideLeft.Side = asrBottom |           AnchorSideLeft.Side = asrBottom | ||||||
|           Left = 169 |           Left = 142 | ||||||
|           Height = 25 |           Height = 23 | ||||||
|           Top = 72 |           Top = 64 | ||||||
|           Width = 200 |           Width = 200 | ||||||
|           BorderSpacing.Top = 6 |           BorderSpacing.Top = 6 | ||||||
|           TabOrder = 2 |           TabOrder = 2 | ||||||
| @ -363,15 +369,15 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|     end |     end | ||||||
|     object AddFilesPage: TTabSheet |     object AddFilesPage: TTabSheet | ||||||
|       Caption = 'Add Files' |       Caption = 'Add Files' | ||||||
|       ClientHeight = 249 |       ClientHeight = 291 | ||||||
|       ClientWidth = 654 |       ClientWidth = 650 | ||||||
|       object FilesListView: TListView |       object FilesListView: TListView | ||||||
|         Left = 0 |         Left = 6 | ||||||
|         Height = 204 |         Height = 242 | ||||||
|         Top = 0 |         Top = 6 | ||||||
|         Width = 654 |         Width = 638 | ||||||
|         Align = alClient |         Align = alClient | ||||||
|         BorderSpacing.Bottom = 5 |         BorderSpacing.Around = 6 | ||||||
|         Columns = <         |         Columns = <         | ||||||
|           item |           item | ||||||
|             Caption = 'Filename' |             Caption = 'Filename' | ||||||
| @ -389,18 +395,18 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|       end |       end | ||||||
|       object AddFilesBtnPanel: TPanel |       object AddFilesBtnPanel: TPanel | ||||||
|         Left = 0 |         Left = 0 | ||||||
|         Height = 39 |         Height = 37 | ||||||
|         Top = 218 |         Top = 254 | ||||||
|         Width = 654 |         Width = 650 | ||||||
|         Align = alBottom |         Align = alBottom | ||||||
|         AutoSize = True |         AutoSize = True | ||||||
|         BevelOuter = bvNone |         BevelOuter = bvNone | ||||||
|         ClientHeight = 39 |         ClientHeight = 37 | ||||||
|         ClientWidth = 654 |         ClientWidth = 650 | ||||||
|         TabOrder = 1 |         TabOrder = 1 | ||||||
|         object FilesShortenButton: TBitBtn |         object FilesShortenButton: TBitBtn | ||||||
|           Left = 108 |           Left = 112 | ||||||
|           Height = 27 |           Height = 25 | ||||||
|           Top = 6 |           Top = 6 | ||||||
|           Width = 126 |           Width = 126 | ||||||
|           Align = alLeft |           Align = alLeft | ||||||
| @ -411,8 +417,8 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|           TabOrder = 0 |           TabOrder = 0 | ||||||
|         end |         end | ||||||
|         object FilesDeleteButton: TBitBtn |         object FilesDeleteButton: TBitBtn | ||||||
|           Left = 240 |           Left = 244 | ||||||
|           Height = 27 |           Height = 25 | ||||||
|           Top = 6 |           Top = 6 | ||||||
|           Width = 118 |           Width = 118 | ||||||
|           Align = alLeft |           Align = alLeft | ||||||
| @ -424,9 +430,9 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|         end |         end | ||||||
|         object FilesDirButton: TBitBtn |         object FilesDirButton: TBitBtn | ||||||
|           Left = 6 |           Left = 6 | ||||||
|           Height = 27 |           Height = 25 | ||||||
|           Top = 6 |           Top = 6 | ||||||
|           Width = 96 |           Width = 100 | ||||||
|           Align = alLeft |           Align = alLeft | ||||||
|           AutoSize = True |           AutoSize = True | ||||||
|           BorderSpacing.Around = 6 |           BorderSpacing.Around = 6 | ||||||
| @ -439,20 +445,20 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|   end |   end | ||||||
|   object NewFileBtnPanel: TPanel |   object NewFileBtnPanel: TPanel | ||||||
|     Left = 0 |     Left = 0 | ||||||
|     Height = 40 |     Height = 38 | ||||||
|     Top = 282 |     Top = 319 | ||||||
|     Width = 658 |     Width = 658 | ||||||
|     Align = alBottom |     Align = alBottom | ||||||
|     AutoSize = True |     AutoSize = True | ||||||
|     BevelOuter = bvNone |     BevelOuter = bvNone | ||||||
|     ClientHeight = 40 |     ClientHeight = 38 | ||||||
|     ClientWidth = 658 |     ClientWidth = 658 | ||||||
|     TabOrder = 1 |     TabOrder = 1 | ||||||
|     object OkButton: TBitBtn |     object OkButton: TBitBtn | ||||||
|       Left = 416 |       Left = 431 | ||||||
|       Height = 28 |       Height = 26 | ||||||
|       Top = 6 |       Top = 6 | ||||||
|       Width = 102 |       Width = 97 | ||||||
|       Align = alRight |       Align = alRight | ||||||
|       AutoSize = True |       AutoSize = True | ||||||
|       BorderSpacing.Around = 6 |       BorderSpacing.Around = 6 | ||||||
| @ -499,10 +505,10 @@ object AddToPackageDlg: TAddToPackageDlg | |||||||
|     end |     end | ||||||
|     object CancelButton: TBitBtn |     object CancelButton: TBitBtn | ||||||
|       AnchorSideLeft.Side = asrBottom |       AnchorSideLeft.Side = asrBottom | ||||||
|       Left = 524 |       Left = 534 | ||||||
|       Height = 28 |       Height = 26 | ||||||
|       Top = 6 |       Top = 6 | ||||||
|       Width = 128 |       Width = 118 | ||||||
|       Align = alRight |       Align = alRight | ||||||
|       AutoSize = True |       AutoSize = True | ||||||
|       BorderSpacing.Around = 6 |       BorderSpacing.Around = 6 | ||||||
|  | |||||||
| @ -33,12 +33,10 @@ uses | |||||||
|   Math, Classes, SysUtils, LCLProc, LCLType, Forms, Controls, Buttons, ExtDlgs, |   Math, Classes, SysUtils, LCLProc, LCLType, Forms, Controls, Buttons, ExtDlgs, | ||||||
|   StdCtrls, ExtCtrls, Dialogs, FileUtil, ComCtrls, AVL_Tree, |   StdCtrls, ExtCtrls, Dialogs, FileUtil, ComCtrls, AVL_Tree, | ||||||
|   // IDEIntf |   // IDEIntf | ||||||
|   NewItemIntf, ProjectIntf, PackageIntf, FormEditingIntf, IDEWindowIntf, |   NewItemIntf, ProjectIntf, PackageIntf, FormEditingIntf, IDEWindowIntf, IDEDialogs, | ||||||
|   IDEDialogs, |  | ||||||
|   // IDE |   // IDE | ||||||
|   LazarusIDEStrConsts, InputHistory, CodeToolManager, IDEDefs, |   LazarusIDEStrConsts, InputHistory, IDEDefs, IDEProcs, EnvironmentOpts, | ||||||
|   IDEProcs, EnvironmentOpts, PackageSystem, PackageDefs, ComponentReg, |   PackageSystem, PackageDefs, ComponentReg, AddDirToPkgDlg; | ||||||
|   AddDirToPkgDlg; |  | ||||||
|    |    | ||||||
| type | type | ||||||
|   TAddToPkgType = ( |   TAddToPkgType = ( | ||||||
| @ -223,6 +221,13 @@ begin | |||||||
|   AddDlg.OnGetUnitRegisterInfo:=OnGetUnitRegisterInfo; |   AddDlg.OnGetUnitRegisterInfo:=OnGetUnitRegisterInfo; | ||||||
|   AddDlg.LazPackage:=Pkg; |   AddDlg.LazPackage:=Pkg; | ||||||
|   AddDlg.ActivatePage:=Page; |   AddDlg.ActivatePage:=Page; | ||||||
|  | 
 | ||||||
|  |   //auto press AddFiles if called with "Add files" page | ||||||
|  |   if Page=d2ptFiles then | ||||||
|  |     AddDlg.FilesDirButton.Click; | ||||||
|  |   //hide tabs for simpler use | ||||||
|  |   AddDlg.PageControl1.ShowTabs:=false; | ||||||
|  | 
 | ||||||
|   Result:=AddDlg.ShowModal; |   Result:=AddDlg.ShowModal; | ||||||
|   Page:=AddDlg.ActivatePage; |   Page:=AddDlg.ActivatePage; | ||||||
|   if Result=mrOk then begin |   if Result=mrOk then begin | ||||||
|  | |||||||
| @ -16,7 +16,7 @@ object PackageEditorForm: TPackageEditorForm | |||||||
|   OnDestroy = FormDestroy |   OnDestroy = FormDestroy | ||||||
|   OnDropFiles = FormDropFiles |   OnDropFiles = FormDropFiles | ||||||
|   Position = poScreenCenter |   Position = poScreenCenter | ||||||
|   LCLVersion = '1.3' |   LCLVersion = '1.5' | ||||||
|   object ToolBar: TToolBar |   object ToolBar: TToolBar | ||||||
|     Left = 0 |     Left = 0 | ||||||
|     Height = 48 |     Height = 48 | ||||||
| @ -30,18 +30,18 @@ object PackageEditorForm: TPackageEditorForm | |||||||
|   object PropsGroupBox: TGroupBox |   object PropsGroupBox: TGroupBox | ||||||
|     Left = 0 |     Left = 0 | ||||||
|     Height = 118 |     Height = 118 | ||||||
|     Top = 318 |     Top = 315 | ||||||
|     Width = 464 |     Width = 464 | ||||||
|     Align = alBottom |     Align = alBottom | ||||||
|     Caption = 'PropsGroupBox' |     Caption = 'PropsGroupBox' | ||||||
|     ClientHeight = 101 |     ClientHeight = 97 | ||||||
|     ClientWidth = 460 |     ClientWidth = 460 | ||||||
|     TabOrder = 3 |     TabOrder = 3 | ||||||
|     object CallRegisterProcCheckBox: TCheckBox |     object CallRegisterProcCheckBox: TCheckBox | ||||||
|       Left = 0 |       Left = 0 | ||||||
|       Height = 24 |       Height = 22 | ||||||
|       Top = 0 |       Top = 0 | ||||||
|       Width = 171 |       Width = 174 | ||||||
|       Caption = 'CallRegisterProcCheckBox' |       Caption = 'CallRegisterProcCheckBox' | ||||||
|       OnChange = CallRegisterProcCheckBoxChange |       OnChange = CallRegisterProcCheckBoxChange | ||||||
|       ParentShowHint = False |       ParentShowHint = False | ||||||
| @ -51,10 +51,10 @@ object PackageEditorForm: TPackageEditorForm | |||||||
|     object AddToUsesPkgSectionCheckBox: TCheckBox |     object AddToUsesPkgSectionCheckBox: TCheckBox | ||||||
|       AnchorSideLeft.Control = CallRegisterProcCheckBox |       AnchorSideLeft.Control = CallRegisterProcCheckBox | ||||||
|       AnchorSideLeft.Side = asrBottom |       AnchorSideLeft.Side = asrBottom | ||||||
|       Left = 181 |       Left = 184 | ||||||
|       Height = 24 |       Height = 22 | ||||||
|       Top = 0 |       Top = 0 | ||||||
|       Width = 201 |       Width = 207 | ||||||
|       BorderSpacing.Left = 10 |       BorderSpacing.Left = 10 | ||||||
|       Caption = 'AddToUsesPkgSectionCheckBox' |       Caption = 'AddToUsesPkgSectionCheckBox' | ||||||
|       OnChange = AddToUsesPkgSectionCheckBoxChange |       OnChange = AddToUsesPkgSectionCheckBoxChange | ||||||
| @ -67,9 +67,9 @@ object PackageEditorForm: TPackageEditorForm | |||||||
|       AnchorSideTop.Control = MinVersionEdit |       AnchorSideTop.Control = MinVersionEdit | ||||||
|       AnchorSideTop.Side = asrCenter |       AnchorSideTop.Side = asrCenter | ||||||
|       Left = 0 |       Left = 0 | ||||||
|       Height = 24 |       Height = 22 | ||||||
|       Top = 0 |       Top = 0 | ||||||
|       Width = 161 |       Width = 167 | ||||||
|       Caption = 'UseMinVersionCheckBox' |       Caption = 'UseMinVersionCheckBox' | ||||||
|       OnChange = UseMinVersionCheckBoxChange |       OnChange = UseMinVersionCheckBoxChange | ||||||
|       TabOrder = 2 |       TabOrder = 2 | ||||||
| @ -78,8 +78,8 @@ object PackageEditorForm: TPackageEditorForm | |||||||
|       AnchorSideLeft.Control = UseMinVersionCheckBox |       AnchorSideLeft.Control = UseMinVersionCheckBox | ||||||
|       AnchorSideLeft.Side = asrBottom |       AnchorSideLeft.Side = asrBottom | ||||||
|       AnchorSideTop.Control = PropsGroupBox |       AnchorSideTop.Control = PropsGroupBox | ||||||
|       Left = 171 |       Left = 177 | ||||||
|       Height = 25 |       Height = 23 | ||||||
|       Top = 0 |       Top = 0 | ||||||
|       Width = 100 |       Width = 100 | ||||||
|       BorderSpacing.Left = 10 |       BorderSpacing.Left = 10 | ||||||
| @ -92,9 +92,9 @@ object PackageEditorForm: TPackageEditorForm | |||||||
|       AnchorSideTop.Control = MaxVersionEdit |       AnchorSideTop.Control = MaxVersionEdit | ||||||
|       AnchorSideTop.Side = asrCenter |       AnchorSideTop.Side = asrCenter | ||||||
|       Left = 0 |       Left = 0 | ||||||
|       Height = 24 |       Height = 22 | ||||||
|       Top = 27 |       Top = 25 | ||||||
|       Width = 163 |       Width = 169 | ||||||
|       Caption = 'UseMaxVersionCheckBox' |       Caption = 'UseMaxVersionCheckBox' | ||||||
|       OnChange = UseMaxVersionCheckBoxChange |       OnChange = UseMaxVersionCheckBoxChange | ||||||
|       TabOrder = 4 |       TabOrder = 4 | ||||||
| @ -104,9 +104,9 @@ object PackageEditorForm: TPackageEditorForm | |||||||
|       AnchorSideLeft.Side = asrBottom |       AnchorSideLeft.Side = asrBottom | ||||||
|       AnchorSideTop.Control = MinVersionEdit |       AnchorSideTop.Control = MinVersionEdit | ||||||
|       AnchorSideTop.Side = asrBottom |       AnchorSideTop.Side = asrBottom | ||||||
|       Left = 173 |       Left = 179 | ||||||
|       Height = 25 |       Height = 23 | ||||||
|       Top = 27 |       Top = 25 | ||||||
|       Width = 100 |       Width = 100 | ||||||
|       BorderSpacing.Left = 10 |       BorderSpacing.Left = 10 | ||||||
|       BorderSpacing.Top = 2 |       BorderSpacing.Top = 2 | ||||||
| @ -119,9 +119,9 @@ object PackageEditorForm: TPackageEditorForm | |||||||
|       AnchorSideTop.Control = MaxVersionEdit |       AnchorSideTop.Control = MaxVersionEdit | ||||||
|       AnchorSideTop.Side = asrBottom |       AnchorSideTop.Side = asrBottom | ||||||
|       Left = 0 |       Left = 0 | ||||||
|       Height = 27 |       Height = 29 | ||||||
|       Top = 58 |       Top = 54 | ||||||
|       Width = 152 |       Width = 153 | ||||||
|       AutoSize = True |       AutoSize = True | ||||||
|       BorderSpacing.Top = 6 |       BorderSpacing.Top = 6 | ||||||
|       Caption = 'ApplyDependencyButton' |       Caption = 'ApplyDependencyButton' | ||||||
| @ -132,38 +132,36 @@ object PackageEditorForm: TPackageEditorForm | |||||||
|       AnchorSideTop.Control = CallRegisterProcCheckBox |       AnchorSideTop.Control = CallRegisterProcCheckBox | ||||||
|       AnchorSideTop.Side = asrBottom |       AnchorSideTop.Side = asrBottom | ||||||
|       Left = 0 |       Left = 0 | ||||||
|       Height = 71 |       Height = 69 | ||||||
|       Top = 30 |       Top = 28 | ||||||
|       Width = 460 |       Width = 460 | ||||||
|       Align = alBottom |       Align = alBottom | ||||||
|       Anchors = [akTop, akLeft, akRight, akBottom] |       Anchors = [akTop, akLeft, akRight, akBottom] | ||||||
|       BorderSpacing.Top = 6 |       BorderSpacing.Top = 6 | ||||||
|       Caption = 'RegisteredPluginsGroupBox' |       Caption = 'RegisteredPluginsGroupBox' | ||||||
|       ClientHeight = 54 |       ClientHeight = 48 | ||||||
|       ClientWidth = 456 |       ClientWidth = 456 | ||||||
|       TabOrder = 7 |       TabOrder = 7 | ||||||
|       object RegisteredListBox: TListBox |       object RegisteredListBox: TListBox | ||||||
|         Left = 0 |         Left = 0 | ||||||
|         Height = 54 |         Height = 48 | ||||||
|         Top = 0 |         Top = 0 | ||||||
|         Width = 456 |         Width = 456 | ||||||
|         Align = alClient |         Align = alClient | ||||||
|         ItemHeight = 0 |         ItemHeight = 0 | ||||||
|         OnDrawItem = RegisteredListBoxDrawItem |         OnDrawItem = RegisteredListBoxDrawItem | ||||||
|         ScrollWidth = 454 |  | ||||||
|         Style = lbOwnerDrawFixed |         Style = lbOwnerDrawFixed | ||||||
|         TabOrder = 0 |         TabOrder = 0 | ||||||
|         TopIndex = -1 |  | ||||||
|       end |       end | ||||||
|     end |     end | ||||||
|     object DisableI18NForLFMCheckBox: TCheckBox |     object DisableI18NForLFMCheckBox: TCheckBox | ||||||
|       AnchorSideLeft.Control = AddToUsesPkgSectionCheckBox |       AnchorSideLeft.Control = AddToUsesPkgSectionCheckBox | ||||||
|       AnchorSideLeft.Side = asrBottom |       AnchorSideLeft.Side = asrBottom | ||||||
|       AnchorSideTop.Control = AddToUsesPkgSectionCheckBox |       AnchorSideTop.Control = AddToUsesPkgSectionCheckBox | ||||||
|       Left = 388 |       Left = 397 | ||||||
|       Height = 24 |       Height = 22 | ||||||
|       Top = 0 |       Top = 0 | ||||||
|       Width = 186 |       Width = 192 | ||||||
|       BorderSpacing.Left = 6 |       BorderSpacing.Left = 6 | ||||||
|       Caption = 'DisableI18NForLFMCheckBox' |       Caption = 'DisableI18NForLFMCheckBox' | ||||||
|       OnChange = DisableI18NForLFMCheckBoxChange |       OnChange = DisableI18NForLFMCheckBoxChange | ||||||
| @ -174,8 +172,8 @@ object PackageEditorForm: TPackageEditorForm | |||||||
|   end |   end | ||||||
|   object StatusBar: TStatusBar |   object StatusBar: TStatusBar | ||||||
|     Left = 0 |     Left = 0 | ||||||
|     Height = 19 |     Height = 22 | ||||||
|     Top = 436 |     Top = 433 | ||||||
|     Width = 464 |     Width = 464 | ||||||
|     Panels = <> |     Panels = <> | ||||||
|   end |   end | ||||||
| @ -183,7 +181,7 @@ object PackageEditorForm: TPackageEditorForm | |||||||
|     Cursor = crVSplit |     Cursor = crVSplit | ||||||
|     Left = 0 |     Left = 0 | ||||||
|     Height = 5 |     Height = 5 | ||||||
|     Top = 313 |     Top = 310 | ||||||
|     Width = 464 |     Width = 464 | ||||||
|     Align = alBottom |     Align = alBottom | ||||||
|     ResizeAnchor = akBottom |     ResizeAnchor = akBottom | ||||||
| @ -246,8 +244,8 @@ object PackageEditorForm: TPackageEditorForm | |||||||
|       AnchorSideTop.Side = asrCenter |       AnchorSideTop.Side = asrCenter | ||||||
|       AnchorSideRight.Side = asrBottom |       AnchorSideRight.Side = asrBottom | ||||||
|       Left = 163 |       Left = 163 | ||||||
|       Height = 28 |       Height = 23 | ||||||
|       Top = 0 |       Top = 3 | ||||||
|       Width = 300 |       Width = 300 | ||||||
|       UseFormActivate = True |       UseFormActivate = True | ||||||
|       ButtonWidth = 23 |       ButtonWidth = 23 | ||||||
| @ -316,12 +314,11 @@ object PackageEditorForm: TPackageEditorForm | |||||||
|   end |   end | ||||||
|   object ItemsTreeView: TTreeView |   object ItemsTreeView: TTreeView | ||||||
|     Left = 0 |     Left = 0 | ||||||
|     Height = 236 |     Height = 233 | ||||||
|     Top = 77 |     Top = 77 | ||||||
|     Width = 464 |     Width = 464 | ||||||
|     Align = alClient |     Align = alClient | ||||||
|     BorderSpacing.Top = 1 |     BorderSpacing.Top = 1 | ||||||
|     DefaultItemHeight = 18 |  | ||||||
|     DragMode = dmAutomatic |     DragMode = dmAutomatic | ||||||
|     MultiSelect = True |     MultiSelect = True | ||||||
|     PopupMenu = ItemsPopupMenu |     PopupMenu = ItemsPopupMenu | ||||||
| @ -351,4 +348,32 @@ object PackageEditorForm: TPackageEditorForm | |||||||
|     left = 300 |     left = 300 | ||||||
|     top = 10 |     top = 10 | ||||||
|   end |   end | ||||||
|  |   object AddPopupMenu: TPopupMenu | ||||||
|  |     left = 120 | ||||||
|  |     top = 10 | ||||||
|  |     object mnuAddDiskFile: TMenuItem | ||||||
|  |       Caption = 'Add file...' | ||||||
|  |       Default = True | ||||||
|  |       OnClick = AddBitBtnClick | ||||||
|  |     end | ||||||
|  |     object MenuItem1: TMenuItem | ||||||
|  |       Caption = '-' | ||||||
|  |     end | ||||||
|  |     object mnuAddDiskFiles: TMenuItem | ||||||
|  |       Caption = 'Add multiple files...' | ||||||
|  |       OnClick = mnuAddDiskFilesClick | ||||||
|  |     end | ||||||
|  |     object mnuAddNewFile: TMenuItem | ||||||
|  |       Caption = 'New file of type...' | ||||||
|  |       OnClick = mnuAddNewFileClick | ||||||
|  |     end | ||||||
|  |     object mnuAddNewComp: TMenuItem | ||||||
|  |       Caption = 'New component...' | ||||||
|  |       OnClick = mnuAddNewCompClick | ||||||
|  |     end | ||||||
|  |     object mnuAddNewReqr: TMenuItem | ||||||
|  |       Caption = 'New requirement...' | ||||||
|  |       OnClick = mnuAddNewReqrClick | ||||||
|  |     end | ||||||
|  |   end | ||||||
| end | end | ||||||
|  | |||||||
| @ -176,6 +176,12 @@ type | |||||||
|   { TPackageEditorForm } |   { TPackageEditorForm } | ||||||
| 
 | 
 | ||||||
|   TPackageEditorForm = class(TBasePackageEditor,IFilesEditorInterface) |   TPackageEditorForm = class(TBasePackageEditor,IFilesEditorInterface) | ||||||
|  |     MenuItem1: TMenuItem; | ||||||
|  |     mnuAddDiskFile: TMenuItem; | ||||||
|  |     mnuAddDiskFiles: TMenuItem; | ||||||
|  |     mnuAddNewFile: TMenuItem; | ||||||
|  |     mnuAddNewComp: TMenuItem; | ||||||
|  |     mnuAddNewReqr: TMenuItem; | ||||||
|     MoveDownBtn: TSpeedButton; |     MoveDownBtn: TSpeedButton; | ||||||
|     MoveUpBtn: TSpeedButton; |     MoveUpBtn: TSpeedButton; | ||||||
|     DirectoryHierarchyButton: TSpeedButton; |     DirectoryHierarchyButton: TSpeedButton; | ||||||
| @ -183,6 +189,7 @@ type | |||||||
|     DisableI18NForLFMCheckBox: TCheckBox; |     DisableI18NForLFMCheckBox: TCheckBox; | ||||||
|     FilterEdit: TTreeFilterEdit; |     FilterEdit: TTreeFilterEdit; | ||||||
|     FilterPanel: TPanel; |     FilterPanel: TPanel; | ||||||
|  |     AddPopupMenu: TPopupMenu; | ||||||
|     SortAlphabeticallyButton: TSpeedButton; |     SortAlphabeticallyButton: TSpeedButton; | ||||||
|     Splitter1: TSplitter; |     Splitter1: TSplitter; | ||||||
|     // toolbar |     // toolbar | ||||||
| @ -192,7 +199,6 @@ type | |||||||
|     CompileBitBtn: TToolButton; |     CompileBitBtn: TToolButton; | ||||||
|     UseBitBtn: TToolButton; |     UseBitBtn: TToolButton; | ||||||
|     AddBitBtn: TToolButton; |     AddBitBtn: TToolButton; | ||||||
|     AddMoreBitBtn: TToolButton; |  | ||||||
|     RemoveBitBtn: TToolButton; |     RemoveBitBtn: TToolButton; | ||||||
|     OptionsBitBtn: TToolButton; |     OptionsBitBtn: TToolButton; | ||||||
|     MoreBitBtn: TToolButton; |     MoreBitBtn: TToolButton; | ||||||
| @ -219,7 +225,6 @@ type | |||||||
|     ItemsPopupMenu: TPopupMenu; |     ItemsPopupMenu: TPopupMenu; | ||||||
|     MorePopupMenu: TPopupMenu; |     MorePopupMenu: TPopupMenu; | ||||||
|     procedure AddBitBtnClick(Sender: TObject); |     procedure AddBitBtnClick(Sender: TObject); | ||||||
|     procedure AddMoreBitBtnClick(Sender: TObject); |  | ||||||
|     procedure AddToProjectClick(Sender: TObject); |     procedure AddToProjectClick(Sender: TObject); | ||||||
|     procedure AddToUsesPkgSectionCheckBoxChange(Sender: TObject); |     procedure AddToUsesPkgSectionCheckBoxChange(Sender: TObject); | ||||||
|     procedure ApplyDependencyButtonClick(Sender: TObject); |     procedure ApplyDependencyButtonClick(Sender: TObject); | ||||||
| @ -250,6 +255,10 @@ type | |||||||
|     procedure ItemsTreeViewDragOver(Sender, Source: TObject; X, Y: Integer; |     procedure ItemsTreeViewDragOver(Sender, Source: TObject; X, Y: Integer; | ||||||
|       State: TDragState; var Accept: Boolean); |       State: TDragState; var Accept: Boolean); | ||||||
|     procedure ItemsTreeViewKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); |     procedure ItemsTreeViewKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); | ||||||
|  |     procedure mnuAddDiskFilesClick(Sender: TObject); | ||||||
|  |     procedure mnuAddNewCompClick(Sender: TObject); | ||||||
|  |     procedure mnuAddNewReqrClick(Sender: TObject); | ||||||
|  |     procedure mnuAddNewFileClick(Sender: TObject); | ||||||
|     procedure MorePopupMenuPopup(Sender: TObject); |     procedure MorePopupMenuPopup(Sender: TObject); | ||||||
|     procedure ItemsTreeViewDblClick(Sender: TObject); |     procedure ItemsTreeViewDblClick(Sender: TObject); | ||||||
|     procedure ItemsTreeViewSelectionChanged(Sender: TObject); |     procedure ItemsTreeViewSelectionChanged(Sender: TObject); | ||||||
| @ -312,6 +321,7 @@ type | |||||||
|     procedure SetSortAlphabetically(const AValue: boolean); |     procedure SetSortAlphabetically(const AValue: boolean); | ||||||
|     procedure SetupComponents; |     procedure SetupComponents; | ||||||
|     function OnTreeViewGetImageIndex({%H-}Str: String; Data: TObject; var {%H-}AIsEnabled: Boolean): Integer; |     function OnTreeViewGetImageIndex({%H-}Str: String; Data: TObject; var {%H-}AIsEnabled: Boolean): Integer; | ||||||
|  |     procedure ShowAddDialogEx(AType: TAddToPkgType); | ||||||
|     procedure UpdateNodeImage(TVNode: TTreeNode; NodeData: TPENodeData); |     procedure UpdateNodeImage(TVNode: TTreeNode; NodeData: TPENodeData); | ||||||
|     procedure UpdatePending; |     procedure UpdatePending; | ||||||
|     function CanUpdate(Flag: TPEFlag; Immediately: boolean): boolean; |     function CanUpdate(Flag: TPEFlag; Immediately: boolean): boolean; | ||||||
| @ -998,6 +1008,37 @@ begin | |||||||
|     Key := VK_UNKNOWN; |     Key := VK_UNKNOWN; | ||||||
| end; | end; | ||||||
| 
 | 
 | ||||||
|  | procedure TPackageEditorForm.ShowAddDialogEx(AType: TAddToPkgType); | ||||||
|  | begin | ||||||
|  |   if LazPackage=nil then exit; | ||||||
|  |   BeginUpdate; | ||||||
|  |   try | ||||||
|  |     ShowAddDialog(AType); | ||||||
|  |   finally | ||||||
|  |     EndUpdate; | ||||||
|  |   end; | ||||||
|  | end; | ||||||
|  | 
 | ||||||
|  | procedure TPackageEditorForm.mnuAddDiskFilesClick(Sender: TObject); | ||||||
|  | begin | ||||||
|  |   ShowAddDialogEx(d2ptFiles); | ||||||
|  | end; | ||||||
|  | 
 | ||||||
|  | procedure TPackageEditorForm.mnuAddNewCompClick(Sender: TObject); | ||||||
|  | begin | ||||||
|  |   ShowAddDialogEx(d2ptNewComponent); | ||||||
|  | end; | ||||||
|  | 
 | ||||||
|  | procedure TPackageEditorForm.mnuAddNewReqrClick(Sender: TObject); | ||||||
|  | begin | ||||||
|  |   ShowAddDialogEx(d2ptRequiredPkg); | ||||||
|  | end; | ||||||
|  | 
 | ||||||
|  | procedure TPackageEditorForm.mnuAddNewFileClick(Sender: TObject); | ||||||
|  | begin | ||||||
|  |   ShowAddDialogEx(d2ptNewFile); | ||||||
|  | end; | ||||||
|  | 
 | ||||||
| procedure TPackageEditorForm.ItemsTreeViewSelectionChanged(Sender: TObject); | procedure TPackageEditorForm.ItemsTreeViewSelectionChanged(Sender: TObject); | ||||||
| begin | begin | ||||||
|   if fUpdateLock>0 then exit; |   if fUpdateLock>0 then exit; | ||||||
| @ -1549,17 +1590,6 @@ begin | |||||||
|   end; |   end; | ||||||
| end; | end; | ||||||
| 
 | 
 | ||||||
| procedure TPackageEditorForm.AddMoreBitBtnClick(Sender: TObject); |  | ||||||
| begin |  | ||||||
|   if LazPackage=nil then exit; |  | ||||||
|   BeginUpdate; |  | ||||||
|   try |  | ||||||
|     ShowAddDialog(fLastDlgPage); |  | ||||||
|   finally |  | ||||||
|     EndUpdate; |  | ||||||
|   end; |  | ||||||
| end; |  | ||||||
| 
 |  | ||||||
| procedure TPackageEditorForm.AddToUsesPkgSectionCheckBoxChange(Sender: TObject); | procedure TPackageEditorForm.AddToUsesPkgSectionCheckBoxChange(Sender: TObject); | ||||||
| var | var | ||||||
|   CurFile: TPkgFile; |   CurFile: TPkgFile; | ||||||
| @ -1864,18 +1894,25 @@ begin | |||||||
| 
 | 
 | ||||||
|   SaveBitBtn    := CreateToolButton('SaveBitBtn', lisMenuSave, lisPckEditSavePackage, 'laz_save', @SaveBitBtnClick); |   SaveBitBtn    := CreateToolButton('SaveBitBtn', lisMenuSave, lisPckEditSavePackage, 'laz_save', @SaveBitBtnClick); | ||||||
|   CompileBitBtn := CreateToolButton('CompileBitBtn', lisCompile, lisPckEditCompilePackage, 'pkg_compile', @CompileBitBtnClick); |   CompileBitBtn := CreateToolButton('CompileBitBtn', lisCompile, lisPckEditCompilePackage, 'pkg_compile', @CompileBitBtnClick); | ||||||
|   UseBitBtn     := CreateToolButton('UseBitBtn', lisPckEditInstall, lisPckEditInstallPackageInTheIDE, 'pkg_install', nil); |   UseBitBtn     := CreateToolButton('UseBitBtn', lisUseSub, lisClickToSeeTheChoices, 'pkg_install', nil); | ||||||
|   CreateDivider; |   CreateDivider; | ||||||
|   AddBitBtn     := CreateToolButton('AddBitBtn', lisAdd, lisPckEditAddFiles, 'laz_add', @AddBitBtnClick); |   AddBitBtn     := CreateToolButton('AddBitBtn', lisAddSub, lisClickToSeeTheChoices, 'laz_add', nil); | ||||||
|   AddMoreBitBtn := CreateToolButton('AddMoreBitBtn', lisDlgAdd, lisPckEditAddOtherItems, 'laz_addmore', @AddMoreBitBtnClick); |  | ||||||
|   RemoveBitBtn  := CreateToolButton('RemoveBitBtn', lisRemove, lisPckEditRemoveSelectedItem, 'laz_delete', @RemoveBitBtnClick); |   RemoveBitBtn  := CreateToolButton('RemoveBitBtn', lisRemove, lisPckEditRemoveSelectedItem, 'laz_delete', @RemoveBitBtnClick); | ||||||
|   CreateDivider; |   CreateDivider; | ||||||
|   OptionsBitBtn := CreateToolButton('OptionsBitBtn', lisOptions, lisPckEditEditGeneralOptions, 'pkg_properties', @OptionsBitBtnClick); |   OptionsBitBtn := CreateToolButton('OptionsBitBtn', lisOptions, lisPckEditEditGeneralOptions, 'pkg_properties', @OptionsBitBtnClick); | ||||||
|   HelpBitBtn    := CreateToolButton('HelpBitBtn', GetButtonCaption(idButtonHelp), lisPkgEdThereAreMoreFunctionsInThePopupmenu, 'menu_help', @HelpBitBtnClick); |   HelpBitBtn    := CreateToolButton('HelpBitBtn', GetButtonCaption(idButtonHelp), '', 'menu_help', @HelpBitBtnClick); | ||||||
|   MoreBitBtn    := CreateToolButton('MoreBitBtn', lisMoreSub, lisPkgEdThereAreMoreFunctionsInThePopupmenu, '', nil); |   MoreBitBtn    := CreateToolButton('MoreBitBtn', lisMoreSub, lisPkgEdMoreFunctionsForThePackage, '', nil); | ||||||
| 
 | 
 | ||||||
|  |   UseBitBtn.DropdownMenu := UsePopupMenu; | ||||||
|  |   AddBitBtn.DropdownMenu := AddPopupMenu; | ||||||
|   MoreBitBtn.DropdownMenu := MorePopupMenu; |   MoreBitBtn.DropdownMenu := MorePopupMenu; | ||||||
| 
 | 
 | ||||||
|  |   mnuAddDiskFile.Caption := lisPckEditAddFilesFromFileSystem; | ||||||
|  |   mnuAddDiskFiles.Caption := lisAddFilesInDirectory; | ||||||
|  |   mnuAddNewFile.Caption := lisA2PNewFile; | ||||||
|  |   mnuAddNewComp.Caption := lisA2PNewComponent; | ||||||
|  |   mnuAddNewReqr.Caption := lisProjAddNewRequirement; | ||||||
|  | 
 | ||||||
|   // Buttons on FilterPanel |   // Buttons on FilterPanel | ||||||
|   OpenButton.LoadGlyphFromResourceName(HInstance, 'laz_open'); |   OpenButton.LoadGlyphFromResourceName(HInstance, 'laz_open'); | ||||||
|   OpenButton.Hint:=lisOpenFile2; |   OpenButton.Hint:=lisOpenFile2; | ||||||
| @ -2270,11 +2307,6 @@ begin | |||||||
|   AddBitBtn.Enabled:=Writable; |   AddBitBtn.Enabled:=Writable; | ||||||
|   RemoveBitBtn.Enabled:=Writable and (ActiveFileCnt+ActiveDepCount>0); |   RemoveBitBtn.Enabled:=Writable and (ActiveFileCnt+ActiveDepCount>0); | ||||||
|   OpenButton.Enabled:=(FileCount+DepCount>0); |   OpenButton.Enabled:=(FileCount+DepCount>0); | ||||||
|   UseBitBtn.Caption:=lisUseSub; |  | ||||||
|   UseBitBtn.Hint:=lisClickToSeeThePossibleUses; |  | ||||||
|   UseBitBtn.OnClick:=nil; |  | ||||||
|   UseBitBtn.DropdownMenu:=UsePopupMenu; |  | ||||||
|   OptionsBitBtn.Enabled:=true; |  | ||||||
| end; | end; | ||||||
| 
 | 
 | ||||||
| function TPackageEditorForm.OnTreeViewGetImageIndex(Str: String; Data: TObject; | function TPackageEditorForm.OnTreeViewGetImageIndex(Str: String; Data: TObject; | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 juha
						juha