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

IDE: package editor: glyphs for speedbuttons

Browse Source 
git-svn-id: trunk@29069 -
This commit is contained in:
mattias 2011-01-17 19:26:48 +00:00
parent c7db1f5a24
commit dc5499edd6
8 changed files with 6378 additions and 6298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -4388,6 +4388,7 @@ images/packages/pkg_compile.png -text svneol=unset#image/png
images/packages/pkg_conflict.png -text svneol=unset#image/png images/packages/pkg_conflict.png -text svneol=unset#image/png
images/packages/pkg_files.png -text svneol=unset#image/png images/packages/pkg_files.png -text svneol=unset#image/png
images/packages/pkg_graph.png -text svneol=unset#image/png images/packages/pkg_graph.png -text svneol=unset#image/png
images/packages/pkg_hierarchical.png -text svneol=unset#image/png
images/packages/pkg_include.png -text svneol=unset#image/png images/packages/pkg_include.png -text svneol=unset#image/png
images/packages/pkg_inherited.png -text svneol=unset#image/png images/packages/pkg_inherited.png -text svneol=unset#image/png
images/packages/pkg_install.png -text svneol=unset#image/png images/packages/pkg_install.png -text svneol=unset#image/png
@ -4404,6 +4405,7 @@ images/packages/pkg_registerunit.png -text svneol=unset#image/png
images/packages/pkg_removedfiles.png -text svneol=unset#image/png images/packages/pkg_removedfiles.png -text svneol=unset#image/png
images/packages/pkg_removedrequired.png -text svneol=unset#image/png images/packages/pkg_removedrequired.png -text svneol=unset#image/png
images/packages/pkg_required.png -text svneol=unset#image/png images/packages/pkg_required.png -text svneol=unset#image/png
images/packages/pkg_sortalphabetically.png -text svneol=unset#image/png
images/packages/pkg_text.png -text svneol=unset#image/png images/packages/pkg_text.png -text svneol=unset#image/png
images/packages/pkg_unit.png -text svneol=unset#image/png images/packages/pkg_unit.png -text svneol=unset#image/png
images/powered-by.svg -text svneol=unset#image/svg%2Bxml images/powered-by.svg -text svneol=unset#image/svg%2Bxml

2
ide/lazarusidestrconsts.pas
View File

@ -2110,7 +2110,7 @@ resourcestring
+'the Run File command instead'; +'the Run File command instead';
lisCEFilter = '(Filter)'; lisCEFilter = '(Filter)';
lisPESortFilesAlphabetically = 'Sort files alphabetically'; lisPESortFilesAlphabetically = 'Sort files alphabetically';
lisPEShowDirectoryHierachy = 'Show directory hierachy'; lisPEShowDirectoryHierarchy = 'Show directory hierarchy';
dlgCaseSensitive = '&Case Sensitive'; dlgCaseSensitive = '&Case Sensitive';
lisDistinguishBigAndSmallLettersEGAAndA = 'Distinguish big and small ' lisDistinguishBigAndSmallLettersEGAAndA = 'Distinguish big and small '
+'letters e.g. A and a'; +'letters e.g. A and a';

12630
images/laz_images.lrs
View File

File diff suppressed because it is too large Load Diff

2
images/laz_images_list.txt
View File

@ -219,6 +219,8 @@ packages/pkg_removedfiles.png
packages/pkg_removedrequired.png packages/pkg_removedrequired.png
packages/pkg_text.png packages/pkg_text.png
packages/pkg_unit.png packages/pkg_unit.png
packages/pkg_hierarchical.png
packages/pkg_sortalphabetically.png
propertygrid/issue_fpgui.png propertygrid/issue_fpgui.png
propertygrid/issue_carbon.png propertygrid/issue_carbon.png
propertygrid/issue_gtk.png propertygrid/issue_gtk.png

BIN
images/packages/pkg_hierarchical.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 514 B

BIN
images/packages/pkg_sortalphabetically.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 567 B

6
packager/packageeditor.lfm
View File

@ -206,7 +206,7 @@ inherited PackageEditorForm: TPackageEditorForm
TabOrder = 1 TabOrder = 1
Text = 'FilterEdit' Text = 'FilterEdit'
end end
object DirectoryHierachySpeedButton: TSpeedButton object DirectoryHierarchySpeedButton: TSpeedButton
AnchorSideLeft.Control = ItemsPanel AnchorSideLeft.Control = ItemsPanel
AnchorSideTop.Control = FilterEdit AnchorSideTop.Control = FilterEdit
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
@ -217,12 +217,12 @@ inherited PackageEditorForm: TPackageEditorForm
AllowAllUp = True AllowAllUp = True
GroupIndex = 1 GroupIndex = 1
NumGlyphs = 0 NumGlyphs = 0
OnClick = DirectoryHierachySpeedButtonClick OnClick = DirectoryHierarchySpeedButtonClick
ShowHint = True ShowHint = True
ParentShowHint = False ParentShowHint = False
end end
object SortAlphabeticallySpeedButton: TSpeedButton object SortAlphabeticallySpeedButton: TSpeedButton
AnchorSideLeft.Control = DirectoryHierachySpeedButton AnchorSideLeft.Control = DirectoryHierarchySpeedButton
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = FilterEdit AnchorSideTop.Control = FilterEdit
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter

34
packager/packageeditor.pas
View File

@ -144,7 +144,7 @@ type
{ TPackageEditorForm } { TPackageEditorForm }
TPackageEditorForm = class(TBasePackageEditor) TPackageEditorForm = class(TBasePackageEditor)
DirectoryHierachySpeedButton: TSpeedButton; DirectoryHierarchySpeedButton: TSpeedButton;
FilterEdit: TEdit; FilterEdit: TEdit;
ItemsPanel: TPanel; ItemsPanel: TPanel;
SortAlphabeticallySpeedButton: TSpeedButton; SortAlphabeticallySpeedButton: TSpeedButton;
@ -192,7 +192,7 @@ type
procedure CompileCleanClick(Sender: TObject); procedure CompileCleanClick(Sender: TObject);
procedure CompilerOptionsBitBtnClick(Sender: TObject); procedure CompilerOptionsBitBtnClick(Sender: TObject);
procedure CreateMakefileClick(Sender: TObject); procedure CreateMakefileClick(Sender: TObject);
procedure DirectoryHierachySpeedButtonClick(Sender: TObject); procedure DirectoryHierarchySpeedButtonClick(Sender: TObject);
procedure FilePropsGroupBoxResize(Sender: TObject); procedure FilePropsGroupBoxResize(Sender: TObject);
procedure FilesPopupMenuPopup(Sender: TObject); procedure FilesPopupMenuPopup(Sender: TObject);
procedure FilterEditChange(Sender: TObject); procedure FilterEditChange(Sender: TObject);
@ -247,12 +247,12 @@ type
FPlugins: TStringList; FPlugins: TStringList;
FNeedUpdateAll: boolean; FNeedUpdateAll: boolean;
FNeedUpdateFiles: boolean; FNeedUpdateFiles: boolean;
FShowDirectoryHierachy: boolean; FShowDirectoryHierarchy: boolean;
FSortAlphabetically: boolean; FSortAlphabetically: boolean;
procedure SetDependencyDefaultFilename(AsPreferred: boolean); procedure SetDependencyDefaultFilename(AsPreferred: boolean);
procedure SetFilter(const AValue: string); procedure SetFilter(const AValue: string);
procedure SetIdleConnected(const AValue: boolean); procedure SetIdleConnected(const AValue: boolean);
procedure SetShowDirectoryHierachy(const AValue: boolean); procedure SetShowDirectoryHierarchy(const AValue: boolean);
procedure SetSortAlphabetically(const AValue: boolean); procedure SetSortAlphabetically(const AValue: boolean);
procedure SetupComponents; procedure SetupComponents;
procedure UpdateTitle; procedure UpdateTitle;
@ -293,7 +293,7 @@ type
property LazPackage: TLazPackage read FLazPackage write SetLazPackage; property LazPackage: TLazPackage read FLazPackage write SetLazPackage;
property Filter: string read FFilter write SetFilter; property Filter: string read FFilter write SetFilter;
property SortAlphabetically: boolean read FSortAlphabetically write SetSortAlphabetically; property SortAlphabetically: boolean read FSortAlphabetically write SetSortAlphabetically;
property ShowDirectoryHierachy: boolean read FShowDirectoryHierachy write SetShowDirectoryHierachy; property ShowDirectoryHierarchy: boolean read FShowDirectoryHierarchy write SetShowDirectoryHierarchy;
property IdleConnected: boolean read FIdleConnected write SetIdleConnected; property IdleConnected: boolean read FIdleConnected write SetIdleConnected;
end; end;
@ -1395,9 +1395,9 @@ begin
PackageEditors.CreateMakefile(LazPackage); PackageEditors.CreateMakefile(LazPackage);
end; end;
procedure TPackageEditorForm.DirectoryHierachySpeedButtonClick(Sender: TObject); procedure TPackageEditorForm.DirectoryHierarchySpeedButtonClick(Sender: TObject);
begin begin
ShowDirectoryHierachy:=DirectoryHierachySpeedButton.Down; ShowDirectoryHierarchy:=DirectoryHierarchySpeedButton.Down;
end; end;
procedure TPackageEditorForm.SetLazPackage(const AValue: TLazPackage); procedure TPackageEditorForm.SetLazPackage(const AValue: TLazPackage);
@ -1459,7 +1459,9 @@ begin
FilterEdit.Text:=lisCEFilter; FilterEdit.Text:=lisCEFilter;
SortAlphabeticallySpeedButton.Hint:=lisPESortFilesAlphabetically; SortAlphabeticallySpeedButton.Hint:=lisPESortFilesAlphabetically;
DirectoryHierachySpeedButton.Hint:=lisPEShowDirectoryHierachy; SortAlphabeticallySpeedButton.LoadGlyphFromLazarusResource('pkg_sortalphabetically');
DirectoryHierarchySpeedButton.Hint:=lisPEShowDirectoryHierarchy;
DirectoryHierarchySpeedButton.LoadGlyphFromLazarusResource('pkg_hierarchical');
ToolBar.Images := IDEImages.Images_16; ToolBar.Images := IDEImages.Images_16;
@ -1553,12 +1555,12 @@ begin
Application.RemoveOnIdleHandler(@IdleHandler); Application.RemoveOnIdleHandler(@IdleHandler);
end; end;
procedure TPackageEditorForm.SetShowDirectoryHierachy(const AValue: boolean); procedure TPackageEditorForm.SetShowDirectoryHierarchy(const AValue: boolean);
begin begin
//debugln(['TPackageEditorForm.SetShowDirectoryHierachy Old=',FShowDirectoryHierachy,' New=',AValue]); //debugln(['TPackageEditorForm.SetShowDirectoryHierachy Old=',FShowDirectoryHierarchy,' New=',AValue]);
if FShowDirectoryHierachy=AValue then exit; if FShowDirectoryHierarchy=AValue then exit;
FShowDirectoryHierachy:=AValue; FShowDirectoryHierarchy:=AValue;
DirectoryHierachySpeedButton.Down:=ShowDirectoryHierachy; DirectoryHierarchySpeedButton.Down:=ShowDirectoryHierarchy;
UpdateFiles(false); UpdateFiles(false);
end; end;
@ -1680,7 +1682,7 @@ procedure TPackageEditorForm.UpdateFiles(Immediately: boolean);
p:=0; p:=0;
while Filename<>'' do begin while Filename<>'' do begin
// get the next file name part // get the next file name part
if ShowDirectoryHierachy then if ShowDirectoryHierarchy then
DelimPos:=System.Pos(PathDelim,Filename) DelimPos:=System.Pos(PathDelim,Filename)
else else
DelimPos:=0; DelimPos:=0;
@ -1777,7 +1779,7 @@ begin
Files.Insert(j+1,Filename); Files.Insert(j+1,Filename);
Files.Objects[j+1]:=CurFile; Files.Objects[j+1]:=CurFile;
end; end;
//debugln(['TPackageEditorForm.UpdateFiles filtered=',Files.Count,' of ',LazPackage.FileCount,' Filter="',Filter,'" Hierachy=',ShowDirectoryHierachy,' SortAlpha=',SortAlphabetically]); //debugln(['TPackageEditorForm.UpdateFiles filtered=',Files.Count,' of ',LazPackage.FileCount,' Filter="',Filter,'" Hierachy=',ShowDirectoryHierarchy,' SortAlpha=',SortAlphabetically]);
// update treeview nodes // update treeview nodes
FreeTVNodeData(FFilesNode); FreeTVNodeData(FFilesNode);
@ -2223,7 +2225,7 @@ function TPackageEditorForm.ComparePkgFilenames(AFilename1, AFilename2: string
begin begin
if SortAlphabetically then if SortAlphabetically then
Result:=CompareFilenames(AFilename1, AFilename2) Result:=CompareFilenames(AFilename1, AFilename2)
else if ShowDirectoryHierachy then else if ShowDirectoryHierarchy then
Result:=CompareFilenames(ExtractFilePath(AFilename1), ExtractFilePath(AFilename2)) Result:=CompareFilenames(ExtractFilePath(AFilename1), ExtractFilePath(AFilename2))
else else
Result:=0; Result:=0;