Compare commits
3 Commits
fadd3d1b9e
...
8f6efac11e
| Author | SHA256 | Date | |
|---|---|---|---|
| 8f6efac11e | |||
| d6034a5299 | |||
| 15b14387df |
@@ -142,7 +142,7 @@ Item
|
||||
if (db['database']['DB_HOST'] === '' || db['database']['DB_PORT'] === '' ||
|
||||
db['database']['DB_NAME'] === '' || db['database']['DB_USER'] === '' ||
|
||||
db['database']['DB_PASS'] === '');
|
||||
else config.saveDbConf(company)
|
||||
else config.saveDbConf(db)
|
||||
}
|
||||
|
||||
function updateCompanyInfo()
|
||||
|
||||
@@ -2,6 +2,7 @@ import QtQuick
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
|
||||
|
||||
ColumnLayout
|
||||
{
|
||||
id: topBar
|
||||
@@ -14,6 +15,10 @@ ColumnLayout
|
||||
|
||||
|
||||
}
|
||||
ButtonGroup
|
||||
{
|
||||
id: buttonBar
|
||||
}
|
||||
|
||||
BarButton
|
||||
{
|
||||
@@ -25,7 +30,7 @@ ColumnLayout
|
||||
Layout.margins: 3
|
||||
Layout.topMargin: Dimensions.s
|
||||
icon.source: "qrc:/images/dash.svg"
|
||||
|
||||
ButtonGroup.group: buttonBar
|
||||
// background: Rectangle
|
||||
// {
|
||||
// id: dashiBackie
|
||||
@@ -41,6 +46,8 @@ ColumnLayout
|
||||
onClicked:
|
||||
{
|
||||
appLoader.source = "Dashboard.qml"
|
||||
|
||||
|
||||
// dashiBackie.border.width = 2
|
||||
// kundiBackie.border.width = 1
|
||||
// mitoBackie.border.width = 1
|
||||
@@ -58,7 +65,7 @@ ColumnLayout
|
||||
implicitHeight: 90
|
||||
Layout.margins: 3
|
||||
icon.source: "qrc:/images/customer.svg"
|
||||
|
||||
ButtonGroup.group: buttonBar
|
||||
// background: Rectangle
|
||||
// {
|
||||
// id: kundiBackie
|
||||
@@ -92,7 +99,7 @@ ColumnLayout
|
||||
implicitHeight: 90
|
||||
Layout.margins: 3
|
||||
icon.source: "qrc:/images/object.svg"
|
||||
|
||||
ButtonGroup.group: buttonBar
|
||||
// background: Rectangle
|
||||
// {
|
||||
// id: objBackie
|
||||
@@ -127,7 +134,7 @@ ColumnLayout
|
||||
Layout.margins: 3
|
||||
icon.source: "qrc:/images/employee.svg"
|
||||
|
||||
|
||||
ButtonGroup.group: buttonBar
|
||||
// background: Rectangle
|
||||
// {
|
||||
// id: mitoBackie
|
||||
@@ -160,7 +167,7 @@ ColumnLayout
|
||||
implicitHeight: 90
|
||||
Layout.margins: 3
|
||||
icon.source: "qrc:/images/offer.svg"
|
||||
|
||||
ButtonGroup.group: buttonBar
|
||||
// background: Rectangle
|
||||
// {
|
||||
// id: offersBackie
|
||||
@@ -194,7 +201,7 @@ ColumnLayout
|
||||
implicitHeight: 90
|
||||
Layout.margins: 3
|
||||
icon.source: "qrc:/images/invoice.svg"
|
||||
|
||||
ButtonGroup.group: buttonBar
|
||||
// background: Rectangle
|
||||
// {
|
||||
// id: invoBackie
|
||||
@@ -223,7 +230,7 @@ ColumnLayout
|
||||
implicitWidth: 90
|
||||
implicitHeight: 90
|
||||
|
||||
|
||||
checkable: false
|
||||
flat: true
|
||||
Layout.bottomMargin: Dimensions.s
|
||||
onClicked: mainMenu.open()
|
||||
|
||||
@@ -21,12 +21,6 @@ ApplicationWindow
|
||||
{
|
||||
|
||||
id:topBar
|
||||
anchors
|
||||
{
|
||||
rightMargin: 9
|
||||
leftMargin: 9
|
||||
}
|
||||
|
||||
visible: bad_config || !db_con ? false: true
|
||||
}
|
||||
|
||||
|
||||
@@ -7,22 +7,19 @@ T.ComboBox {
|
||||
id: control
|
||||
|
||||
font: Typography.body
|
||||
implicitHeight: implicitContentHeight + topInset + bottomInset
|
||||
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
|
||||
implicitContentHeight + topPadding + bottomPadding,
|
||||
implicitIndicatorHeight + topPadding + bottomPadding)
|
||||
|
||||
|
||||
background: Rectangle {
|
||||
border.color: Colors.interactive
|
||||
border.width: 1
|
||||
color: Colors.mantle
|
||||
height: parent.height
|
||||
radius: Dimensions.radius
|
||||
width: parent.width
|
||||
}
|
||||
contentItem: T.TextField {
|
||||
id: test
|
||||
autoScroll: control.editable
|
||||
color: Colors.foreground
|
||||
enabled: control.editable
|
||||
|
||||
font: Typography.body
|
||||
implicitHeight: Typography.body.pointSize + topPadding + bottomPadding
|
||||
implicitHeight: Typography.body.pixelSize + topPadding + bottomPadding
|
||||
inputMethodHints: control.inputMethodHints
|
||||
padding: Dimensions.m
|
||||
readOnly: control.down
|
||||
@@ -30,23 +27,44 @@ T.ComboBox {
|
||||
text: control.editable ? control.editText : control.displayText
|
||||
validator: control.validator
|
||||
width: control.width - indicator.width
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
}
|
||||
delegate: MenuItem {
|
||||
id: menuItem
|
||||
background: Rectangle {
|
||||
border.color: Colors.interactive
|
||||
border.width: 1
|
||||
color: Colors.mantle
|
||||
// height: parent.height
|
||||
radius: Dimensions.radius
|
||||
width: parent.width
|
||||
}
|
||||
// delegate: MenuItem {
|
||||
// id: menuItem
|
||||
|
||||
required property int index
|
||||
// required property int index
|
||||
// required property var model
|
||||
|
||||
// highlighted: control.highlightedIndex === index
|
||||
// hoverEnabled: control.hoverEnabled
|
||||
// text: model[control.textRole]
|
||||
// width: control.width
|
||||
|
||||
// background: Rectangle {
|
||||
// color: menuItem.down || menuItem.highlighted ? Colors.primary : "transparent"
|
||||
// height: menuItem.height
|
||||
// width: menuItem.width
|
||||
// }
|
||||
// }
|
||||
delegate: ItemDelegate {
|
||||
required property var model
|
||||
required property int index
|
||||
|
||||
width: ListView.view.width
|
||||
text: model[control.textRole]
|
||||
// palette.text: control.palette.text
|
||||
// palette.highlightedText: control.palette.highlightedText
|
||||
// font.weight: control.currentIndex === index ? Font.DemiBold : Font.Normal
|
||||
highlighted: control.highlightedIndex === index
|
||||
hoverEnabled: control.hoverEnabled
|
||||
text: model[control.textRole]
|
||||
width: control.width
|
||||
|
||||
background: Rectangle {
|
||||
color: menuItem.down || menuItem.highlighted ? Colors.primary : "transparent"
|
||||
height: menuItem.height
|
||||
width: menuItem.width
|
||||
}
|
||||
}
|
||||
indicator: Rectangle {
|
||||
id: indicator
|
||||
@@ -107,4 +125,8 @@ T.ComboBox {
|
||||
}
|
||||
}
|
||||
}
|
||||
Component.onCompleted:
|
||||
{
|
||||
console.log(control.implicitContentHeight)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,13 +11,15 @@ T.TextField
|
||||
radius: Dimensions.radius
|
||||
border.width: !control.focus ? 1 : 2
|
||||
border.color: Colors.interactive
|
||||
height: 47
|
||||
height: control.implicitHeight
|
||||
}
|
||||
|
||||
color: Colors.foreground
|
||||
implicitHeight: background.height
|
||||
implicitHeight: Typography.body.pixelSize + topPadding + bottomPadding
|
||||
placeholderTextColor: Colors.interactive
|
||||
font: Typography.body
|
||||
padding: Dimensions.s
|
||||
padding: Dimensions.m
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
<svg data-slot="icon" fill="none" stroke-width="1.5" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
|
||||
<svg data-slot="icon" fill="none" stroke-width="2" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M12 7.5h1.5m-1.5 3h1.5m-7.5 3h7.5m-7.5 3h7.5m3-9h3.375c.621 0 1.125.504 1.125 1.125V18a2.25 2.25 0 0 1-2.25 2.25M16.5 7.5V18a2.25 2.25 0 0 0 2.25 2.25M16.5 7.5V4.875c0-.621-.504-1.125-1.125-1.125H4.125C3.504 3.75 3 4.254 3 4.875V18a2.25 2.25 0 0 0 2.25 2.25h13.5M6 7.5h3v3H6v-3Z"></path>
|
||||
</svg>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 502 B After Width: | Height: | Size: 501 B |
@@ -1,3 +1,3 @@
|
||||
<svg data-slot="icon" fill="none" stroke-width="1.5" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
|
||||
<svg data-slot="icon" fill="none" stroke-width="2" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M18 18.72a9.094 9.094 0 0 0 3.741-.479 3 3 0 0 0-4.682-2.72m.94 3.198.001.031c0 .225-.012.447-.037.666A11.944 11.944 0 0 1 12 21c-2.17 0-4.207-.576-5.963-1.584A6.062 6.062 0 0 1 6 18.719m12 0a5.971 5.971 0 0 0-.941-3.197m0 0A5.995 5.995 0 0 0 12 12.75a5.995 5.995 0 0 0-5.058 2.772m0 0a3 3 0 0 0-4.681 2.72 8.986 8.986 0 0 0 3.74.477m.94-3.197a5.971 5.971 0 0 0-.94 3.197M15 6.75a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm6 3a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Zm-13.5 0a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Z"></path>
|
||||
</svg>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 734 B After Width: | Height: | Size: 733 B |
@@ -1,3 +1,3 @@
|
||||
<svg data-slot="icon" fill="none" stroke-width="1.5" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
|
||||
<svg data-slot="icon" fill="none" stroke-width="2" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M6.429 9.75 2.25 12l4.179 2.25m0-4.5 5.571 3 5.571-3m-11.142 0L2.25 7.5 12 2.25l9.75 5.25-4.179 2.25m0 0L21.75 12l-4.179 2.25m0 0 4.179 2.25L12 21.75 2.25 16.5l4.179-2.25m11.142 0-5.571 3-5.571-3"></path>
|
||||
</svg>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 419 B After Width: | Height: | Size: 418 B |
@@ -1,3 +1,3 @@
|
||||
<svg data-slot="icon" fill="none" stroke-width="1.5" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
|
||||
<svg data-slot="icon" fill="none" stroke-width="2" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M15 9h3.75M15 12h3.75M15 15h3.75M4.5 19.5h15a2.25 2.25 0 0 0 2.25-2.25V6.75A2.25 2.25 0 0 0 19.5 4.5h-15a2.25 2.25 0 0 0-2.25 2.25v10.5A2.25 2.25 0 0 0 4.5 19.5Zm6-10.125a1.875 1.875 0 1 1-3.75 0 1.875 1.875 0 0 1 3.75 0Zm1.294 6.336a6.721 6.721 0 0 1-3.17.789 6.721 6.721 0 0 1-3.168-.789 3.376 3.376 0 0 1 6.338 0Z"></path>
|
||||
</svg>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 540 B After Width: | Height: | Size: 539 B |
@@ -1,3 +1,3 @@
|
||||
<svg data-slot="icon" fill="none" stroke-width="1.5" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
|
||||
<svg data-slot="icon" fill="none" stroke-width="2" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M21 12a2.25 2.25 0 0 0-2.25-2.25H15a3 3 0 1 1-6 0H5.25A2.25 2.25 0 0 0 3 12m18 0v6a2.25 2.25 0 0 1-2.25 2.25H5.25A2.25 2.25 0 0 1 3 18v-6m18 0V9M3 12V9m18 0a2.25 2.25 0 0 0-2.25-2.25H5.25A2.25 2.25 0 0 0 3 9m18 0V6a2.25 2.25 0 0 0-2.25-2.25H5.25A2.25 2.25 0 0 0 3 6v3"></path>
|
||||
</svg>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 491 B After Width: | Height: | Size: 490 B |
@@ -1,3 +1,3 @@
|
||||
<svg data-slot="icon" fill="none" stroke-width="1.5" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
|
||||
<svg data-slot="icon" fill="none" stroke-width="2" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M2.25 21h19.5m-18-18v18m10.5-18v18m6-13.5V21M6.75 6.75h.75m-.75 3h.75m-.75 3h.75m3-6h.75m-.75 3h.75m-.75 3h.75M6.75 21v-3.375c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21M3 3h12m-.75 4.5H21m-3.75 3.75h.008v.008h-.008v-.008Zm0 3h.008v.008h-.008v-.008Zm0 3h.008v.008h-.008v-.008Z"></path>
|
||||
</svg>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 522 B After Width: | Height: | Size: 521 B |
@@ -1,3 +1,3 @@
|
||||
<svg data-slot="icon" fill="none" stroke-width="1.5" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
|
||||
<svg data-slot="icon" fill="none" stroke-width="2" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M6 6.878V6a2.25 2.25 0 0 1 2.25-2.25h7.5A2.25 2.25 0 0 1 18 6v.878m-12 0c.235-.083.487-.128.75-.128h10.5c.263 0 .515.045.75.128m-12 0A2.25 2.25 0 0 0 4.5 9v.878m13.5-3A2.25 2.25 0 0 1 19.5 9v.878m0 0a2.246 2.246 0 0 0-.75-.128H5.25c-.263 0-.515.045-.75.128m15 0A2.25 2.25 0 0 1 21 12v6a2.25 2.25 0 0 1-2.25 2.25H5.25A2.25 2.25 0 0 1 3 18v-6c0-.98.626-1.813 1.5-2.122"></path>
|
||||
</svg>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 590 B After Width: | Height: | Size: 589 B |
Reference in New Issue
Block a user