diff --git a/application/appRc.qrc b/application/appRc.qrc index afa9743..e2ffa4c 100644 --- a/application/appRc.qrc +++ b/application/appRc.qrc @@ -5,5 +5,6 @@ style.css icons/settings.svg translations/prodejna_cs_CZ.qm + icons/shop.ico diff --git a/application/application.pro b/application/application.pro index eeb2f76..8ea5e6d 100644 --- a/application/application.pro +++ b/application/application.pro @@ -18,6 +18,8 @@ win32 { INCLUDEPATH += d:/prac/odb/libodb-qt-2.4.0 INCLUDEPATH += d:/prac/odb/libodb-sqlite-2.4.0 INCLUDEPATH += d:/prac/odb/sqlite + + RC_FILE = shop.rc } SOURCES += main.cpp\ @@ -59,4 +61,5 @@ RESOURCES += \ TRANSLATIONS = translations/prodejna_cz.ts -DISTFILES += +DISTFILES += \ + shop.rc diff --git a/application/icons/shop.ico b/application/icons/shop.ico new file mode 100644 index 0000000..b7a49f3 Binary files /dev/null and b/application/icons/shop.ico differ diff --git a/application/logindialog.ui b/application/logindialog.ui index b4fd75e..56111cb 100644 --- a/application/logindialog.ui +++ b/application/logindialog.ui @@ -59,7 +59,7 @@ - + diff --git a/application/mainwindow.ui b/application/mainwindow.ui index 4a52742..e97c89e 100644 --- a/application/mainwindow.ui +++ b/application/mainwindow.ui @@ -13,6 +13,10 @@ MainWindow + + + :/icons/shop.ico:/icons/shop.ico + @@ -56,12 +60,12 @@ 0 0 1000 - 21 + 19 - File + Fi&le @@ -83,12 +87,12 @@ - Exit + &Exit - Open database... + &Open database... @@ -97,7 +101,7 @@ :/icons/login_32.png:/icons/login_32.png - Login... + &Login... diff --git a/application/shop.ico b/application/shop.ico new file mode 100644 index 0000000..b7a49f3 Binary files /dev/null and b/application/shop.ico differ diff --git a/application/shop.rc b/application/shop.rc new file mode 100644 index 0000000..befc6d6 --- /dev/null +++ b/application/shop.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "shop.ico" diff --git a/shop/settings/shopsettingsform.ui b/shop/settings/shopsettingsform.ui index 267bd7d..b3ba813 100644 --- a/shop/settings/shopsettingsform.ui +++ b/shop/settings/shopsettingsform.ui @@ -17,7 +17,7 @@ - 2 + 0 diff --git a/shop/shopform.cpp b/shop/shopform.cpp index e998652..0ce98a4 100644 --- a/shop/shopform.cpp +++ b/shop/shopform.cpp @@ -392,6 +392,7 @@ void ShopForm::on_commoditySearch_textChanged(const QString &text) QSortFilterProxyModel proxy; proxy.setSourceModel(m_commodityModel); proxy.setFilterKeyColumn(0); + proxy.setFilterCaseSensitivity(Qt::CaseInsensitive); proxy.setFilterFixedString(text); auto moveToIndex = [this](const QModelIndex &matchingIndex) { diff --git a/shop/shopservice.cpp b/shop/shopservice.cpp index 8af8217..c07425a 100644 --- a/shop/shopservice.cpp +++ b/shop/shopservice.cpp @@ -247,6 +247,11 @@ void ShopService::moveItems(QList items, VoucherPtr source, Vouc { erase(source); } + else + { + calculate(source); + update(source); + } tx.commit(); }