Rework combo boxes

Brewtarget · Dec 29, 2024 · e77fcc6 · e77fcc6
1 parent 60e8b4a
commit e77fcc6
Show file tree

Hide file tree

Showing 90 changed files with 3,132 additions and 1,656 deletions.
diff --git a/CHANGES.markdown b/CHANGES.markdown
@@ -23,10 +23,11 @@ Bug fixes and minor enhancements.
 * Buttons not displaying icons on Windows, and some missing button text [903](https://github.com/Brewtarget/brewtarget/issues/903)
 * Country flags not shown on Windows [907](https://github.com/Brewtarget/brewtarget/issues/907)
 * Ctrl-C copied recipe not shown in correct folder until after restart [909](https://github.com/Brewtarget/brewtarget/issues/909)
+* Combo boxes not displaying properly on Windows [894](https://github.com/Brewtarget/brewtarget/issues/894)
 * Compiler warning: "'void QCheckBox::stateChanged(int)' is deprecated: Use checkStateChanged() instead" [884](https://github.com/Brewtarget/brewtarget/issues/884)
 
 ### Release Timestamp
-Mon, 23 Dec 2024 04:00:13 +0100
+Sun, 29 Dec 2024 04:00:13 +0100
 
 ## v4.0.12
 Bug fixes and minor enhancements.

diff --git a/meson.build b/meson.build
@@ -690,8 +690,10 @@ commonSourceFiles = files([
    'src/editors/StyleEditor.cpp',
    'src/editors/WaterEditor.cpp',
    'src/editors/YeastEditor.cpp',
+   'src/listModels/BoilListModel.cpp',
    'src/listModels/EquipmentListModel.cpp',
    'src/listModels/FermentableListModel.cpp',
+   'src/listModels/FermentationListModel.cpp',
    'src/listModels/HopListModel.cpp',
    'src/listModels/MashListModel.cpp',
    'src/listModels/MashStepListModel.cpp',
@@ -766,9 +768,12 @@ commonSourceFiles = files([
    'src/serialization/xml/XmlRecipeRecord.cpp',
    'src/serialization/xml/XmlRecord.cpp',
    'src/serialization/xml/XmlRecordDefinition.cpp',
+   'src/sortFilterProxyModels/BoilSortFilterProxyModel.cpp',
    'src/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp',
+   'src/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp',
    'src/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp',
    'src/sortFilterProxyModels/HopSortFilterProxyModel.cpp',
+   'src/sortFilterProxyModels/MashSortFilterProxyModel.cpp',
    'src/sortFilterProxyModels/MiscSortFilterProxyModel.cpp',
    'src/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp',
    'src/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp',
@@ -778,12 +783,15 @@ commonSourceFiles = files([
    'src/sortFilterProxyModels/WaterSortFilterProxyModel.cpp',
    'src/sortFilterProxyModels/YeastSortFilterProxyModel.cpp',
    'src/tableModels/BoilStepTableModel.cpp',
+   'src/tableModels/BoilTableModel.cpp',
    'src/tableModels/BtTableModel.cpp',
    'src/tableModels/EquipmentTableModel.cpp',
    'src/tableModels/FermentableTableModel.cpp',
    'src/tableModels/FermentationStepTableModel.cpp',
+   'src/tableModels/FermentationTableModel.cpp',
    'src/tableModels/HopTableModel.cpp',
    'src/tableModels/MashStepTableModel.cpp',
+   'src/tableModels/MashTableModel.cpp',
    'src/tableModels/MiscTableModel.cpp',
    'src/tableModels/RecipeAdditionFermentableTableModel.cpp',
    'src/tableModels/RecipeAdditionHopTableModel.cpp',
@@ -799,6 +807,7 @@ commonSourceFiles = files([
    'src/trees/TreeNode.cpp',
    'src/trees/TreeView.cpp',
    'src/undoRedo/SimpleUndoableUpdate.cpp',
+   'src/undoRedo/Undoable.cpp',
    'src/utils/BtException.cpp',
    'src/utils/BtStringConst.cpp',
    'src/utils/BtStringStream.cpp',
@@ -814,13 +823,12 @@ commonSourceFiles = files([
    'src/utils/TimerUtils.cpp',
    'src/utils/TypeLookup.cpp',
    'src/widgets/Animator.cpp',
-   'src/widgets/BtBoolComboBox.cpp',
-   'src/widgets/BtComboBox.cpp',
+   'src/widgets/BtComboBoxBool.cpp',
+   'src/widgets/BtComboBoxEnum.cpp',
+   'src/widgets/BtComboBoxNamedEntity.cpp',
    'src/widgets/BtOptionalDateEdit.cpp',
-   'src/widgets/CustomComboBox.cpp',
    'src/widgets/InfoButton.cpp',
    'src/widgets/InfoText.cpp',
-   'src/widgets/MashComboBox.cpp',
    'src/widgets/SelectionControl.cpp',
    'src/widgets/SmartAmountSettings.cpp',
    'src/widgets/SmartAmounts.cpp',
@@ -915,8 +923,10 @@ mocHeaders = files([
    'src/editors/StyleEditor.h',
    'src/editors/WaterEditor.h',
    'src/editors/YeastEditor.h',
+   'src/listModels/BoilListModel.h',
    'src/listModels/EquipmentListModel.h',
    'src/listModels/FermentableListModel.h',
+   'src/listModels/FermentationListModel.h',
    'src/listModels/HopListModel.h',
    'src/listModels/MashListModel.h',
    'src/listModels/MashStepListModel.h',
@@ -968,9 +978,12 @@ mocHeaders = files([
    'src/model/Style.h',
    'src/model/Water.h',
    'src/model/Yeast.h',
+   'src/sortFilterProxyModels/BoilSortFilterProxyModel.h',
    'src/sortFilterProxyModels/EquipmentSortFilterProxyModel.h',
    'src/sortFilterProxyModels/FermentableSortFilterProxyModel.h',
+   'src/sortFilterProxyModels/FermentationSortFilterProxyModel.h',
    'src/sortFilterProxyModels/HopSortFilterProxyModel.h',
+   'src/sortFilterProxyModels/MashSortFilterProxyModel.h',
    'src/sortFilterProxyModels/MiscSortFilterProxyModel.h',
    'src/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.h',
    'src/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.h',
@@ -980,12 +993,15 @@ mocHeaders = files([
    'src/sortFilterProxyModels/WaterSortFilterProxyModel.h',
    'src/sortFilterProxyModels/YeastSortFilterProxyModel.h',
    'src/tableModels/BoilStepTableModel.h',
+   'src/tableModels/BoilTableModel.h',
    'src/tableModels/BtTableModel.h',
    'src/tableModels/EquipmentTableModel.h',
    'src/tableModels/FermentableTableModel.h',
    'src/tableModels/FermentationStepTableModel.h',
+   'src/tableModels/FermentationTableModel.h',
    'src/tableModels/HopTableModel.h',
    'src/tableModels/MashStepTableModel.h',
+   'src/tableModels/MashTableModel.h',
    'src/tableModels/MiscTableModel.h',
    'src/tableModels/RecipeAdditionFermentableTableModel.h',
    'src/tableModels/RecipeAdditionHopTableModel.h',
@@ -1000,10 +1016,10 @@ mocHeaders = files([
    'src/trees/TreeModel.h',
    'src/trees/TreeView.h',
    'src/widgets/Animator.h',
-   'src/widgets/BtBoolComboBox.h',
-   'src/widgets/BtComboBox.h',
+   'src/widgets/BtComboBoxBool.h',
+   'src/widgets/BtComboBoxEnum.h',
+   'src/widgets/BtComboBoxNamedEntity.h',
    'src/widgets/BtOptionalDateEdit.h',
-   'src/widgets/CustomComboBox.h',
    'src/widgets/InfoButton.h',
    'src/widgets/InfoText.h',
    'src/widgets/SelectionControl.h',

diff --git a/src/BtFieldType.h b/src/BtFieldType.h
@@ -35,8 +35,9 @@ enum class NonPhysicalQuantity {
    Date,
    String,
    Percentage,
+   //! This usually means we need either a \c QCheckBox or a \c BtComboBoxBool
    Bool,
-   //! This usually means we need a \c BtComboBox
+   //! This usually means we need a \c BtComboBoxEnum
    Enum,
    /**
     * This is for things like step number and other orderings where we have 1st, 2nd, 3rd etc (though its usually

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -121,8 +121,10 @@ set(filesToCompile_cpp
     ${repoDir}/src/editors/StyleEditor.cpp
     ${repoDir}/src/editors/WaterEditor.cpp
     ${repoDir}/src/editors/YeastEditor.cpp
+    ${repoDir}/src/listModels/BoilListModel.cpp
     ${repoDir}/src/listModels/EquipmentListModel.cpp
     ${repoDir}/src/listModels/FermentableListModel.cpp
+    ${repoDir}/src/listModels/FermentationListModel.cpp
     ${repoDir}/src/listModels/HopListModel.cpp
     ${repoDir}/src/listModels/MashListModel.cpp
     ${repoDir}/src/listModels/MashStepListModel.cpp
@@ -197,9 +199,12 @@ set(filesToCompile_cpp
     ${repoDir}/src/serialization/xml/XmlRecipeRecord.cpp
     ${repoDir}/src/serialization/xml/XmlRecord.cpp
     ${repoDir}/src/serialization/xml/XmlRecordDefinition.cpp
+    ${repoDir}/src/sortFilterProxyModels/BoilSortFilterProxyModel.cpp
     ${repoDir}/src/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp
     ${repoDir}/src/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp
+    ${repoDir}/src/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp
     ${repoDir}/src/sortFilterProxyModels/HopSortFilterProxyModel.cpp
+    ${repoDir}/src/sortFilterProxyModels/MashSortFilterProxyModel.cpp
     ${repoDir}/src/sortFilterProxyModels/MiscSortFilterProxyModel.cpp
     ${repoDir}/src/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp
     ${repoDir}/src/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp
@@ -209,12 +214,15 @@ set(filesToCompile_cpp
     ${repoDir}/src/sortFilterProxyModels/WaterSortFilterProxyModel.cpp
     ${repoDir}/src/sortFilterProxyModels/YeastSortFilterProxyModel.cpp
     ${repoDir}/src/tableModels/BoilStepTableModel.cpp
+    ${repoDir}/src/tableModels/BoilTableModel.cpp
     ${repoDir}/src/tableModels/BtTableModel.cpp
     ${repoDir}/src/tableModels/EquipmentTableModel.cpp
     ${repoDir}/src/tableModels/FermentableTableModel.cpp
     ${repoDir}/src/tableModels/FermentationStepTableModel.cpp
+    ${repoDir}/src/tableModels/FermentationTableModel.cpp
     ${repoDir}/src/tableModels/HopTableModel.cpp
     ${repoDir}/src/tableModels/MashStepTableModel.cpp
+    ${repoDir}/src/tableModels/MashTableModel.cpp
     ${repoDir}/src/tableModels/MiscTableModel.cpp
     ${repoDir}/src/tableModels/RecipeAdditionFermentableTableModel.cpp
     ${repoDir}/src/tableModels/RecipeAdditionHopTableModel.cpp
@@ -230,6 +238,7 @@ set(filesToCompile_cpp
     ${repoDir}/src/trees/TreeNode.cpp
     ${repoDir}/src/trees/TreeView.cpp
     ${repoDir}/src/undoRedo/SimpleUndoableUpdate.cpp
+    ${repoDir}/src/undoRedo/Undoable.cpp
     ${repoDir}/src/utils/BtException.cpp
     ${repoDir}/src/utils/BtStringConst.cpp
     ${repoDir}/src/utils/BtStringStream.cpp
@@ -245,13 +254,12 @@ set(filesToCompile_cpp
     ${repoDir}/src/utils/TimerUtils.cpp
     ${repoDir}/src/utils/TypeLookup.cpp
     ${repoDir}/src/widgets/Animator.cpp
-    ${repoDir}/src/widgets/BtBoolComboBox.cpp
-    ${repoDir}/src/widgets/BtComboBox.cpp
+    ${repoDir}/src/widgets/BtComboBoxBool.cpp
+    ${repoDir}/src/widgets/BtComboBoxEnum.cpp
+    ${repoDir}/src/widgets/BtComboBoxNamedEntity.cpp
     ${repoDir}/src/widgets/BtOptionalDateEdit.cpp
-    ${repoDir}/src/widgets/CustomComboBox.cpp
     ${repoDir}/src/widgets/InfoButton.cpp
     ${repoDir}/src/widgets/InfoText.cpp
-    ${repoDir}/src/widgets/MashComboBox.cpp
     ${repoDir}/src/widgets/SelectionControl.cpp
     ${repoDir}/src/widgets/SmartAmountSettings.cpp
     ${repoDir}/src/widgets/SmartAmounts.cpp