ITsolved/prodejna
2
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

Build system changed to Cmake, ORM changed to QxORM, Qt6 compatibility.

Browse Source
This commit is contained in:
Josef Rokos
2023-04-28 22:25:29 +02:00
parent 30e6180c82
commit d699ce79f7
481 changed files with 2310 additions and 130206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shop/settings/shopsettingsform.cpp
+3 -5
View File
@@ -6,9 +6,7 @@
#include <QFileDialog>
#include <QDragEnterEvent>
#include <QDebug>
#include "shopservice.h"
#include "shop-odb.hxx"
#include "../shopservice.h"
ShopSettingsForm::ShopSettingsForm(QWidget *parent) :
FormBinder<ShopSettings>(parent),
@@ -58,7 +56,7 @@ ShopSettingsForm::ShopSettingsForm(QWidget *parent) :
<< ComboData(Enums::SECOND_LOWER, tr("Second lower"));
registerBinding(ui->defaultVat, listVatTypes);
m_itemModel = new AutoTableModel<ShopItem>();
m_itemModel = new AutoTableModel<IShopItem>(this);
}
ShopSettingsForm::~ShopSettingsForm()
@@ -99,7 +97,7 @@ void ShopSettingsForm::drawButtons()
});
connect(btn, &FavButton::itemDropped, [this, btn](){
ShopItemPtr item = m_itemModel->itemFromIndex(ui->tableItems->currentIndex());
IShopItemPtr item = m_itemModel->itemFromIndex(ui->tableItems->currentIndex());
FavoritItemPtr favItem = QSharedPointer<FavoritItem>(new FavoritItem);
favItem->setFavButtonName(btn->objectName());
favItem->setName(item->name());
shop/settings/shopsettingsform.h
+6 -6
View File
@@ -7,9 +7,9 @@
#include <QMap>
#include "shopsettings.h"
#include <core.h>
#include "shopitem.h"
#include "data/favorititem.h"
#include "favbutton.h"
#include "../shopitem.h"
#include "../data/favorititem.h"
#include "../favbutton.h"
namespace Ui {
class ShopSettingsForm;
@@ -25,10 +25,10 @@ public:
private:
Ui::ShopSettingsForm *ui;
AutoTableModel<ShopItem> *m_itemModel;
int m_favBtnRows;
AutoTableModel<IShopItem> *m_itemModel;
/*int m_favBtnRows;
int m_favBtnCols;
int m_favBtnSize;
int m_favBtnSize;*/
QMap<QString, FavoritItemPtr> m_btnMap;
void drawButtons();
shop/settings/shopsettingsform.ui
+16 -1
View File
@@ -17,7 +17,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>3</number>
<number>0</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
@@ -83,6 +83,9 @@
<item row="0" column="0" colspan="2">
<widget class="QWidget" name="widget_4" native="true">
<layout class="QFormLayout" name="formLayout_3">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
@@ -126,6 +129,9 @@
<string>Printer</string>
</attribute>
<layout class="QFormLayout" name="formLayout_2">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
@@ -175,6 +181,9 @@
<bool>false</bool>
</property>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
@@ -284,6 +293,9 @@
<string>Rounding</string>
</property>
<layout class="QFormLayout" name="formLayout_4">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
@@ -342,6 +354,9 @@
<bool>false</bool>
</property>
<layout class="QFormLayout" name="formLayout_5">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_15">
<property name="text">