- Added better icons for Qt 5.9 compatibility mode

This commit is contained in:
Dorian Zedler 2019-12-12 17:23:10 +01:00
parent ccc962505d
commit 86e7273fc4
16 changed files with 52310 additions and 24 deletions

View file

@ -7,7 +7,7 @@ Loader {
property QIconSource icon: QIconSource {} property QIconSource icon: QIconSource {}
property int fontPixelSize property int fontPixelSize: height * 0.4
property string text property string text
@ -15,9 +15,14 @@ Loader {
Connections { Connections {
target: icon target: icon
onNameChanged: { onNameChanged: {
control.syncProperties() control.syncProperties()
} }
onColorChanged: {
control.syncProperties()
}
} }
onTextChanged: { onTextChanged: {
@ -78,12 +83,19 @@ Loader {
contentItem: Text { contentItem: Text {
text: tb.text text: tb.text
font: tb.font font.pixelSize: tb.height * 0.5
font.family: iconFont.name
color: app.style.style.textColor color: app.style.style.textColor
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight elide: Text.ElideRight
} }
FontLoader {
id: iconFont
source: "qrc:/fonts/IconFont.otf"
}
} }
} }

View file

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

View file

@ -293,8 +293,9 @@ Page {
height: parent.height height: parent.height
icon.name: "delete" icon.name: "delete"
icon.color: app.style.style.textColor
text: "X" text: "\u0083"
onClicked: { onClicked: {
deleteAnimation.start() deleteAnimation.start()

View file

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

View file

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

View file

@ -37,13 +37,6 @@ ApplicationWindow {
anchors.fill: parent 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 property QtObject style: style
state: serverConn.state state: serverConn.state
@ -106,8 +99,7 @@ ApplicationWindow {
FontLoader { FontLoader {
id: fontAwesome id: fontAwesome
name: "fontawesome" source: "qrc:/fonts/IconFont.otf"
source: "qrc:/fonts/fontawesome-webfont.ttf"
} }
function getErrorInfo(errorCode) { 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@3/view.png</file>
<file>icons/ibmaterial/20x20@4/hide.png</file> <file>icons/ibmaterial/20x20@4/hide.png</file>
<file>icons/ibmaterial/20x20@4/view.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> </qresource>
</RCC> </RCC>

View file

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