Merge remote-tracking branch 'origin/master'

This commit is contained in:
dorian 2020-01-19 16:34:18 +01:00
commit a3c24d782c
16 changed files with 52305 additions and 24 deletions

View file

@ -7,7 +7,7 @@ Loader {
property QIconSource icon: QIconSource {}
property int fontPixelSize
property int fontPixelSize: height * 0.4
property string text
@ -15,6 +15,7 @@ Loader {
Connections {
target: icon
onNameChanged: {
control.syncProperties()
}
@ -82,12 +83,19 @@ Loader {
contentItem: Text {
text: tb.text
font: tb.font
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"
}
}
}

View file

@ -90,7 +90,7 @@ FannyDataListView {
wrapMode: Label.Wrap
text: mainDish === ""&& mainDishLa === "" && garnish === "" ? "Aktuell keine Daten":mainDish
text: mainDish === "" && mainDishVeg === "" && garnish === "" ? "Aktuell keine Daten":mainDish
}
Rectangle {

View file

@ -295,7 +295,7 @@ Page {
icon.name: "delete"
icon.color: app.style.style.textColor
text: "X"
text: "\u0083"
onClicked: {
deleteAnimation.start()

View file

@ -54,16 +54,16 @@ Page {
Image {
id: bigLogo
source: "qrc:/graphics/images/FannyIcon.png"
source: "qrc:/graphics/favicon.png"
anchors {
left: parent.left
right: parent.right
margins: height * 0.2
}
height: parent.height * 0.6
fillMode: Image.PreserveAspectFit
smooth: true
}
@ -89,7 +89,6 @@ Page {
onLinkActivated: {
Qt.openUrlExternally(link)
}
}
}
@ -166,7 +165,7 @@ Page {
PropertyChanges {
target: passwordHideShow
icon.name: "hide"
text: "show"
text: "\u0081"
}
PropertyChanges {
@ -179,7 +178,7 @@ Page {
PropertyChanges {
target: passwordHideShow
icon.name: "view"
text: "hide"
text: "\u0080"
}
PropertyChanges {
target: tipasswd

View file

@ -156,8 +156,7 @@ Page {
icon.name: "back"
icon.color: app.style.style.textColor
text: "\u2039"
fontPixelSize: height * 0.7
text: "\u0082"//"\u2039"
onClicked: {
if(!formStack.currentItem.locked){
@ -201,7 +200,7 @@ Page {
icon.name: "pdf"
icon.color: app.style.style.textColor
text: "pdf ansehen"
text: "\u0084"//"pdf ansehen"
onClicked: {
if(formStack.currentItem.pdfAction !== undefined) {

View file

@ -37,13 +37,6 @@ ApplicationWindow {
anchors.fill: parent
property bool is_error
property string error
property string textColor: "black" // "#424753"
property string backgroundColor: "white"
property string toolbarColor: "#312f38"
property QtObject style: style
state: serverConn.state
@ -106,8 +99,7 @@ ApplicationWindow {
FontLoader {
id: fontAwesome
name: "fontawesome"
source: "qrc:/fonts/fontawesome-webfont.ttf"
source: "qrc:/fonts/IconFont.otf"
}
function getErrorInfo(errorCode) {

Binary file not shown.

File diff suppressed because it is too large Load diff

Binary file not shown.

BIN
shared/fonts/IconFont.otf Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -98,5 +98,10 @@
<file>icons/ibmaterial/20x20@3/view.png</file>
<file>icons/ibmaterial/20x20@4/hide.png</file>
<file>icons/ibmaterial/20x20@4/view.png</file>
<file>fonts/fontawesome.otf</file>
<file>graphics/Icon Big square.png</file>
<file>graphics/favicon.png</file>
<file>fonts/FontAwesomeCutsom.otf</file>
<file>fonts/IconFont.otf</file>
</qresource>
</RCC>

View file

@ -45,10 +45,9 @@
int main(int argc, char *argv[])
{
AppSettings * pAppSettings = new AppSettings();
// ServerConn * pServerConn = new ServerConn();
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
//QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
//QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
QGuiApplication app(argc, argv);