refact update layout

Author: mattia72

src/Common/RipGrepper.Common.SimpleTypes.pas

@@ -58,6 +58,11 @@ 	TErrorCounters = record
 
 	TNullableString = Nullable<string>;
 
+	EMemoTextFormat = (mtfOneLine, mtfSeparateLines);
+	ESearchFormLayout = (sflReplace, sflExtension, sflExpert);
+
+	TSearchFormLayout = set of ESearchFormLayout;
+
 const
 	GUI_SEARCH_PARAMS : TArray<EGuiOption> = [
 	{ } EGuiOption.soMatchCase,

src/UI/RipGrepper.UI.CustomCheckOptions.pas

@@ -14,7 +14,8 @@ interface
 	Winapi.Windows,
 	Winapi.Messages,
 	RipGrepper.Settings.RipGrepperSettings,
-	RipGrepper.Settings.SettingVariant;
+	RipGrepper.Settings.SettingVariant,
+	RipGrepper.Common.SimpleTypes;
 
 type
 
@@ -222,6 +223,7 @@ 	TCustomOptionsBase = class(TCustomPanel)
 			procedure setColumns(const _value : Integer);
 
 		protected
+			FSearchFormLayout : TSearchFormLayout;
 			procedure Resize; override;
 
 		public
@@ -271,8 +273,8 @@ 	TCustomCheckOptions = class(TCustomOptionsBase)
 			procedure CalculateActualWidths(const _itemWidth, _firstControlWidth : Integer;
 				out _actualFirstWidth, _actualSecondWidth : Integer);
 			procedure PositionItemPanel(const _item : TCustomCheckItem; const _itemIndex, _itemWidth, _itemHeight : Integer);
-			procedure PositionItemControls(const _item : TCustomCheckItem; const
-				_itemIndex, _actualFirstWidth, _actualSecondWidth : Integer);
+			procedure PositionItemControls(const _item : TCustomCheckItem;
+				const _itemIndex, _actualFirstWidth, _actualSecondWidth : Integer);
 			// Helper methods for positioning different control types
 			procedure PositionCheckBoxOnly(const _item : TCustomCheckItem; const _itemIndex, _actualFirstWidth, _itemHeight : Integer);
 			procedure PositionCheckBoxWithCombo(const _item : TCustomCheckItem; const _itemIndex, _actualFirstWidth, _actualSecondWidth,
@@ -306,7 +308,7 @@ 	TCustomCheckOptions = class(TCustomOptionsBase)
 			function GetItemByCaption(const _caption : string) : TCustomCheckItem;
 			procedure SetItemControlEnabled(_itemIdx : Integer; _controlIdx : ESubItemIndex; _enabled : Boolean);
 			function GetMinimumWidth() : Integer;
-			procedure ShowExpertItems(const _bShow : Boolean = True);
+			procedure UpdateLayout(const _layout : TSearchFormLayout);
 			procedure SetDefaultValues();
 			property EventsEnabled : Boolean read FEventsEnabled write FEventsEnabled;
 			property SelectedItems : TArray<TCustomCheckItem> read getSelectedItems;
@@ -322,9 +324,10 @@ implementation
 uses
 	Math,
 	RipGrepper.Common.IDEContextValues,
-	RipGrepper.Common.SimpleTypes,
+
 	Spring,
-	RipGrepper.Tools.DebugUtils;
+	RipGrepper.Tools.DebugUtils,
+	RipGrepper.Common.Constants;
 
 { TCustomCheckItemsEnumerator }
 
@@ -1221,7 +1224,8 @@ procedure TCustomCheckOptions.CalculateActualWidths(const _itemWidth, _firstCont
 end;
 
 procedure TCustomCheckOptions.PositionItemPanel(const _item : TCustomCheckItem; const _itemIndex, _itemWidth, _itemHeight : Integer);
-var col, row : Integer;
+var
+	col, row : Integer;
 	baseLeft, itemHeight : Integer;
 begin
 	col := _itemIndex mod Columns;
@@ -1260,7 +1264,8 @@ procedure TCustomCheckOptions.PositionCheckBoxOnly(const _item : TCustomCheckIte
 	iTextWidth := Canvas.TextWidth(_item.CheckBox.Caption) + CHECKBOX_MARGIN;
 	if UseFlowLayout then begin
 		// Flow layout: calculate width based on caption text width using parent's canvas
-		var checkboxWidth : integer := Canvas.TextWidth(_item.CheckBox.Caption) + CHECKBOX_MARGIN;
+		var
+			checkboxWidth : integer := Canvas.TextWidth(_item.CheckBox.Caption) + CHECKBOX_MARGIN;
 		if (FItems.Count = 1) then begin
 			_item.CheckBox.Width := Max(checkboxWidth, iTextWidth);
 		end else begin
@@ -1854,11 +1859,13 @@ procedure TCustomCheckOptions.SetSettings(const Value : TRipGrepperSettings);
 	FSettings := Value;
 end;
 
-procedure TCustomCheckOptions.ShowExpertItems(const _bShow : Boolean = True);
+procedure TCustomCheckOptions.UpdateLayout(const _layout : TSearchFormLayout);
 begin
-	for var item in Items do begin
-		if item.ShowInExpertModeOnly then begin
-			item.ParentPanel.Visible := _bShow;
+	if FSearchFormLayout = _layout then begin
+		for var item in Items do begin
+			if item.ShowInExpertModeOnly then begin
+				item.ParentPanel.Visible := sflExpert in FSearchFormLayout;
+			end;
 		end;
 	end;
 end;
@@ -1874,7 +1881,7 @@ procedure TCustomCheckOptions.SetDefaultValues();
 
 procedure Register;
 begin
-	RegisterComponents('Custom', [TCustomCheckOptions]);
+	RegisterComponents(DRIPGREPPER_APPNAME, [TCustomCheckOptions]);
 end;
 
 class function TAutoSetReset.New(var _bValue : Boolean; const _bInitValue : Boolean = True) : TAutoSetReset;

src/UI/RipGrepper.UI.CustomRadioOptions.pas

@@ -11,7 +11,8 @@ interface
 	Vcl.StdCtrls,
 	Vcl.ExtCtrls,
 	Winapi.Windows,
-	RipGrepper.UI.CustomCheckOptions;
+	RipGrepper.UI.CustomCheckOptions, 
+	RipGrepper.Common.SimpleTypes;
 
 type
 	// Forward declarations
@@ -64,7 +65,8 @@ 	TCustomRadioItems = class(TCollection)
 	// Custom radio options control
 	TCustomRadioOptions = class(TCustomOptionsBase)
 
-		private
+		strict private
+			FSearchFormLayout: TSearchFormLayout;
 			FCollection : TCustomRadioItems;
 			FItemIndex : Integer;
 			FOnRadioItemSelect : TRadioItemSelectEvent;
@@ -81,7 +83,7 @@ 	TCustomRadioOptions = class(TCustomOptionsBase)
 			procedure Clear; override;
 			function AddRadioButton(const _caption, _hint : string; _orderIndex : Integer; _obj : IInterface = nil) : TCustomRadioItem;
 			procedure AlignControlItems(); override;
-			procedure ShowExpertItems(const _bShow : Boolean = True);
+			procedure UpdateLayout(const _layout: TSearchFormLayout);
 			procedure SetDefaultValues();
 
 		published
@@ -97,8 +99,7 @@ implementation
 
 uses
 	Math,
-	RipGrepper.Common.IDEContextValues,
-	RipGrepper.Common.SimpleTypes;
+	RipGrepper.Common.IDEContextValues, RipGrepper.Common.Constants;
 
 { TCustomRadioItem }
 
@@ -386,13 +387,13 @@ function TCustomRadioOptions.getSelectedItem : TCustomRadioItem;
 	end;
 end;
 
-procedure TCustomRadioOptions.ShowExpertItems(const _bShow : Boolean = True);
+procedure TCustomRadioOptions.UpdateLayout(const _layout: TSearchFormLayout);
 begin
 	for var ci in Collection do begin
 		var
 		item := ci as TCustomRadioItem;
 		if item.ShowInExpertModeOnly and Assigned(item.RadioButton) then begin
-			item.RadioButton.Visible := _bShow;
+			item.RadioButton.Visible := sflExpert in _layout;
 		end;
 	end;
 end;
@@ -404,7 +405,7 @@ procedure TCustomRadioOptions.SetDefaultValues();
 
 procedure Register;
 begin
-	RegisterComponents('Custom', [TCustomRadioOptions]);
+	RegisterComponents(DRIPGREPPER_APPNAME, [TCustomRadioOptions]);
 end;
 
 end.