Merge branch 'master' of https://git.bukova.info/repos/git/prodejna

shop/paydvouchersdialog.cpp

@@ -2,6 +2,7 @@
 #include "ui_paydvouchersdialog.h"
 
 #include <QFileDialog>
+#include <QScroller>
 
 #include "receiptgenerator.h"
 #include "shopservice.h"
@@ -48,6 +49,9 @@ PaydVouchersDialog::PaydVouchersDialog(QWidget *parent) :
     m_voucherModel->setData(srv.paiedVouchers());
     ui->tableVouchers->sortByColumn(0,Qt::AscendingOrder);
 
+    QScroller::grabGesture(ui->tableVouchers, QScroller::LeftMouseButtonGesture);
+    QScroller::grabGesture(ui->tableItems, QScroller::LeftMouseButtonGesture);
+
     connect(ui->tableVouchers->selectionModel(), &QItemSelectionModel::currentRowChanged, [this, &srv](const QModelIndex &current, const QModelIndex &) {
         QSharedPointer<Voucher> voucher = m_voucherModel->itemFromIndex(current);
         srv.loadItems(voucher);

shop/shopform.cpp

@@ -13,6 +13,7 @@
 #include <QSharedPointer>
 #include <QSortFilterProxyModel>
 #include <QMessageBox>
+#include <QScroller>
 #include "data/favorititem.h"
 #include "favbutton.h"
 
@@ -127,6 +128,10 @@ void ShopForm::loadLast()
     ui->commodityTable->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
     ui->commodityTable->setColumnHidden(4, true);
     ui->commodityTable->setColumnHidden(2, true);
+    ui->commodityTable->setColumnWidth(3, 90);
+
+    QScroller::grabGesture(ui->commodityTable, QScroller::LeftMouseButtonGesture);
+    QScroller::grabGesture(ui->actualReceipt, QScroller::LeftMouseButtonGesture);
 
     if (srv.isEetEnabled())
     {