IDE: Show and save also empty pages in the component palette configuration.

git-svn-id: trunk@47216 -
This commit is contained in:
juha 2014-12-17 23:27:22 +00:00
parent 6d84d67bba
commit 00e9e556d4

View File

@ -175,6 +175,13 @@ begin
UpdateCompMoveButtons(ComponentsListView.ItemIndex); UpdateCompMoveButtons(ComponentsListView.ItemIndex);
end; end;
procedure TCompPaletteOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);
begin
fLocalOptions.Assign((AOptions as TEnvironmentOptions).ComponentPaletteOptions);
fLocalUserOrder.Options:=fLocalOptions;
ActualReadSettings;
end;
procedure TCompPaletteOptionsFrame.ActualReadSettings; procedure TCompPaletteOptionsFrame.ActualReadSettings;
begin begin
Assert(fLocalUserOrder.Options = fLocalOptions, 'fLocalUserOrder.Options <> fLocalOptions'); Assert(fLocalUserOrder.Options = fLocalOptions, 'fLocalUserOrder.Options <> fLocalOptions');
@ -183,11 +190,10 @@ begin
RestoreButton.Enabled := not fLocalOptions.IsDefault; RestoreButton.Enabled := not fLocalOptions.IsDefault;
end; end;
procedure TCompPaletteOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); procedure TCompPaletteOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions);
begin begin
fLocalOptions.Assign((AOptions as TEnvironmentOptions).ComponentPaletteOptions); if not fConfigChanged then Exit;
fLocalUserOrder.Options:=fLocalOptions; ActualWriteSettings((AOptions as TEnvironmentOptions).ComponentPaletteOptions);
ActualReadSettings;
end; end;
procedure TCompPaletteOptionsFrame.ActualWriteSettings(cpo: TCompPaletteOptions); procedure TCompPaletteOptionsFrame.ActualWriteSettings(cpo: TCompPaletteOptions);
@ -196,12 +202,6 @@ begin
WriteComponents(cpo); WriteComponents(cpo);
end; end;
procedure TCompPaletteOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions);
begin
if not fConfigChanged then Exit;
ActualWriteSettings((AOptions as TEnvironmentOptions).ComponentPaletteOptions);
end;
procedure TCompPaletteOptionsFrame.WritePages(cpo: TCompPaletteOptions); procedure TCompPaletteOptionsFrame.WritePages(cpo: TCompPaletteOptions);
var var
OrigPages, UserPages: TStringList; OrigPages, UserPages: TStringList;
@ -272,7 +272,6 @@ var
CompList: TStringList; CompList: TStringList;
i: Integer; i: Integer;
PgName: String; PgName: String;
Pg: TBaseComponentPage;
begin begin
// First clear existing items and add <All> page. // First clear existing items and add <All> page.
PagesListBox.Items.BeginUpdate; PagesListBox.Items.BeginUpdate;
@ -284,13 +283,9 @@ begin
begin begin
PgName := fLocalUserOrder.ComponentPages[i]; PgName := fLocalUserOrder.ComponentPages[i];
Assert(PgName<>'', 'TCompPaletteOptionsFrame.FillPages: PageName is empty.'); Assert(PgName<>'', 'TCompPaletteOptionsFrame.FillPages: PageName is empty.');
Pg := IDEComponentPalette.GetPage(PgName); CompList := TStringList.Create; // StringList will hold components for this page.
if (Pg=Nil) or Pg.Visible then InitialComps(i, CompList);
begin PagesListBox.AddItem(PgName, CompList);
CompList := TStringList.Create; // StringList will hold components for this page.
InitialComps(i, CompList);
PagesListBox.AddItem(PgName, CompList);
end;
end; end;
PagesListBox.ItemIndex := 0; // Activate first item PagesListBox.ItemIndex := 0; // Activate first item
PagesListBox.Items.EndUpdate; PagesListBox.Items.EndUpdate;