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

StephaneCouturier · Oct 27, 2024 · 082a8a8 · 082a8a8
1 parent 18e2e14
commit 082a8a8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/device.cpp b/src/device.cpp
@@ -157,7 +157,7 @@ void Device::loadSubDeviceList(QString connectionName)
     QString queryLoadSubDeviceListSQL;
 
     //Prepare Query
-    if(type !="All"){
+    if(type !=QCoreApplication::translate("MainWindow","All")){
         queryLoadSubDeviceListSQL  = QLatin1String(R"(
                                     SELECT
                                         device_id, device_type

diff --git a/src/mainwindow_setup.cpp b/src/mainwindow_setup.cpp
@@ -348,6 +348,8 @@
             }
 
             selectedDevice->ID   = settings.value("Selection/SelectedDeviceID").toInt();
+            if(selectedDevice->ID == 0) selectedDevice->type = tr("All");
+            selectedDevice->loadDevice("defaultconnection");
 
             graphicStartDate = QDateTime::fromString(settings.value("Statistics/graphStartDate").toString(),"yyyy-mm-dd");
 

diff --git a/src/mainwindow_tab_filters.cpp b/src/mainwindow_tab_filters.cpp
@@ -289,6 +289,8 @@
         //Reset selected values
         selectedDevice = new Device();
         selectedDevice->type = tr("All");
+        selectedDevice->ID = 0;
+        selectedDevice->loadDevice("defaultConnection");
 
         //Reset displayed values
         ui->Filters_label_DisplayStorage->setText(tr("All"));
@@ -374,7 +376,7 @@
     }
     //----------------------------------------------------------------------
     void MainWindow::displaySelectedDeviceName(){
-        if ( selectedDevice->type == "" )
+        if ( selectedDevice->type == "" or selectedDevice->type == tr("All") )
         {
             ui->Filters_label_DisplayDevice->setText(tr("All"));
             ui->Filters_label_DisplayStorage->setText(tr("All"));