Compare commits
11 commits
Author | SHA1 | Date | |
---|---|---|---|
Martin Brodbeck | 0c7f071b9d | ||
Martin Brodbeck | d0c50c9b9a | ||
Martin Brodbeck | a17cb22e05 | ||
Martin Brodbeck | 205dac5326 | ||
Martin Brodbeck | b0d2d6b284 | ||
Martin Brodbeck | 7f11ba4e5d | ||
Martin Brodbeck | 32d0ec7749 | ||
Martin Brodbeck | 54e5c70447 | ||
Martin Brodbeck | 379fd4a73c | ||
Martin Brodbeck | 8a94b53379 | ||
Martin Brodbeck | d9b13d0e1a |
|
@ -1,6 +1,6 @@
|
|||
cmake_minimum_required(VERSION 3.8)
|
||||
cmake_minimum_required(VERSION 3.10)
|
||||
|
||||
project(kima2 VERSION 1.7.2)
|
||||
project(kima2 VERSION 1.8.0)
|
||||
|
||||
set(CMAKE_MODULE_PATH "${CMAKE_HOME_DIRECTORY}/cmake")
|
||||
|
||||
|
@ -98,9 +98,9 @@ if( MINGW )
|
|||
${MINGW_PATH}/libwinpthread-1.dll
|
||||
${MINGW_PATH}/libsqlite3-0.dll
|
||||
${MINGW_PATH}/libusb-1.0.dll
|
||||
${MINGW_PATH}/libicuuc72.dll
|
||||
${MINGW_PATH}/libicuin72.dll
|
||||
${MINGW_PATH}/libicudt72.dll
|
||||
${MINGW_PATH}/libicuuc73.dll
|
||||
${MINGW_PATH}/libicuin73.dll
|
||||
${MINGW_PATH}/libicudt73.dll
|
||||
${MINGW_PATH}/libpcre2-16-0.dll
|
||||
${MINGW_PATH}/libpcre2-8-0.dll
|
||||
${MINGW_PATH}/zlib1.dll
|
||||
|
|
2
LICENSE
2
LICENSE
|
@ -1,4 +1,4 @@
|
|||
Copyright © 2018-2023 Martin Brodbeck
|
||||
Copyright © 2018-2024 Martin Brodbeck
|
||||
|
||||
Hiermit wird unentgeltlich jeder Person, die eine Kopie der Software und der
|
||||
zugehörigen Dokumentationen (die "Software") erhält, die Erlaubnis erteilt,
|
||||
|
|
|
@ -19,14 +19,11 @@ Ubuntu, Windows) angeboten. Bitte die Hinweise dort beachten.
|
|||
### Selbst compilieren
|
||||
KIMA2 benötigt folgende Libraries:
|
||||
* Qt 6
|
||||
* boost >= 1.62
|
||||
* boost >= 1.80
|
||||
* libusb-1.0
|
||||
* xlnt >= 1.5.0
|
||||
* nlohmann-json (als 3rdparty submodule vorhanden)
|
||||
* csv-parser (als 3rdparty submodule vorhanden)
|
||||
|
||||
Da Features aus C++20 verwendet werden sowie std::filesystem, sollte als Compiler mindestens
|
||||
GCC 12 verwendet werden.
|
||||
Da Features aus C++20 verwendet werden, sollte als Compiler mindestens GCC 12 verwendet werden.
|
||||
|
||||
Die Installationsschritte unter Linux sind wie folgt:
|
||||
```
|
||||
|
|
|
@ -9,12 +9,12 @@
|
|||
<project_license>GPL-3.0-or-later</project_license>
|
||||
|
||||
<releases>
|
||||
<release version="@PROJECT_VERSION@" type="stable" date="2023-04-25" />
|
||||
<release version="@PROJECT_VERSION@" type="stable" date="2024-01-23" />
|
||||
</releases>
|
||||
|
||||
<description>
|
||||
<p>
|
||||
A small cash point program for children’s stuff markets. German language only.
|
||||
A small cash point program for children's stuff markets. German language only.
|
||||
</p>
|
||||
</description>
|
||||
|
||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -1,4 +1,4 @@
|
|||
project('kima2', 'cpp', default_options : ['cpp_std=c++20'], version : '1.6.1')
|
||||
project('kima2', 'cpp', default_options : ['cpp_std=c++20'], version : '1.8.0')
|
||||
|
||||
conf_data = configuration_data()
|
||||
conf_data.set('PROJECT_VERSION', '"' + meson.project_version() + '"')
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
set(Boost_USE_STATIC_LIBS ON)
|
||||
|
||||
find_package(Boost 1.62 REQUIRED)
|
||||
find_package(Boost 1.78 REQUIRED)
|
||||
find_package(SQLite3 REQUIRED)
|
||||
|
||||
# Because csv-parser needs threads:
|
||||
|
|
|
@ -102,8 +102,10 @@ void JsonUtil::importSales(const std::filesystem::path &filePath, Marketplace *m
|
|||
|
||||
int source_no = jsonValues["source_no"];
|
||||
if (source_no == cashPointNo) {
|
||||
throw std::runtime_error("Die Kassen-Nr. der zu imporierenden Daten wird von dieser Kasse "
|
||||
"hier bereits verwendet.");
|
||||
std::string ret = "Die Kassen-Nr. ";
|
||||
ret += std::to_string(source_no);
|
||||
ret += " der zu imporierenden Daten wird von dieser Kasse hier bereits verwendet.";
|
||||
throw std::runtime_error(ret);
|
||||
}
|
||||
|
||||
market->setSalesToDelete(jsonValues["source_no"]);
|
||||
|
|
|
@ -105,7 +105,7 @@ MainWindow::MainWindow()
|
|||
});
|
||||
connect(m_ui.licenseAction, &QAction::triggered, this, [this]() {
|
||||
QString licenseText(
|
||||
"Copyright © 2018-2023 Martin Brodbeck\n\n"
|
||||
"Copyright © 2018-2024 Martin Brodbeck\n\n"
|
||||
"Hiermit wird unentgeltlich jeder Person, die eine Kopie der Software und der "
|
||||
"zugehörigen Dokumentationen (die \"Software\") erhält, die Erlaubnis erteilt, "
|
||||
"sie uneingeschränkt zu nutzen, inklusive und ohne Ausnahme mit dem Recht, "
|
||||
|
@ -504,12 +504,13 @@ void MainWindow::onImportSalesJsonActionTriggered()
|
|||
{
|
||||
QSettings settings;
|
||||
|
||||
auto filename = QFileDialog::getOpenFileName(this, "Umsätze/Transaktionen importieren",
|
||||
auto filenames = QFileDialog::getOpenFileNames(this, "Umsätze/Transaktionen importieren",
|
||||
QString(), "JSON Dateien (*.json)");
|
||||
|
||||
if (filename.isEmpty())
|
||||
if (filenames.isEmpty())
|
||||
return;
|
||||
|
||||
for(auto filename: filenames) {
|
||||
#if defined(_WIN64) || defined(_WIN32)
|
||||
fs::path filePath(filename.toStdWString());
|
||||
#else
|
||||
|
@ -525,6 +526,8 @@ void MainWindow::onImportSalesJsonActionTriggered()
|
|||
this)
|
||||
.exec();
|
||||
}
|
||||
}
|
||||
|
||||
setSaleModel();
|
||||
updateStatLabel();
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
set(Boost_USE_STATIC_LIBS ON)
|
||||
|
||||
find_package(Boost 1.62 REQUIRED)
|
||||
find_package(Boost 1.78 REQUIRED)
|
||||
|
||||
if(WIN32)
|
||||
find_package(LIBUSB REQUIRED)
|
||||
|
@ -20,4 +20,4 @@ if(WIN32)
|
|||
else()
|
||||
target_link_libraries(printer core ${LibUSB_LIBRARIES})
|
||||
endif()
|
||||
target_include_directories(printer PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)
|
||||
target_include_directories(printer PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/.. ${Boost_INCLUDE_DIRS})
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d
|
||||
Subproject commit 9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03
|
|
@ -1 +1 @@
|
|||
Subproject commit a3ed916f591c300e97b873fde36863fa37b49fa9
|
||||
Subproject commit 8c48163c4d3fbba603cfe8a5b94046c9dad71825
|
Loading…
Reference in a new issue