Merge pull request #718 from matty0ung/3.0.X

Remove duplicate combo box entries on Hop editor
Brewtarget · Feb 4, 2023 · 104daba · 104daba
2 parents ad81f3a + dd20b20
commit 104daba
Show file tree

Hide file tree

Showing 28 changed files with 249 additions and 453 deletions.
diff --git a/CHANGES.markdown b/CHANGES.markdown
@@ -11,8 +11,29 @@ format therein).
 
 * We'll list new features here...
 
+## v3.0.6
+Minor bug fixes for the 3.0.5 release (ie bugs in 3.0.5 are fixed in this 3.0.6 release).
+
+### New Features
+
+* None
+
+### Bug Fixes
+* brewkenPersistentSettings.conf? [#694](https://github.com/Brewtarget/brewtarget/issues/694)
+* Could not decode "Pellet" to enum and others [#695](https://github.com/Brewtarget/brewtarget/issues/695)
+* Brewtarget logo is missing from main window [#697](https://github.com/Brewtarget/brewtarget/issues/697)
+* Drag and drop is broken [#701](https://github.com/Brewtarget/brewtarget/issues/701)
+* WARNING : QObject::connect: No such signal BrewNote::brewDateChanged(QDateTime) in /home/mik/brewtarget/mik/src/BtTreeModel.cpp [#703](https://github.com/Brewtarget/brewtarget/issues/703)
+* Water chemistry was misbehaving [#705](https://github.com/Brewtarget/brewtarget/issues/705)
+* core dump when right clicking the OG label on the main screen [#708](https://github.com/Brewtarget/brewtarget/issues/708)
+* Hop calculation issues [#715](https://github.com/Brewtarget/brewtarget/issues/715)
+* Hop editor crashes App [#717](https://github.com/Brewtarget/brewtarget/issues/717)
+
+### Release Timestamp
+Sun, 5 Feb 2023 10:04:23 +0100
+
 ## v3.0.5
-Minor bug fixes for the 3.0.4 release (ie bugs in 3.0.5 are fixed in this 3.0.5 release).
+Minor bug fixes for the 3.0.4 release (ie bugs in 3.0.4 are fixed in this 3.0.5 release).
 
 ### New Features
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -114,7 +114,7 @@ endif()
 #=======================================================================================================================
 # It's simplest to keep the project name all lower-case as it means we can use a lot more of the default settings for
 # Linux packaging (where directory names etc are expected to be all lower-case)
-project(brewtarget VERSION 3.0.5 LANGUAGES CXX)
+project(brewtarget VERSION 3.0.6 LANGUAGES CXX)
 message(STATUS "Building ${PROJECT_NAME} version ${PROJECT_VERSION}")
 message(STATUS "PROJECT_SOURCE_DIR is ${PROJECT_SOURCE_DIR}")
 # Sometimes we do need the capitalised version of the project name
@@ -301,17 +301,26 @@ endif()
 # Windows-specific compilation settings
 if(WIN32)
    # See https://gcc.gnu.org/onlinedocs/gcc-12.2.0/gcc/Link-Options.html#Link-Options for more on GCC linker options
-   # In theory, this statically links all the GCC and MinGW libraries, so we don't have to ship DLLs for them.  In
-   # practice, it seems we still need a fair few other DLLs.
-   set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static")
+   # In theory, we could specify "-static-libgcc -static-libstdc++ -static" to statically link all the GCC and MinGW
+   # libraries, so we don't have to ship DLLs for them.  In practice, this (a) does not prevent us needing a fair few
+   # other DLLs and (b) per https://gcc.gnu.org/onlinedocs/gcc-12.2.0/gcc/Link-Options.html#Link-Options it's advised
+   # not to because:
+   #    "There are several situations in which an application should use the shared libgcc instead of the static
+   #    version. The most common of these is when the application wishes to throw and catch exceptions across different
+   #    shared libraries. In that case, each of the libraries as well as the application itself should use the shared
+   #    libgcc.
+   #       "Therefore, the G++ driver automatically adds -shared-libgcc whenever you build a shared library or a main
+   #    executable, because C++ programs typically use exceptions, so this is the right thing to do."
+   #
+#   set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static")
 endif()
 
 if(APPLE)
    # As explained at https://stackoverflow.com/questions/5582211/what-does-define-gnu-source-imply, defining _GNU_SOURCE
    # gives access to various non-standard GNU/Linux extension functions and changes the behaviour of some POSIX
    # functions.
    #
-   # .:TBD:. Not sure exactly why we need this set on Mac builds
+   # This is needed for Boost stacktrace on Mac
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE")
 endif()
 
@@ -668,7 +677,12 @@ if(NOT APPLE)
    endif()
 #   add_compile_definitions(BOOST_STACKTRACE_USE_BACKTRACE)
 endif()
-message("Backtrace libs " ${DL_LIBRARY} " | " ${Backtrace_LIBRARIES} " | " ${Boost_LIBRARIES})
+message("Backtrace libs  ${DL_LIBRARY}  |  ${Backtrace_LIBRARIES}  |  ${Boost_LIBRARIES}")
+
+# Defining BOOST_JSON_STANDALONE tells Boost.JSON to use std::string_view (requires C++17) rather than
+# boost::string_view (part of Boost.Utility).  However, as of recent versions of Boost.JSON, this is "deprecated and
+# will be removed in a future release of Boost.JSON".
+#ADD_COMPILE_DEFINITIONS(BOOST_JSON_STANDALONE)
 
 #=================================================== Find Xerces-C++ ===================================================
 # CMake already knows how to find and configure Xerces-C++, see
@@ -1358,22 +1372,37 @@ if(WIN32)
    # but have not yet hit paydirt.
    #
    set(msys2Dlls
-      libbrotli
-      libbz2
-      libdouble-conversion
-      libfreetype
-      libglib
+      libbrotli                ###
+      libbrotlicommon        # Brotli compression -- see https://en.wikipedia.org/wiki/Brotli
+      libbrotlidec           # Brotli compression
+      libbrotlienc           # Brotli compression
+      libbz2                 # BZip2 compression -- see https://en.wikipedia.org/wiki/Bzip2
+      libdouble-conversion   # See https://github.com/google/double-conversion
+      libfreetype            # See https://freetype.org/
+      libgcc_s_dw2
+      libglib                  ###
+      libglib-2.0
       libgraphite
-      libharfbuzz
-      libiconv
-      libintl
-      libmd4c
-      libpcre
-      libpng16
-      libsqlite3    # You need this IN ADDITION to bin/sqldrivers/qsqlite.dll, which gets installed by windeployqt
+      libharfbuzz            # HarfBuzz text shaping engine -- see https://github.com/harfbuzz/harfbuzz
+      libiconv               # See https://www.gnu.org/software/libiconv/
+      libicudt               # Part of International Components for Unicode
+      libicuin               # Part of International Components for Unicode
+      libicuuc               # Part of International Components for Unicode
+      libintl                # See https://www.gnu.org/software/gettext/
+      libmd4c                # Markdown for C -- see https://github.com/mity/md4c
+      libpcre2-16            # Perl Compatible Regular Expressions
+      libpcre2-32            # Perl Compatible Regular Expressions
+      libpcre2-8             # Perl Compatible Regular Expressions
+      libpng16               # Official PNG reference library -- see http://www.libpng.org/pub/png/libpng.html
+      libsqlite3             # Need this IN ADDITION to bin/sqldrivers/qsqlite.dll, which gets installed by windeployqt
+      libstdc++
+      libwinpthread
+      libxalan-c
       libxalanMsg
-      libzstd
-      zlib1
+      libxerces-c-3
+      libzstd                # ZStandard (aka zstd) = fast lossless compression algorithm
+      zlib1                    ###
+      zlib                   # ZLib compression library
    )
    foreach(dynamicLib IN LISTS msys2Dlls)
       file(GLOB dynamicallyLinkedLibrary ${dynamicLibDir}/${dynamicLib}*.dll)

diff --git a/src/HopEditor.cpp b/src/HopEditor.cpp
@@ -1,6 +1,6 @@
 /*
  * HopEditor.cpp is part of Brewtarget, and is Copyright the following
- * authors 2009-2021
+ * authors 2009-2023
  * - Kregg K <[email protected]>
  * - Matt Young <[email protected]>
  * - Mik Firestone <[email protected]>

diff --git a/src/database/Database.cpp b/src/database/Database.cpp
@@ -1,6 +1,6 @@
 /*
  * database/Database.cpp is part of Brewtarget, and is copyright the following
- * authors 2009-2021:
+ * authors 2009-2023:
  *   • Aidan Roberts <[email protected]>
  *   • A.J. Drobnich <[email protected]>
  *   • Brian Rower <[email protected]>
@@ -682,7 +682,12 @@ bool Database::load() {
 
 void Database::checkForNewDefaultData() {
    // See if there are new ingredients that we need to merge from the data-space db.
-   // Don't do this if we JUST copied the dataspace database.
+   // Don't do this if we JUST copied the default database.
+   qDebug() <<
+      Q_FUNC_INFO << "dataDbFile:" << this->pimpl->dataDbFile.fileName() << ", dbFile:" <<
+      this->pimpl->dbFile.fileName() << ", userDatabaseDidNotExist: " <<
+      (this->pimpl->userDatabaseDidNotExist ? "True" : "False") << ", dataDbFile.lastModified:" <<
+      QFileInfo(this->pimpl->dataDbFile).lastModified() << ", lastDbMergeRequest" << Database::lastDbMergeRequest;
    if (this->pimpl->dataDbFile.fileName() != this->pimpl->dbFile.fileName() &&
        !this->pimpl->userDatabaseDidNotExist &&
        QFileInfo(this->pimpl->dataDbFile).lastModified() > Database::lastDbMergeRequest) {

diff --git a/src/model/Hop.h b/src/model/Hop.h
@@ -1,6 +1,6 @@
 /*
  * model/Hop.h is part of Brewtarget, and is Copyright the following
- * authors 2009-2021
+ * authors 2009-2023
  * - Jeff Bailey <[email protected]>
  * - Matt Young <[email protected]>
  * - Mik Firestone <[email protected]>

diff --git a/translations/bt_ca.ts b/translations/bt_ca.ts
@@ -5323,23 +5323,23 @@ El volum final al primari és de %1.</translation>
     </message>
     <message>
         <source>Mash</source>
-        <translation>Maceració</translation>
+        <translation type="vanished">Maceració</translation>
     </message>
     <message>
         <source>First Wort</source>
-        <translation>Primera most</translation>
+        <translation type="vanished">Primera most</translation>
     </message>
     <message>
         <source>Boil</source>
-        <translation>Bullit</translation>
+        <translation type="vanished">Bullit</translation>
     </message>
     <message>
         <source>Aroma</source>
-        <translation>Aroma</translation>
+        <translation type="vanished">Aroma</translation>
     </message>
     <message>
         <source>Dry Hop</source>
-        <translation>«Dry Hop»</translation>
+        <translation type="vanished">«Dry Hop»</translation>
     </message>
     <message>
         <source>Time</source>
@@ -5351,27 +5351,27 @@ El volum final al primari és de %1.</translation>
     </message>
     <message>
         <source>Bittering</source>
-        <translation>Amargor</translation>
+        <translation type="vanished">Amargor</translation>
     </message>
     <message>
         <source>Both</source>
-        <translation>Ambdós</translation>
+        <translation type="vanished">Ambdós</translation>
     </message>
     <message>
         <source>Form</source>
         <translation>Format</translation>
     </message>
     <message>
         <source>Leaf</source>
-        <translation>Flor</translation>
+        <translation type="vanished">Flor</translation>
     </message>
     <message>
         <source>Pellet</source>
-        <translation>Pèl·let</translation>
+        <translation type="vanished">Pèl·let</translation>
     </message>
     <message>
         <source>Plug</source>
-        <translation>«Plug»</translation>
+        <translation type="vanished">«Plug»</translation>
     </message>
     <message>
         <source>Beta (%)</source>

diff --git a/translations/bt_cs.ts b/translations/bt_cs.ts
@@ -5285,23 +5285,23 @@ Celkový objem pro hlavní kvašení je %1.</translation>
     </message>
     <message>
         <source>Mash</source>
-        <translation>Vystírka (mash hop)</translation>
+        <translation type="vanished">Vystírka (mash hop)</translation>
     </message>
     <message>
         <source>First Wort</source>
-        <translation>Vyslazování (first wort)</translation>
+        <translation type="vanished">Vyslazování (first wort)</translation>
     </message>
     <message>
         <source>Boil</source>
-        <translation>Chmelovar</translation>
+        <translation type="vanished">Chmelovar</translation>
     </message>
     <message>
         <source>Aroma</source>
-        <translation>Aromatický</translation>
+        <translation type="vanished">Aromatický</translation>
     </message>
     <message>
         <source>Dry Hop</source>
-        <translation>Dry hopping</translation>
+        <translation type="vanished">Dry hopping</translation>
     </message>
     <message>
         <source>Time</source>
@@ -5313,27 +5313,27 @@ Celkový objem pro hlavní kvašení je %1.</translation>
     </message>
     <message>
         <source>Bittering</source>
-        <translation>Hořký</translation>
+        <translation type="vanished">Hořký</translation>
     </message>
     <message>
         <source>Both</source>
-        <translation>Oboje</translation>
+        <translation type="vanished">Oboje</translation>
     </message>
     <message>
         <source>Form</source>
         <translation>Forma</translation>
     </message>
     <message>
         <source>Leaf</source>
-        <translation>Hlávkový</translation>
+        <translation type="vanished">Hlávkový</translation>
     </message>
     <message>
         <source>Pellet</source>
-        <translation>Granulovaný</translation>
+        <translation type="vanished">Granulovaný</translation>
     </message>
     <message>
         <source>Plug</source>
-        <translation>Lisovaný</translation>
+        <translation type="vanished">Lisovaný</translation>
     </message>
     <message>
         <source>Beta (%)</source>

diff --git a/translations/bt_de.ts b/translations/bt_de.ts
@@ -5291,23 +5291,23 @@ Das endgültige Volumen in der Hauptgärung beträgt %1.</translation>
     </message>
     <message>
         <source>Mash</source>
-        <translation>Maische</translation>
+        <translation type="vanished">Maische</translation>
     </message>
     <message>
         <source>First Wort</source>
-        <translation>Vorderwürze</translation>
+        <translation type="vanished">Vorderwürze</translation>
     </message>
     <message>
         <source>Boil</source>
-        <translation>Kochen</translation>
+        <translation type="vanished">Kochen</translation>
     </message>
     <message>
         <source>Aroma</source>
-        <translation>Aroma</translation>
+        <translation type="vanished">Aroma</translation>
     </message>
     <message>
         <source>Dry Hop</source>
-        <translation>Stopfhopfen</translation>
+        <translation type="vanished">Stopfhopfen</translation>
     </message>
     <message>
         <source>Time</source>
@@ -5319,27 +5319,27 @@ Das endgültige Volumen in der Hauptgärung beträgt %1.</translation>
     </message>
     <message>
         <source>Bittering</source>
-        <translation>Bitterung</translation>
+        <translation type="vanished">Bitterung</translation>
     </message>
     <message>
         <source>Both</source>
-        <translation>Beide</translation>
+        <translation type="vanished">Beide</translation>
     </message>
     <message>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
         <source>Leaf</source>
-        <translation>Blatt</translation>
+        <translation type="vanished">Blatt</translation>
     </message>
     <message>
         <source>Pellet</source>
-        <translation>Pellet</translation>
+        <translation type="vanished">Pellet</translation>
     </message>
     <message>
         <source>Plug</source>
-        <translation>Niederdruckpellet</translation>
+        <translation type="vanished">Niederdruckpellet</translation>
     </message>
     <message>
         <source>Beta (%)</source>