CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.8)
 
-project(kima2 VERSION 1.7.2)
+project(kima2 VERSION 1.7.1)
 
 set(CMAKE_MODULE_PATH "${CMAKE_HOME_DIRECTORY}/cmake")
 

misc/kima2.desktop

@@ -3,9 +3,9 @@ Type=Application
 Name=KIMA2
 GenericName=Cash Point Program
 GenericName[de]=Kassenprogramm
-Comment=A small cash point program for children’s stuff markets
-Comment[de]=Ein kleines Kassenprogramm für Kindersachenmärkte
+Comment=A small cash point program
+Comment[de]=Ein kleines Kassenprogramm
 Exec=kima2
 Icon=kima2
 Categories=Office;
-Terminal=false
+

src/core/CMakeLists.txt

@@ -7,7 +7,7 @@ find_package(SQLite3 REQUIRED)
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
-#find_package(fmt)
+find_package(fmt)
 
 set(CORE_SOURCES
     database.cpp
@@ -27,10 +27,10 @@ set(CORE_SOURCES
 add_library(core STATIC ${CORE_SOURCES})
 target_include_directories(core PRIVATE ${PROJECT_SOURCE_DIR}/subprojects/csv-parser/single_include)
 if (WIN32)
-    target_link_libraries(core PRIVATE sqlite3 nlohmann_json::nlohmann_json Threads::Threads)
+    target_link_libraries(core PRIVATE sqlite3 nlohmann_json::nlohmann_json Threads::Threads fmt::fmt)
     target_link_libraries(core PRIVATE bcrypt)
 else()
-	target_link_libraries(core PRIVATE sqlite3 nlohmann_json::nlohmann_json Threads::Threads)
+	target_link_libraries(core PRIVATE sqlite3 nlohmann_json::nlohmann_json Threads::Threads fmt::fmt)
 endif()
 
 target_include_directories(core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)

src/core/database.cpp

@@ -2,7 +2,7 @@
 
 #include <chrono>
 #include <filesystem>
-#include <format>
+#include <fmt/chrono.h>
 #include <iostream>
 #include <stdexcept>
 #include <vector>
@@ -47,7 +47,7 @@ void Database::newDb()
     fs::path destPath = sourcePath.parent_path() / sourcePath.stem();
 
     auto chronoTime = std::chrono::system_clock::now();
-    std::string timeString = std::format("{0:%FT%H-%M-%S}", chronoTime);
+    std::string timeString = fmt::format("{0:%FT%H-%M-%S}", chronoTime);
 
     destPath += std::string("_") += timeString += ".db";
 

src/core/utils.cpp

@@ -2,12 +2,14 @@
 
 #include <algorithm>
 #include <clocale>
-#include <format>
+#include <fmt/format.h>
 #include <iomanip>
 #include <numeric>
 
 #include <iostream>
 
+using namespace fmt;
+
 std::string formatCentAsEuroString(const int cent, int width)
 {
     /*std::stringstream currStream;
@@ -30,7 +32,7 @@ std::string formatCentAsEuroString(const int cent, int width)
 #else
     std::locale myLocale{"de_DE.utf8"};
 #endif
-    return std::format(myLocale, "{:{}.2Lf} €", cent / 100.0L, width);
+    return fmt::format(myLocale, "{:{}.2Lf} €", cent / 100.0L, width);
 }
 
 std::string &ltrim(std::string &str, const std::string &chars)