Merge branch 'master' of ssh://brodbeck-online.de:60022/martin/kima2-cpp
This commit is contained in:
commit
d15deb42c8
3 changed files with 5 additions and 2 deletions
|
@ -1,6 +1,6 @@
|
|||
cmake_minimum_required(VERSION 3.8)
|
||||
|
||||
project(kima2 VERSION 0.11.1)
|
||||
project(kima2 VERSION 0.11.2)
|
||||
|
||||
set(CMAKE_MODULE_PATH "${CMAKE_HOME_DIRECTORY}/cmake" ${CMAKE_MODULE_PATH})
|
||||
|
||||
|
|
|
@ -41,9 +41,11 @@ void Database::newDb()
|
|||
{
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
sqlite3_close(db_);
|
||||
|
||||
fs::path sourcePath = dbname_;
|
||||
fs::path destPath = sourcePath.parent_path() / sourcePath.stem();
|
||||
destPath += std::string("_") += boost::posix_time::to_iso_extended_string(boost::posix_time::second_clock::local_time()) += ".db";
|
||||
destPath += std::string("_") += boost::posix_time::to_iso_string(boost::posix_time::second_clock::local_time()) += ".db";
|
||||
|
||||
fs::copy_file(sourcePath, destPath, fs::copy_options::overwrite_existing);
|
||||
|
||||
|
|
|
@ -62,6 +62,7 @@ MainWindow::MainWindow()
|
|||
dynamic_cast<BasketModel*>(ui_.basketView->model())->cancelSale();
|
||||
marketplace_->clear();
|
||||
setSaleModel();
|
||||
updateStatLabel();
|
||||
});
|
||||
|
||||
ui_.sellerNoEdit->installEventFilter(this);
|
||||
|
|
Loading…
Reference in a new issue