refs #576, improved filters

* initially clear filters
* fixed handling of simulator flags
* rename field
* changed order of * handling

src/blackgui/filters/aircrafticaofilterbar.cpp

@@ -32,6 +32,9 @@ namespace BlackGui
             CUpperCaseValidator *ucv = new CUpperCaseValidator(this);
             this->ui->le_Designator->setValidator(ucv);
             this->ui->le_Manufacturer->setValidator(ucv);
+
+            // reset form
+            this->clearForm();
         }
 
         CAircraftIcaoFilterBar::~CAircraftIcaoFilterBar()
@@ -44,7 +47,7 @@ namespace BlackGui
                            this->ui->le_Designator->text(),
                            this->ui->le_Manufacturer->text(),
                            this->ui->le_Description->text(),
-                           this->ui->combinedtype_Selector->getCombinedType()
+                           this->ui->combinedType_Selector->getCombinedType()
                        ));
         }
 
@@ -82,7 +85,7 @@ namespace BlackGui
             ui->le_Designator->clear();
             ui->le_Manufacturer->clear();
             ui->le_Description->clear();
-            ui->combinedtype_Selector->clear();
+            ui->combinedType_Selector->clear();
         }
 
         void CAircraftIcaoFilterBar::setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider)

src/blackgui/filters/aircrafticaofilterbar.ui

@@ -122,7 +122,7 @@
     </widget>
    </item>
    <item row="1" column="0" colspan="5">
-    <widget class="BlackGui::CAircraftCombinedTypeSelector" name="combinedtype_Selector">
+    <widget class="BlackGui::CAircraftCombinedTypeSelector" name="combinedType_Selector">
      <property name="minimumSize">
       <size>
        <width>0</width>

src/blackgui/filters/aircraftmodelfilterbar.cpp

@@ -42,6 +42,9 @@ namespace BlackGui
             this->ui->le_AirlineIcao->setValidator(ucv);
             this->ui->le_ModelKey->setValidator(ucv);
             this->ui->le_AircraftManufacturer->setValidator(ucv);
+
+            // reset form
+            this->clearForm();
         }
 
         CAircraftModelFilterBar::~CAircraftModelFilterBar()

src/blackgui/filters/airlineicaofilterbar.cpp

@@ -32,6 +32,9 @@ namespace BlackGui
             connect(ui->country_Selector, &CDbCountrySelectorComponent::countryChanged, this, &CAirlineIcaoFilterBar::ps_CountryChanged);
 
             ui->le_Designator->setValidator(new CUpperCaseValidator(this));
+
+            // reset form
+            this->clearForm();
         }
 
         CAirlineIcaoFilterBar::~CAirlineIcaoFilterBar() { }

src/blackgui/filters/countryfilterbar.cpp

@@ -31,6 +31,9 @@ namespace BlackGui
 
             CUpperCaseValidator *ucv = new CUpperCaseValidator(this);
             this->ui->le_IsoCode->setValidator(ucv);
+
+            // reset form
+            this->clearForm();
         }
 
         CCountryFilterBar::~CCountryFilterBar()

src/blackgui/filters/liveryfilterbar.cpp

@@ -37,6 +37,9 @@ namespace BlackGui
             CUpperCaseValidator *ucv = new CUpperCaseValidator(this);
             ui->le_AirlineIcaoCode->setValidator(ucv);
             ui->le_LiveryCode->setValidator(ucv);
+
+            // reset form
+            this->clearForm();
         }
 
         CLiveryFilterBar::~CLiveryFilterBar()

src/blackgui/models/aircraftmodelfilter.cpp

@@ -95,7 +95,7 @@ namespace BlackGui
                      this->m_airlineIcao.isEmpty() && this->m_airlineName.isEmpty() &&
                      this->m_liveryCode.isEmpty() &&
                      !this->m_distributor.hasValidDbKey() &&
-                     this->m_simulatorInfo.isNoSimulator()
+                     (this->m_simulatorInfo.isNoSimulator() || this->m_simulatorInfo.isAllSimulators())
                     );
         }
 

src/blackgui/models/modelfilter.cpp

@@ -38,17 +38,18 @@ namespace BlackGui
                 return v.contains(filterNoWildcard, cs);
             }
 
+            // ends with
+            if (f.endsWith('*'))
+            {
+                return v.startsWith(filterNoWildcard, cs);
+            }
+
             // starting with
             if (f.startsWith('*'))
             {
                 return v.endsWith(filterNoWildcard, cs);
             }
 
-            if (f.endsWith('*'))
-            {
-                return v.startsWith(filterNoWildcard, cs);
-            }
-
             // should never happen
             Q_ASSERT(false);
             return false;