Preserve checkbox states in Search dialog

2 files changed, 23 insertions, 1 deletions

diff --git a/UConfig.pas b/UConfig.pas
index 6990e33..f31394f 100644
--- a/UConfig.pas
+++ b/UConfig.pas
@@ -101,7 +101,8 @@ var ConfPanelSep, ConfRowHeight, ConfRowHeightReal, ConfNumHistoryItems,
     ConfLinkItemDefaultColors, ConfDotFileItemDefaultColors, ConfLynxLikeMotion, ConfSizeGroupRequestZeroDigits,
     ConfDisableFileTips, ConfInsMoveDown, ConfSpaceMovesDown, ConfShowFuncButtons, ConfSelectAllDirs, ConfOctalPerm: boolean;
     ConfMounterUseFSTab, ConfShowTextUIDs, ConfMounterPushDown, ConfSavePanelTabs, ConfDuplicateTabWarning,
-    ConfOpenConnectionsWarning, ConfSortDirectoriesLikeFiles, ConfQuickRenameSkipExt, ConfRightClickSelect: boolean;
+    ConfOpenConnectionsWarning, ConfSortDirectoriesLikeFiles, ConfQuickRenameSkipExt, ConfRightClickSelect,
+    ConfSearchFilterCaseSensitive, ConfSearchOtherFS, ConfSearchArchives, ConfSearchTextCaseSensitive: boolean;
 
     ConfShowMounterBar: integer;
     ConfColumnSizes, ConfColumnIDs: array[1..ConstNumPanelColumns] of integer;
@@ -264,6 +265,10 @@ begin
   ConfConnMgrSortColumn := -1;
   ConfConnMgrSortType := 2;
   ConfConnMgrColumn1Width := 230;
+  ConfSearchFilterCaseSensitive := False;
+  ConfSearchOtherFS := False;
+  ConfSearchArchives := False;
+  ConfSearchTextCaseSensitive := False;
 
 
   //  Setup default values for colors
@@ -338,6 +343,10 @@ begin
           SearchHistory.Add(IniFile.ReadString('SearchHistory', Format('Item%d', [j]), ''));
     end;
     ConfShowMounterBar := IniFile.ReadInteger(ConfProfileName, 'ShowMounterBar', ConfShowMounterBar);
+    ConfSearchFilterCaseSensitive := IniFile.ReadBool(ConfProfileName, 'SearchFilterCaseSensitive', ConfSearchFilterCaseSensitive);
+    ConfSearchOtherFS := IniFile.ReadBool(ConfProfileName, 'SearchOtherFS', ConfSearchOtherFS);
+    ConfSearchArchives := IniFile.ReadBool(ConfProfileName, 'SearchArchives', ConfSearchArchives);
+    ConfSearchTextCaseSensitive := IniFile.ReadBool(ConfProfileName, 'SearchTextCaseSensitive', ConfSearchTextCaseSensitive);
 
   finally
     try IniFile.Free; except end;
@@ -396,6 +405,10 @@ begin
       for i := 0 to SearchHistory.Count - 1 do
         IniFile.WriteString('SearchHistory', Format('Item%d', [i]), SearchHistory[i]);
     IniFile.WriteInteger(ConfProfileName, 'ShowMounterBar', ConfShowMounterBar);
+    IniFile.WriteBool(ConfProfileName, 'SearchFilterCaseSensitive', ConfSearchFilterCaseSensitive);
+    IniFile.WriteBool(ConfProfileName, 'SearchOtherFS', ConfSearchOtherFS);
+    IniFile.WriteBool(ConfProfileName, 'SearchArchives', ConfSearchArchives);
+    IniFile.WriteBool(ConfProfileName, 'SearchTextCaseSensitive', ConfSearchTextCaseSensitive);
 
   except
     on E: Exception do DebugMsg(['*** Error: Cannot save user settings (', E.ClassName, '): ', E.Message]);
diff --git a/UMain.pas b/UMain.pas
index 318f53e..0eabe42 100644
--- a/UMain.pas
+++ b/UMain.pas
@@ -6094,6 +6094,11 @@ begin
     FSearch.Engine := Engine;
     FSearch.SearchInEntry.Text := StrToUTF8(ExcludeTrailingPathDelimiter(Engine.Path));
     if Length(FSearch.SearchInEntry.Text) < 1 then FSearch.SearchInEntry.Text := '/';
+    FSearch.CaseSensitiveMatchCheckButton.Checked := ConfSearchFilterCaseSensitive;
+    FSearch.StayCurrentFSCheckButton.Checked := ConfSearchOtherFS;
+    FSearch.SearchArchivesCheckButton.Checked := ConfSearchArchives;
+    FSearch.CaseSensitiveCheckButton.Checked := ConfSearchTextCaseSensitive;
+
     case FSearch.Run of
       mbOK: ;
       mbApply: begin
@@ -6125,6 +6130,10 @@ begin
                end;
     end;
   finally
+    ConfSearchFilterCaseSensitive := FSearch.CaseSensitiveMatchCheckButton.Checked;
+    ConfSearchOtherFS := FSearch.StayCurrentFSCheckButton.Checked;
+    ConfSearchArchives := FSearch.SearchArchivesCheckButton.Checked;
+    ConfSearchTextCaseSensitive := FSearch.CaseSensitiveCheckButton.Checked;
     FSearch.Free;
     Application.ProcessMessages;
     InternalLockInit(False);