IDE: package editor: glyphs for speedbuttons

git-svn-id: trunk@29069 -

.gitattributes

@@ -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_files.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_inherited.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_removedrequired.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_unit.png -text svneol=unset#image/png
 images/powered-by.svg -text svneol=unset#image/svg%2Bxml

ide/lazarusidestrconsts.pas

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

images/laz_images_list.txt

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

packager/packageeditor.lfm

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

packager/packageeditor.pas

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