From bcc616d3b55bded8717321271b97595dbc62e3668b7d029a07f490a6b8564313 Mon Sep 17 00:00:00 2001 From: linuxero Date: Tue, 4 Feb 2025 09:41:17 +0100 Subject: [PATCH] Stale GUI deleted and menu buttons very attractive and sexy --- Gui/ApplicantBirthData.qml | 52 -------------------------- Gui/ApplicantContactData.qml | 64 -------------------------------- Gui/ApplicantMiniJob.qml | 19 ---------- Gui/ApplicantNationality.qml | 37 ------------------- Gui/ObjectsTable.qml | 2 +- Gui/TopBar.qml | 71 ++++++++++++++++++++++++++++++++---- qml.qrc | 4 -- 7 files changed, 65 insertions(+), 184 deletions(-) delete mode 100644 Gui/ApplicantBirthData.qml delete mode 100644 Gui/ApplicantContactData.qml delete mode 100644 Gui/ApplicantMiniJob.qml delete mode 100644 Gui/ApplicantNationality.qml diff --git a/Gui/ApplicantBirthData.qml b/Gui/ApplicantBirthData.qml deleted file mode 100644 index f9d0dac..0000000 --- a/Gui/ApplicantBirthData.qml +++ /dev/null @@ -1,52 +0,0 @@ -import QtQuick -import QtQuick.Controls -import QtQuick.Layouts - -Label -{ - text: qsTr("Geburtsname") -} -TextField -{ - id: birthname - Layout.fillWidth: true - - -} -Label -{ - text: qsTr("Geburtsdatum") -} -TextField -{ - id: birthday - Layout.fillWidth: true - placeholderText: qsTr("TT.MM.JJJJ") - validator: RegularExpressionValidator - - { - regularExpression: /((^|)(0[1-9]{1}|[1-2]{1}[0-9]{1}|3[0-1]))\.((^|)(0[1-9]{1}|1[0-2]{1}))\.((^|)(196[0-9]{1}|19[7-9]{1}[0-9]{1}|20[0-9]{2}))/ - } -} -Label -{ - text: qsTr("Geburtsort") -} -TextField -{ - id: placeofbirth - Layout.fillWidth: true - -} -Label -{ - text: qsTr("Geschlecht") -} - -ComboBox -{ - id: gender - Layout.fillWidth: true - editable: false - model: [qsTr("Mann"), qsTr("Frau"), qsTr("Divers")] -} diff --git a/Gui/ApplicantContactData.qml b/Gui/ApplicantContactData.qml deleted file mode 100644 index 3245d1a..0000000 --- a/Gui/ApplicantContactData.qml +++ /dev/null @@ -1,64 +0,0 @@ -import QtQuick -import QtQuick.Controls -import QtQuick.Layouts - -GridLayout -{ - id: contactData - columns: 2 - Label - { - text: qsTr("Straße") - Layout.alignment: Qt.AlignRight - } - TextField - { - id: street - Layout.fillWidth: true - } - Label - { - text: qsTr("PLZ") - Layout.alignment: Qt.AlignRight - } - RowLayout - { - ComboBox - { - id: postcode - Layout.fillWidth: true - } - - - Label - { - text: qsTr("Ort") - - } - ComboBox - { - id: city - Layout.fillWidth: true - } - } - Label - { - text: qsTr("Telefonnummer") - Layout.alignment: Qt.AlignRight - } - TextField - { - id: phonenumber - Layout.fillWidth: true - } - Label - { - text: qsTr("E-Mail") - Layout.alignment: Qt.AlignRight - } - TextField - { - id: email - Layout.fillWidth: true - } -} diff --git a/Gui/ApplicantMiniJob.qml b/Gui/ApplicantMiniJob.qml deleted file mode 100644 index 4b7770d..0000000 --- a/Gui/ApplicantMiniJob.qml +++ /dev/null @@ -1,19 +0,0 @@ -import QtQuick -import QtQuick.Controls -import QtQuick.Layouts - -GridLayout -{ - columns: 2 - Label - { - text: qsTr("Knappschaft") - } - - TextField - { - id: knappschaft - Layout.fillWidth: true - } -} - diff --git a/Gui/ApplicantNationality.qml b/Gui/ApplicantNationality.qml deleted file mode 100644 index 3528433..0000000 --- a/Gui/ApplicantNationality.qml +++ /dev/null @@ -1,37 +0,0 @@ -import QtQuick -import QtQuick.Controls -import QtQuick.Layouts - - CheckBox - { - Layout.columnSpan: 2 - text: qsTr("Arbeitserlaubnis") - } - Label - { - text: qsTr("Staatsangehörigkeit") - } - TextField - { - id: nationality - - } - Label - { - text: qsTr("Pass gültig bis") - } - TextField - { - id: pass - - } - Label - { - text: qsTr("Aufenthaltstitel gültig bis") - } - TextField - { - id: aufenthalt - - } - diff --git a/Gui/ObjectsTable.qml b/Gui/ObjectsTable.qml index c29f779..04b2372 100644 --- a/Gui/ObjectsTable.qml +++ b/Gui/ObjectsTable.qml @@ -112,7 +112,7 @@ Item Text { - text: model.display == null? "": model.display + text: model.display === null? "": model.display elide: Text.ElideRight width: parent.width height: parent.height diff --git a/Gui/TopBar.qml b/Gui/TopBar.qml index 45875e3..d2d0495 100644 --- a/Gui/TopBar.qml +++ b/Gui/TopBar.qml @@ -21,12 +21,23 @@ RowLayout id: dashBoard flat: true text: qsTr("Dashboard") - implicitWidth: dashBoard.implicitContentWidth + 10 + implicitWidth: abrechnung.implicitContentWidth + 10 + Layout.margins: 3 + background: Rectangle + { + border.width: dashBoard.activeFocus ? 2 : 1 + border.color: "#888" + radius: 4 + gradient: Gradient + { + GradientStop { position: 0 ; color: dashBoard.pressed ? "#000" : "#001" } + GradientStop { position: 1 ; color: dashBoard.pressed ? "#100" : "#000" } + } + } onClicked: { appLoader.source = "Dashboard.qml" } - } Button @@ -34,7 +45,19 @@ RowLayout id: kunden flat: true text: qsTr("Kunden") - implicitWidth: kunden.implicitContentWidth + 10 + implicitWidth: abrechnung.implicitContentWidth + 10 + Layout.margins: 3 + background: Rectangle + { + border.width: kunden.activeFocus ? 2 : 1 + border.color: "#888" + radius: 4 + gradient: Gradient + { + GradientStop { position: 0 ; color: kunden.pressed ? "#000" : "#001" } + GradientStop { position: 1 ; color: kunden.pressed ? "#100" : "#000" } + } + } onClicked: { // TODO: here we should call the model @@ -47,7 +70,19 @@ RowLayout id: objekt flat: true text: qsTr("Objekt") - implicitWidth: objekt.implicitContentWidth + 10 + implicitWidth: abrechnung.implicitContentWidth + 10 + Layout.margins: 3 + background: Rectangle + { + border.width: objekt.activeFocus ? 2 : 1 + border.color: "#888" + radius: 4 + gradient: Gradient + { + GradientStop { position: 0 ; color: objekt.pressed ? "#000" : "#001" } + GradientStop { position: 1 ; color: objekt.pressed ? "#100" : "#000" } + } + } onClicked: { appLoader.source = "ObjectTable.qml" @@ -60,7 +95,19 @@ RowLayout id: mitarbeiter flat: true text: qsTr("Mitarbeiter") - implicitWidth: mitarbeiter.implicitContentWidth + 10 + implicitWidth: abrechnung.implicitContentWidth + 10 + Layout.margins: 3 + background: Rectangle + { + border.width: mitarbeiter.activeFocus ? 2 : 1 + border.color: "#888" + radius: 4 + gradient: Gradient + { + GradientStop { position: 0 ; color: mitarbeiter.pressed ? "#000" : "#001" } + GradientStop { position: 1 ; color: mitarbeiter.pressed ? "#100" : "#000" } + } + } onClicked: { appLoader.source = "EmployeeTable.qml" @@ -73,6 +120,18 @@ RowLayout flat: true text: qsTr("Abrechnung") implicitWidth: abrechnung.implicitContentWidth + 10 + Layout.margins: 3 + background: Rectangle + { + border.width: abrechnung.activeFocus ? 2 : 1 + border.color: "#888" + radius: 4 + gradient: Gradient + { + GradientStop { position: 0 ; color: abrechnung.pressed ? "#000" : "#001" } + GradientStop { position: 1 ; color: abrechnung.pressed ? "#100" : "#000" } + } + } } Item @@ -88,8 +147,6 @@ RowLayout icon.color: "red" flat: true Layout.rightMargin: 9 - - } } diff --git a/qml.qrc b/qml.qrc index bc3469c..fd7dfe1 100644 --- a/qml.qrc +++ b/qml.qrc @@ -26,13 +26,9 @@ Gui/AddObjectEmployee.qml Gui/AddApplicant.qml Gui/ApplicantPersonalData.qml - Gui/ApplicantContactData.qml Gui/ApplicantBankData.qml - Gui/ApplicantNationality.qml Gui/ApplicantNationalInsurance.qml - Gui/ApplicantMiniJob.qml Gui/ApplicantVarious.qml - Gui/ApplicantBirthData.qml Gui/CustomersTable.qml Gui/CustomerDetails.qml Gui/ObjectsTable.qml