did some cleanup

This commit is contained in:
Dorian Zedler 2020-01-25 12:01:10 +01:00
parent 35e4fdbca9
commit 93bab7cee8
190 changed files with 69 additions and 52657 deletions

View file

@ -37,8 +37,8 @@ HEADERS += \
headers/appstyle.h headers/appstyle.h
RESOURCES += \ RESOURCES += \
shared/shared.qrc \ resources/shared/shared.qrc \
qml/qml.qrc resources/qml/qml.qrc
# Additional import path used to resolve QML modules in Qt Creator's code model # Additional import path used to resolve QML modules in Qt Creator's code model
QML_IMPORT_PATH = QML_IMPORT_PATH =

View file

@ -1,111 +0,0 @@
import QtQuick 2.0
import QtQuick.Controls 2.1
import QtQuick.Controls.Material 2.1
Loader {
id: control
property QIconSource icon: QIconSource {}
property int fontPixelSize: height * 0.4
property string text
signal clicked
Connections {
target: icon
onNameChanged: {
control.syncProperties()
}
onColorChanged: {
control.syncProperties()
}
}
onTextChanged: {
control.syncProperties()
}
function syncProperties() {
if(control.status !== Loader.Ready) {
return
}
if(QtCompatiblityMode) {
control.item.text = control.text
control.item.font = control.font
if(control.fontPixelSize !== undefined) {
control.item.font.pixelSize = control.fontPixelSize
}
}
else {
control.item.icon.name = control.icon.name
control.item.icon.color = control.icon.color
control.item.icon.width = control.icon.width
control.item.icon.height = control.icon.height
}
}
onLoaded: {
control.syncProperties()
}
Component.onCompleted: {
if(QtCompatiblityMode) {
control.sourceComponent = ancientToolButtonCp
}
else {
control.sourceComponent = modernToolButtonCp
}
}
Connections {
target: control.item
onClicked: {
control.clicked()
}
}
Component {
id: ancientToolButtonCp
ToolButton {
id: tb
opacity: enabled ? 1.0 : 0.3
contentItem: Text {
text: tb.text
font.pixelSize: tb.height * 0.5
font.family: iconFont.name
color: app.style.style.textColor
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight
}
FontLoader {
id: iconFont
source: "qrc:/fonts/IconFont.otf"
}
}
}
Component {
id: modernToolButtonCp
ToolButton {
height: implicitHeight
width: implicitWidth
}
}
}

View file

@ -1,8 +0,0 @@
import QtQuick 2.0
QtObject {
property string name: ""
property int height
property int width
property color color: "black"
}

View file

@ -0,0 +1,31 @@
import QtQuick 2.0
import QtQuick.Controls 2.1
import QtQuick.Controls.Material 2.1
ToolButton {
id: tb
opacity: enabled ? 1.0 : 0.3
contentItem: Item {
Text {
anchors.centerIn: parent
anchors.horizontalCenterOffset: 3
text: tb.text
font.pixelSize: tb.height * 0.5
font.family: iconFont.name
color: app.style.style.textColor
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight
}
}
FontLoader {
id: iconFont
source: "qrc:/fonts/IconFont.otf"
}
}

View file

@ -64,24 +64,28 @@ ItemDelegate {
color: app.style.style.textColor color: app.style.style.textColor
} }
Image { Text {
id: forwardIcon
visible: control.showForwardIcon
anchors { anchors {
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
right: parent.right right: parent.right
rightMargin: 10 rightMargin: 10
} }
height: parent.height * 0.4 visible: control.showForwardIcon
rotation: 180 rotation: 180
text: "\u0082"
fillMode: Image.PreserveAspectFit font.pixelSize: parent.height * 0.4
font.family: iconFont.name
color: app.style.style.textColor
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight
}
source: app.style.style.backIcon FontLoader {
id: iconFont
source: "qrc:/fonts/IconFont.otf"
} }
} }

View file

@ -292,9 +292,6 @@ Page {
height: parent.height height: parent.height
icon.name: "delete"
icon.color: app.style.style.textColor
text: "\u0083" text: "\u0083"
onClicked: { onClicked: {

View file

@ -150,8 +150,6 @@ Page {
rightMargin: -width * 1.1 rightMargin: -width * 1.1
} }
icon.color: app.style.style.textColor
onClicked: { onClicked: {
if(state === "visible"){ if(state === "visible"){
state = "invisible" state = "invisible"
@ -168,7 +166,6 @@ Page {
name: "invisible" name: "invisible"
PropertyChanges { PropertyChanges {
target: passwordHideShow target: passwordHideShow
icon.name: "hide"
text: "\u0081" text: "\u0081"
} }
@ -181,7 +178,6 @@ Page {
name: "visible" name: "visible"
PropertyChanges { PropertyChanges {
target: passwordHideShow target: passwordHideShow
icon.name: "view"
text: "\u0080" text: "\u0080"
} }
PropertyChanges { PropertyChanges {

View file

@ -153,9 +153,6 @@ Page {
opacity: enabled ? 1:0.5 opacity: enabled ? 1:0.5
icon.name: "back"
icon.color: app.style.style.textColor
text: "\u0082"//"\u2039" text: "\u0082"//"\u2039"
onClicked: { onClicked: {
@ -197,9 +194,6 @@ Page {
visible: formStack.currentItem.title === "Vertretungsplan" visible: formStack.currentItem.title === "Vertretungsplan"
icon.name: "pdf"
icon.color: app.style.style.textColor
text: "\u0084"//"pdf ansehen" text: "\u0084"//"pdf ansehen"
onClicked: { onClicked: {

View file

@ -18,6 +18,5 @@
<file>Components/FannyDataListView.qml</file> <file>Components/FannyDataListView.qml</file>
<file>Components/ProgressCircle.qml</file> <file>Components/ProgressCircle.qml</file>
<file>Components/CompatibleToolButton.qml</file> <file>Components/CompatibleToolButton.qml</file>
<file>Components/QIconSource.qml</file>
</qresource> </qresource>
</RCC> </RCC>

View file

Before

Width:  |  Height:  |  Size: 1,012 B

After

Width:  |  Height:  |  Size: 1,012 B

View file

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View file

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View file

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

View file

Before

Width:  |  Height:  |  Size: 1,012 B

After

Width:  |  Height:  |  Size: 1,012 B

View file

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View file

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

View file

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

View file

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB

View file

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

View file

Before

Width:  |  Height:  |  Size: 98 KiB

After

Width:  |  Height:  |  Size: 98 KiB

View file

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB

View file

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB

View file

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

View file

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 67 KiB

View file

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 80 KiB

View file

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

View file

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

View file

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View file

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View file

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View file

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View file

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

View file

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

View file

Before

Width:  |  Height:  |  Size: 311 KiB

After

Width:  |  Height:  |  Size: 311 KiB

View file

Before

Width:  |  Height:  |  Size: 324 KiB

After

Width:  |  Height:  |  Size: 324 KiB

View file

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

View file

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

View file

@ -0,0 +1,18 @@
<RCC>
<qresource prefix="/">
<file>icons/FannyLogoDark.jpg</file>
<file>icons/FannyLogoLight.png</file>
<file>icons/TreffpunktFannyLogoDark.png</file>
<file>icons/TreffpunktFannyLogoLight.png</file>
<file>icons/logoutBlack.png</file>
<file>icons/logoutRed.png</file>
<file>icons/settings.png</file>
<file>icons/settingsBlack.png</file>
<file>icons/sheute.png</file>
<file>icons/smorgen.png</file>
<file>icons/TreffpunktFannyLogo.png</file>
<file>graphics/Icon Big square.png</file>
<file>graphics/favicon.png</file>
<file>fonts/IconFont.otf</file>
</qresource>
</RCC>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 129 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 100 KiB

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show more