+ Сохранение фильтра языка на вкладках (отдельно для каждой коллекции…

…) issue #4
OleksiyPenkov · Mar 3, 2023 · b34176c · b34176c
1 parent 138d926
commit b34176c
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/Program/Forms/frm_main.dfm b/Program/Forms/frm_main.dfm
@@ -236,7 +236,7 @@ object frmMain: TfrmMain
     Width = 786
     Height = 685
     HelpContext = 1
-    ActivePage = tsByAuthor
+    ActivePage = tsByGroup
     Align = alClient
     OwnerDraw = True
     TabOrder = 2
@@ -2008,7 +2008,7 @@ object frmMain: TfrmMain
             150)
           object lblTotalBooksF: TLabel
             AlignWithMargins = True
-            Left = 1930
+            Left = 1916
             Top = 9
             Width = 12
             Height = 19

diff --git a/Program/Forms/frm_main.pas b/Program/Forms/frm_main.pas
@@ -1480,6 +1480,11 @@ procedure TfrmMain.SavePositions;
     FCollection.SetProperty(PROP_LAST_AUTHOR_BOOK, FLastAuthorBookID.BookID);
     FCollection.SetProperty(PROP_LAST_SERIES, FLastSeriesStr);
     FCollection.SetProperty(PROP_LAST_SERIES_BOOK, FLastSeriesBookID.BookID);
+
+    FCollection.SetProperty(PROP_BOOKS_LANG_FILTER, cbLangSelectA.ItemIndex);
+    FCollection.SetProperty(PROP_SERIES_LANG_FILTER, cbLangSelectS.ItemIndex);
+    FCollection.SetProperty(PROP_GENRES_LANG_FILTER, cbLangSelectG.ItemIndex);
+    FCollection.SetProperty(PROP_GROUPS_LANG_FILTER, cbLangSelectF.ItemIndex);
   end;
 end;
 
@@ -1550,6 +1555,12 @@ procedure TfrmMain.InitCollection;
     end;
   end;
 
+  procedure RestoreLangFilter(const Index: integer; LangComboBox: TComboBox);
+  begin
+    LangComboBox.ItemIndex := Index;
+    cbLangSelectAChange(LangComboBox);
+  end;
+
 
 begin
   FIgnoreAuthorChange := True;
@@ -1655,6 +1666,12 @@ procedure TfrmMain.InitCollection;
     UpdateActions;
     UpdateAllEditActions;
 
+    // ---- Recover laguage filters
+    RestoreLangFilter(FCollection.GetProperty(PROP_BOOKS_LANG_FILTER), cbLangSelectA);
+    RestoreLangFilter(FCollection.GetProperty(PROP_SERIES_LANG_FILTER), cbLangSelectS);
+    RestoreLangFilter(FCollection.GetProperty(PROP_GENRES_LANG_FILTER), cbLangSelectG);
+    RestoreLangFilter(FCollection.GetProperty(PROP_GROUPS_LANG_FILTER), cbLangSelectF);
+
     FInvisible := False;
     FindLastBook(FCollection.GetProperty(PROP_LAST_AUTHOR_BOOK), tvBooksA);
     FindLastBook(FCollection.GetProperty(PROP_LAST_SERIES_BOOK), tvBooksS);

diff --git a/Program/MyhomeLib.dproj b/Program/MyhomeLib.dproj
@@ -124,8 +124,8 @@
         <DCC_DcuOutput>Out\Units</DCC_DcuOutput>
         <DCC_ExeOutput>Out\Bin</DCC_ExeOutput>
         <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
-        <VerInfo_Build>840</VerInfo_Build>
-        <VerInfo_Keys>CompanyName=;FileVersion=2.3.5.840;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=2.3.4;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
+        <VerInfo_Build>841</VerInfo_Build>
+        <VerInfo_Keys>CompanyName=;FileVersion=2.3.5.841;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=2.3.4;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <VerInfo_Locale>2073</VerInfo_Locale>
         <BT_BuildType>Debug</BT_BuildType>
         <VerInfo_Private>false</VerInfo_Private>

diff --git a/Program/MyhomeLib.res b/Program/MyhomeLib.res
diff --git a/Program/Units/unit_Consts.pas b/Program/Units/unit_Consts.pas
@@ -300,7 +300,10 @@ interface
   PROP_LAST_SERIES      = PROP_CLASS_COLLECTION or PROP_TYPE_STRING   or $0010;
   PROP_LAST_SERIES_BOOK = PROP_CLASS_COLLECTION or PROP_TYPE_INTEGER  or $0011;
 
-
+  PROP_BOOKS_LANG_FILTER  = PROP_CLASS_COLLECTION or PROP_TYPE_INTEGER  or $0012;
+  PROP_SERIES_LANG_FILTER = PROP_CLASS_COLLECTION or PROP_TYPE_INTEGER  or $0013;
+  PROP_GENRES_LANG_FILTER = PROP_CLASS_COLLECTION or PROP_TYPE_INTEGER  or $0014;
+  PROP_GROUPS_LANG_FILTER = PROP_CLASS_COLLECTION or PROP_TYPE_INTEGER  or $0014;
 type
   TColumnSet = set of 0 .. 255;