https://github.com/StephaneCouturier/Katalog/issues/482

StephaneCouturier · Apr 25, 2024 · 575779b · 575779b
1 parent 258961a
commit 575779b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
@@ -440,7 +440,7 @@
               <string>Search in file catalogs</string>
              </property>
              <property name="checked">
-              <bool>false</bool>
+              <bool>true</bool>
              </property>
             </widget>
            </item>

diff --git a/src/mainwindow_setup.cpp b/src/mainwindow_setup.cpp
@@ -292,6 +292,18 @@
                 ui->Filters_checkBox_SearchInCatalogs->setChecked(true);
                 ui->Filters_widget_ConnectedDrives->hide();
 
+            //Filters selection for search Search/searchInFileCatalogsChecked
+                if ( settings.value("Search/searchInFileCatalogsChecked") != ""){
+                    //ui->Filters_checkBox_SearchInConnectedDrives->setChecked(false);
+                    if ( settings.value("Search/searchInConnectedDriveChecked") == true){
+                        ui->Filters_checkBox_SearchInConnectedDrives->setChecked(1);
+                    }
+                    else
+                        ui->Filters_checkBox_SearchInCatalogs->setChecked(1);
+                }
+                else
+                    ui->Filters_checkBox_SearchInCatalogs->setChecked(1);
+
             //Show or Hide ShowHideSearchCriteria
             if ( settings.value("Settings/ShowHideSearchCriteria") == "go-down"){ //Hide
                     ui->Search_pushButton_ShowHideSearchCriteria->setIcon(QIcon::fromTheme("go-down"));

diff --git a/src/mainwindow_tab_filters.cpp b/src/mainwindow_tab_filters.cpp
@@ -65,7 +65,7 @@
     void MainWindow::on_Filters_checkBox_SearchInCatalogs_toggled(bool checked)
     {
         QSettings settings(collection->settingsFilePath, QSettings:: IniFormat);
-        settings.setValue("LastSearch/searchInFileCatalogsChecked", checked);
+        settings.setValue("Search/searchInFileCatalogsChecked", checked);
 
         if(checked==1){
             //Enable Catalogs selection
@@ -88,7 +88,7 @@
     void MainWindow::on_Filters_checkBox_SearchInConnectedDrives_toggled(bool checked)
     {
         QSettings settings(collection->settingsFilePath, QSettings:: IniFormat);
-        settings.setValue("LastSearch/searchInConnectedDriveChecked", checked);
+        settings.setValue("Search/searchInConnectedDriveChecked", checked);
 
         if(checked==1){
             //Enable Directory selection

diff --git a/src/mainwindow_tab_search.cpp b/src/mainwindow_tab_search.cpp
@@ -1753,13 +1753,6 @@
         {//Set search values
 
             //Selections
-            if(search->searchInCatalogsChecked == 1){
-                        ui->Filters_checkBox_SearchInCatalogs->setChecked(search->searchInCatalogsChecked);
-            }
-            else if(search->searchInConnectedChecked== 1){
-                        ui->Filters_checkBox_SearchInConnectedDrives->setChecked(search->searchInConnectedChecked);
-            }
-
             ui->Filters_lineEdit_SeletedDirectory->setText(search->connectedDirectory);
             ui->Filters_label_DisplayStorage->setText(search->selectedStorage);
             ui->Filters_label_DisplayCatalog->setText(search->selectedCatalog);