diff --git a/doc/GUI-Kunden.rnote b/doc/GUI-Kunden.rnote new file mode 100644 index 0000000..e124980 Binary files /dev/null and b/doc/GUI-Kunden.rnote differ diff --git a/doc/GUI-Mitarbeiter.rnote b/doc/GUI-Mitarbeiter.rnote index cd98a48..4379532 100644 Binary files a/doc/GUI-Mitarbeiter.rnote and b/doc/GUI-Mitarbeiter.rnote differ diff --git a/doc/GUI-Objekt.rnote b/doc/GUI-Objekt.rnote new file mode 100644 index 0000000..cdd3c9e Binary files /dev/null and b/doc/GUI-Objekt.rnote differ diff --git a/gui/SearchBar.qml b/gui/SearchBar.qml new file mode 100644 index 0000000..0c0bbd6 --- /dev/null +++ b/gui/SearchBar.qml @@ -0,0 +1,5 @@ +import QtQuick + +Item { + +} diff --git a/gui/TopBar.qml b/gui/TopBar.qml index 7d546da..c954919 100644 --- a/gui/TopBar.qml +++ b/gui/TopBar.qml @@ -27,6 +27,8 @@ import QtQuick.Layouts id: dashBoard flat: true text: qsTr("Dashboard") + implicitWidth: dashBoard.implicitContentWidth + 10 + } Button @@ -34,6 +36,7 @@ import QtQuick.Layouts id: kunden flat: true text: qsTr("Kunden") + implicitWidth: kunden.implicitContentWidth + 10 onClicked: { appLoader.source = "Tables.qml" @@ -45,6 +48,7 @@ import QtQuick.Layouts id: objekt flat: true text: qsTr("Objekt") + implicitWidth: objekt.implicitContentWidth + 10 } Button @@ -52,6 +56,7 @@ import QtQuick.Layouts id: mitarbeiter flat: true text: qsTr("Mitarbeiter") + implicitWidth: mitarbeiter.implicitContentWidth + 10 } Button @@ -59,6 +64,7 @@ import QtQuick.Layouts id: abrechnung flat: true text: qsTr("Abrechnung") + implicitWidth: abrechnung.implicitContentWidth + 10 } Item diff --git a/gui/main.qml b/gui/main.qml index 721ed59..a2fb219 100644 --- a/gui/main.qml +++ b/gui/main.qml @@ -16,7 +16,7 @@ ApplicationWindow { id:topBar - visible: if (bad_config) visible = false + visible: bad_config? false: true } Item { @@ -32,7 +32,7 @@ ApplicationWindow top: topBar.bottom bottom: parent.bottom } - source: bad_config? "firststart.qml":"Dashboard.qml" + source: bad_config? "firststart.qml": "Dashboard.qml" property alias window: appWindow } diff --git a/pyqcrm.pyproject b/pyqcrm.pyproject index 81632d6..8cc2db0 100644 --- a/pyqcrm.pyproject +++ b/pyqcrm.pyproject @@ -9,6 +9,7 @@ "js/qmldict.js", "lib/Vermasseln.py", "gui/TopBar.qml", - "gui/Tables.qml" + "gui/Tables.qml", + "gui/SearchBar.qml" ] }