From 106628b6d045d4245e051a1f523778456337aa7f Mon Sep 17 00:00:00 2001 From: dorian Date: Sun, 9 Jun 2019 13:32:52 +0200 Subject: [PATCH] - minor bug fixes - moved icons to QIcon - moved buttons in top bar to ToolButton --- android-sources/AndroidManifest.xml | 2 +- blueROCK.pro | 9 +- resources/qml/Components/FancyButton.qml | 47 +++++----- resources/qml/Components/PullRefresher.qml | 39 +++----- resources/qml/Widgets/CalendarWidget.qml | 83 ++---------------- resources/qml/Widgets/RegistrationWidget.qml | 42 +-------- resources/qml/Widgets/ResultWidget.qml | 42 +-------- resources/qml/Widgets/StartlistWidget.qml | 44 ++-------- resources/qml/main.qml | 41 ++------- .../shared/icons/bluerock/20x20/back.png | Bin 0 -> 220 bytes .../shared/icons/bluerock/20x20/calendar.png | Bin 0 -> 431 bytes resources/shared/icons/bluerock/20x20/cup.png | Bin 0 -> 379 bytes .../shared/icons/bluerock/20x20/drawer.png | Bin 0 -> 123 bytes .../shared/icons/bluerock/20x20/menu.png | Bin 0 -> 123 bytes .../shared/icons/bluerock/20x20@2/back.png | Bin 0 -> 289 bytes .../icons/bluerock/20x20@2/calendar.png | Bin 0 -> 672 bytes .../shared/icons/bluerock/20x20@2/cup.png | Bin 0 -> 778 bytes .../shared/icons/bluerock/20x20@2/drawer.png | Bin 0 -> 126 bytes .../shared/icons/bluerock/20x20@2/menu.png | Bin 0 -> 158 bytes .../shared/icons/bluerock/20x20@3/back.png | Bin 0 -> 351 bytes .../icons/bluerock/20x20@3/calendar.png | Bin 0 -> 888 bytes .../shared/icons/bluerock/20x20@3/cup.png | Bin 0 -> 1104 bytes .../shared/icons/bluerock/20x20@3/drawer.png | Bin 0 -> 130 bytes .../shared/icons/bluerock/20x20@3/menu.png | Bin 0 -> 193 bytes .../shared/icons/bluerock/20x20@4/back.png | Bin 0 -> 452 bytes .../icons/bluerock/20x20@4/calendar.png | Bin 0 -> 790 bytes .../shared/icons/bluerock/20x20@4/cup.png | Bin 0 -> 1359 bytes .../shared/icons/bluerock/20x20@4/drawer.png | Bin 0 -> 131 bytes .../shared/icons/bluerock/20x20@4/menu.png | Bin 0 -> 223 bytes resources/shared/icons/bluerock/index.theme | 24 +++++ resources/shared/shared.qrc | 25 ++++++ sources/main.cpp | 4 + 32 files changed, 122 insertions(+), 280 deletions(-) create mode 100644 resources/shared/icons/bluerock/20x20/back.png create mode 100644 resources/shared/icons/bluerock/20x20/calendar.png create mode 100644 resources/shared/icons/bluerock/20x20/cup.png create mode 100644 resources/shared/icons/bluerock/20x20/drawer.png create mode 100644 resources/shared/icons/bluerock/20x20/menu.png create mode 100644 resources/shared/icons/bluerock/20x20@2/back.png create mode 100644 resources/shared/icons/bluerock/20x20@2/calendar.png create mode 100644 resources/shared/icons/bluerock/20x20@2/cup.png create mode 100644 resources/shared/icons/bluerock/20x20@2/drawer.png create mode 100644 resources/shared/icons/bluerock/20x20@2/menu.png create mode 100644 resources/shared/icons/bluerock/20x20@3/back.png create mode 100644 resources/shared/icons/bluerock/20x20@3/calendar.png create mode 100644 resources/shared/icons/bluerock/20x20@3/cup.png create mode 100644 resources/shared/icons/bluerock/20x20@3/drawer.png create mode 100644 resources/shared/icons/bluerock/20x20@3/menu.png create mode 100644 resources/shared/icons/bluerock/20x20@4/back.png create mode 100644 resources/shared/icons/bluerock/20x20@4/calendar.png create mode 100644 resources/shared/icons/bluerock/20x20@4/cup.png create mode 100644 resources/shared/icons/bluerock/20x20@4/drawer.png create mode 100644 resources/shared/icons/bluerock/20x20@4/menu.png create mode 100644 resources/shared/icons/bluerock/index.theme diff --git a/android-sources/AndroidManifest.xml b/android-sources/AndroidManifest.xml index d6d2aa8..7b7d720 100644 --- a/android-sources/AndroidManifest.xml +++ b/android-sources/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/blueROCK.pro b/blueROCK.pro index b71e460..e49c8e5 100644 --- a/blueROCK.pro +++ b/blueROCK.pro @@ -22,7 +22,10 @@ SOURCES += \ sources/serverconn.cpp RESOURCES += resources/qml/qml.qrc \ - resources/shared/shared.qrc + resources/shared/shared.qrc \ + #resources/shared/icons/bluerock/index.theme \ + #$$files(resources/shared/icons/*.png, true) + # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = @@ -40,4 +43,6 @@ HEADERS += \ DISTFILES += \ CHANGELOG.md \ - android-sources/AndroidManifest.xml + android-sources/AndroidManifest.xml \ + resources/shared/icons/bluerock/index.theme \ + $$files(resources/shared/icons/*.png, true) diff --git a/resources/qml/Components/FancyButton.qml b/resources/qml/Components/FancyButton.qml index 568058c..ce20aee 100644 --- a/resources/qml/Components/FancyButton.qml +++ b/resources/qml/Components/FancyButton.qml @@ -20,7 +20,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.4 import QtGraphicalEffects 1.0 -Button { +ToolButton { id: control property string image @@ -33,36 +33,19 @@ Button { property double glowScale: 0.75 property double glowOpacity: 1 - scale: control.pressed ? 0.8:1 - - Behavior on scale { - PropertyAnimation { - duration: 100 - } - } - Behavior on backgroundColor { ColorAnimation { duration: 200 } } - contentItem: Text { - visible: false - } - - Text { - id: conetntText - text: qsTr(control.text) - anchors.centerIn: parent - font: parent.font - color: control.textColor - opacity: control.enabled ? 1:0.4 - } - - background: Item { + contentItem: Item { id: controlBackgroundContainer + anchors.fill: parent + + opacity: 1 + RectangularGlow { id: effect glowRadius: control.glowRadius @@ -84,7 +67,7 @@ Button { radius: height * 0.5 - color: control.backgroundColor + color: control.down ? Qt.darker(control.backgroundColor, 1.03) : control.backgroundColor Image { id: buttonIcon @@ -100,7 +83,23 @@ Button { scale: control.imageScale } + + Behavior on color { + ColorAnimation { + duration: 100 + } + } } } + Text { + id: conetntText + text: qsTr(control.text) + anchors.centerIn: parent + font: parent.font + color: control.textColor + opacity: control.enabled ? 1:0.4 + } + + } diff --git a/resources/qml/Components/PullRefresher.qml b/resources/qml/Components/PullRefresher.qml index f5cd304..16d6dc2 100644 --- a/resources/qml/Components/PullRefresher.qml +++ b/resources/qml/Components/PullRefresher.qml @@ -1,21 +1,3 @@ -/* - blueROCK - for digital rock - Copyright (C) 2019 Dorian Zedler - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - import QtQuick 2.9 import QtQuick.Controls 2.4 import QtGraphicalEffects 1.0 @@ -33,7 +15,7 @@ Item { property int preRefreshDelay: 1000 // delay before reload funcion is called property int refreshPosition: height * 1.2 // position of the item when refreshing - property int dragOutPosition: height * 2 // position of the item when starting to refresh + property int dragOutPosition: height * 1.8 // position of the item when starting to refresh property color backgroundColor: "white" // color for the pre-defined background property color pullIndicatorColor: "black" // color for the pre-defined pull indicator @@ -87,7 +69,7 @@ Item { var lineWidth = 2 var progress = drawProgress - + console.log(progress) // modify all values to math the progress arrowHeight = arrowHeight * progress @@ -147,14 +129,15 @@ Item { anchors { top: control.target.top horizontalCenter: control.target.horizontalCenter - topMargin: control.position - height * 1.1 + topMargin: control.position - height } onUserPositionChanged: { - if(control.state === "idle" && userPosition >= control.dragOutPosition){ + console.log(userPosition) + if(control.state === "idle" && userPosition >= control.dragOutPosition * 0.9){ control.state = "ready" } - else if(control.state === "ready" && userPosition < control.dragOutPosition){ + else if(control.state === "ready" && userPosition < control.dragOutPosition * 0.9){ control.state = "refreshing" preRefreshTimer.start() } @@ -197,7 +180,7 @@ Item { Behavior on minimumPosition { enabled: control.state !== "hidden" && control.state !== "idle" NumberAnimation { - duration: 200 + duration: 100 } } @@ -228,7 +211,7 @@ Item { PropertyChanges { target: control minimumPosition: userPosition > maximumPosition ? maximumPosition:userPosition - userPosition: Math.abs( target.verticalOvershoot ) + userPosition: -1 / (Math.abs( target.verticalOvershoot * 0.001 ) + 1 / control.dragOutPosition * 0.001) + control.dragOutPosition // Math.abs( target.verticalOvershoot ) maximumPosition: control.dragOutPosition } @@ -242,8 +225,8 @@ Item { PropertyChanges { target: control maximumPosition: control.dragOutPosition - userPosition: Math.abs( target.verticalOvershoot ) - minimumPosition: control.maximumPosition - 1 + userPosition: -1 / (Math.abs( target.verticalOvershoot * 0.001 ) + 1 / control.dragOutPosition * 0.001) + control.dragOutPosition // Math.abs( target.verticalOvershoot ) + minimumPosition: userPosition > maximumPosition - 1 ? maximumPosition - 1:userPosition } PropertyChanges { @@ -296,7 +279,7 @@ Item { transitions: [ Transition { NumberAnimation { - duration: 200 + duration: 100 properties: "rotation, opacity" } }, diff --git a/resources/qml/Widgets/CalendarWidget.qml b/resources/qml/Widgets/CalendarWidget.qml index 8664adb..c790a52 100644 --- a/resources/qml/Widgets/CalendarWidget.qml +++ b/resources/qml/Widgets/CalendarWidget.qml @@ -18,6 +18,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.4 +import QtQuick.Layouts 1.3 import "../Components" @@ -27,99 +28,31 @@ DataListView { property bool ready property string title: (params.nation === "" ? "IFSC":params.nation === "GER" ? "DAV":"SAC") + " " + qsTr("competition calendar") + " " + control.year - property Component headerComponent: Row { + property Component headerComponent: RowLayout { - anchors { - top: parent.top - bottom: parent.bottom - right: parent.right - rightMargin: 5 - } + height: parent.height - width: childrenRect.width + spacing: 0 - spacing: width * 0.1 - - Button { + ToolButton { id:yearToolBt - anchors { - verticalCenter: parent.verticalCenter - } - - height: parent.height * 0.5 - width: height - onClicked: { control.changeYear() } - onPressed: yearToolBt.scale = 0.9 - onReleased: yearToolBt.scale = 1.0 - - background: Image { - - anchors.centerIn: parent - - source: "qrc:/icons/calendar.png" - - height: parent.height > parent.width ? parent.width : parent.height - width: height - - mipmap: true - - fillMode: Image.PreserveAspectFit - Behavior on scale { - PropertyAnimation { - duration: 100 - } - } - } + icon.name: "calendar" } - Button { + ToolButton { id: cupToolBt - anchors { - verticalCenter: parent.verticalCenter - } - - height: parent.height * 0.5 - width: height - onClicked: { control.openCup() } - onPressed: cupToolBt.scale = 0.9 - onReleased: cupToolBt.scale = 1.0 - - background: Image { - - anchors.centerIn: parent - - source: "qrc:/icons/cup.png" - - height: parent.height > parent.width ? parent.width : parent.height - width: height - - mipmap: true - - fillMode: Image.PreserveAspectFit - Behavior on scale { - PropertyAnimation { - duration: 100 - } - } - } + icon.name: "cup" } - - Item { - id: spacer - height: parent.height - width: 1 - } - } property var widgetData: currentWidgetData diff --git a/resources/qml/Widgets/RegistrationWidget.qml b/resources/qml/Widgets/RegistrationWidget.qml index 8a33bbe..7486880 100644 --- a/resources/qml/Widgets/RegistrationWidget.qml +++ b/resources/qml/Widgets/RegistrationWidget.qml @@ -30,49 +30,14 @@ DataListView { property string subTitle: getSubtitle() property bool titleIsPageTitle: true - property Component headerComponent: Item { - - height: parent.height - width: moreToolBt.width * 1.5 - - Button { + property Component headerComponent: ToolButton { id: moreToolBt - anchors { - verticalCenter: parent.verticalCenter - right: parent.right - rightMargin: parent.width * 0.5 - } - - height: parent.height * 0.5 - width: height - onClicked: { control.changeCat() } - onPressed: moreToolBt.scale = 0.9 - onReleased: moreToolBt.scale = 1.0 - - background: Image { - - anchors.centerIn: parent - - source: "qrc:/icons/more_black.png" - - height: parent.height > parent.width ? parent.width : parent.height - width: height - - mipmap: true - - fillMode: Image.PreserveAspectFit - Behavior on scale { - PropertyAnimation { - duration: 100 - } - } - } - } + icon.name: "menu" } property var widgetData: currentWidgetData @@ -134,8 +99,9 @@ DataListView { var selectOptions = [] for(var prop in cats){ - if (cats.hasOwnProperty(prop) && !control.subTitle.includes(cats[prop]['name'])) { + if (cats.hasOwnProperty(prop) && parseInt(cats[prop]["GrpId"]) !== parseInt(params.cat)) { // append all cats and ignore the current one + //console.log("found cat: ", cats[prop]['name']) selectOptions.push({text: cats[prop]['name'], data:{cat: cats[prop]['GrpId']}}) } } diff --git a/resources/qml/Widgets/ResultWidget.qml b/resources/qml/Widgets/ResultWidget.qml index 626fed2..17c311f 100644 --- a/resources/qml/Widgets/ResultWidget.qml +++ b/resources/qml/Widgets/ResultWidget.qml @@ -31,49 +31,14 @@ DataListView { property string subTitle: getSubtitle() property bool titleIsPageTitle: true - property Component headerComponent: Item { - - height: parent.height - width: moreToolBt.width * 1.5 - - Button { + property Component headerComponent: ToolButton { id: moreToolBt - anchors { - verticalCenter: parent.verticalCenter - right: parent.right - rightMargin: parent.width * 0.5 - } - - height: parent.height * 0.5 - width: height - onClicked: { control.changeCat() } - onPressed: moreToolBt.scale = 0.9 - onReleased: moreToolBt.scale = 1.0 - - background: Image { - - anchors.centerIn: parent - - source: "qrc:/icons/more_black.png" - - height: parent.height > parent.width ? parent.width : parent.height - width: height - - mipmap: true - - fillMode: Image.PreserveAspectFit - Behavior on scale { - PropertyAnimation { - duration: 100 - } - } - } - } + icon.name: "menu" } property var widgetData: currentWidgetData @@ -137,8 +102,9 @@ DataListView { var selectOptions = [] for(var prop in cats){ - if (cats.hasOwnProperty(prop) && !control.subTitle.includes(cats[prop]['name'])) { + if (cats.hasOwnProperty(prop) && parseInt(cats[prop]["GrpId"]) !== parseInt(params.cat)) { // append all cats and ignore the current one + //console.log("found cat: ", cats[prop]['name']) selectOptions.push({text: cats[prop]['name'], data:{cat: cats[prop]['GrpId']}}) } } diff --git a/resources/qml/Widgets/StartlistWidget.qml b/resources/qml/Widgets/StartlistWidget.qml index 7f727f4..94d1208 100644 --- a/resources/qml/Widgets/StartlistWidget.qml +++ b/resources/qml/Widgets/StartlistWidget.qml @@ -31,49 +31,14 @@ DataListView { property string subTitle: qsTr("(Startlist)") + " " + control.widgetData['route_name'] //getSubtitle() property bool titleIsPageTitle: true - property Component headerComponent: Item { - - height: parent.height - width: moreToolBt.width * 1.5 - - Button { + property Component headerComponent: ToolButton { id: moreToolBt - anchors { - verticalCenter: parent.verticalCenter - right: parent.right - rightMargin: parent.width * 0.5 - } - - height: parent.height * 0.5 - width: height - onClicked: { control.changeCat() } - onPressed: moreToolBt.scale = 0.9 - onReleased: moreToolBt.scale = 1.0 - - background: Image { - - anchors.centerIn: parent - - source: "qrc:/icons/more_black.png" - - height: parent.height > parent.width ? parent.width : parent.height - width: height - - mipmap: true - - fillMode: Image.PreserveAspectFit - Behavior on scale { - PropertyAnimation { - duration: 100 - } - } - } - } + icon.name: "menu" } function getSubtitle() { @@ -105,8 +70,9 @@ DataListView { var selectOptions = [] for(var prop in cats){ - if (cats.hasOwnProperty(prop) && !control.subTitle.includes(cats[prop]['name'])) { + if (cats.hasOwnProperty(prop) && parseInt(cats[prop]["GrpId"]) !== parseInt(params.cat)) { // append all cats and ignore the current one + //console.log("found cat: ", cats[prop]['name']) selectOptions.push({text: cats[prop]['name'], data:{cat: cats[prop]['GrpId']}}) } } @@ -308,7 +274,7 @@ DataListView { delegate: TabButton { text: routeSelectTb.tabs[index][1] - width: Math.max(150, routeSelectTb.width / routeSelectButtonRep.model) //text.length * font.pixelSize + width: Math.max(150, root.width / routeSelectButtonRep.model) //text.length * font.pixelSize onClicked: { //console.log("changing to index: " + index + " (" + routeSelectTb.tabs[index][0] + ", " + routeSelectTb.tabs[index][1] + ")") diff --git a/resources/qml/main.qml b/resources/qml/main.qml index b33df9b..035c5e8 100644 --- a/resources/qml/main.qml +++ b/resources/qml/main.qml @@ -19,6 +19,7 @@ import QtQuick 2.9 import QtQuick.Window 2.2 import QtQuick.Controls 2.4 +import QtQuick.Layouts 1.3 import com.itsblue.digitalRockRanking 1.0 @@ -247,27 +248,16 @@ Window { showErrorBar: true - Row { + RowLayout { anchors.fill: parent spacing: width * 0.02 - Item { - id: spacer - width: 1 - height: parent.height - } - - Button { + ToolButton { id:toolButton - anchors { - verticalCenter: parent.verticalCenter - } - - height: parent.height * 0.5 - width: height + height: parent.height onClicked: { if(!mainStack.currentItem.locked){ @@ -275,27 +265,12 @@ Window { } } - onPressed: toolButton.scale = 0.9 - onReleased: toolButton.scale = 1.0 - - background: Image { - source: "qrc:/icons/backDark.png" - - height: parent.height - width: height - - fillMode: Image.PreserveAspectFit - Behavior on scale { - PropertyAnimation { - duration: 100 - } - } - } + icon.name: "back" } Column { - anchors.verticalCenter: parent.verticalCenter + Layout.fillWidth: true height: childrenRect.height width: parent.width - extraComponentLoader.width - toolButton.width - 3 * parent.spacing @@ -381,10 +356,6 @@ Window { property int maximumWidth: parent.width * 0.4 - toolButton.width - 3 height: parent.height - anchors { - top: parent.top - bottom: parent.bottom - } onItemChanged: { width = status === Loader.Ready ? item.width:0 diff --git a/resources/shared/icons/bluerock/20x20/back.png b/resources/shared/icons/bluerock/20x20/back.png new file mode 100644 index 0000000000000000000000000000000000000000..db43e2738fdb91c51b59031fdb86b9a32f7cf449 GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VOR=xI%)bw)Uh?`Lyk5rS2_n-H6QczjGe$C8)4e2}^9vx^? zf*yorkOlU_G?|PBVv3i3gmVMPgg&e IbxsLQ05FD0*Z=?k literal 0 HcmV?d00001 diff --git a/resources/shared/icons/bluerock/20x20/calendar.png b/resources/shared/icons/bluerock/20x20/calendar.png new file mode 100644 index 0000000000000000000000000000000000000000..61cc427c55d93f1fed79ef04694ae82e72d88902 GIT binary patch literal 431 zcmV;g0Z{&lP)VGd000McNliru;|2)}9wbUzO-TR%0X#`W zK~y-)t&_1z13?r;Poljb*ojS8tP(5|8w)?cMqI&4NPfX0jRaCyrSKaBD@E<{2{sm@ zu~f0K7W@Gx%^i4|oiPc!7cTqe&E2grUCRp1cVQSobFMSB@=3j9Ty zNa1 ziN*%1(XN}0{M0T)fE>7!M-9b!MCaeF#s0$+5nxXRHpN`IP&eaYh|CP^OteGv&n$NK zSceCqlhIvZL+mQ&jIMx=1VgP~MDLRWc134=v$~=7I<>&pI^jgy;Q;-ATkYYYsG9G)(YAr_~vPBF}KaujIW&*C}x zp4n0bB{8KvbCl<{PHS3P!PcKJ^M>n|PYnB*ms}R^XkD?jLuuXF{SQCR5I58B{h2u9 z?#%kMnR9QpRv&LJ5v^ceXZhKNDLCOFukV4sfwSz454io3UBPHrz;en#SvB=%QlWj2 z<-UgvORvqpm42|ZIVomSSwCmM#oBjF?{d}iSS6xcCi(qhvWjwNdmp;5Z-?JTwKkC6!~1P#Laa^s!kqVPabhoJJ0p6<`$qMqvqyiLemfxf!rO1t zQ@6Vnf?p?W|05jNkhCaqwGHQd(=F3^>K)||DsH)=@xZuali#KdY;0K_t?GsU6!YBX WCpE1W5IP79CI(MeKbLh*2~7Y3_?dYC literal 0 HcmV?d00001 diff --git a/resources/shared/icons/bluerock/20x20/drawer.png b/resources/shared/icons/bluerock/20x20/drawer.png new file mode 100644 index 0000000000000000000000000000000000000000..1e974efae878c093b645c0d3a8059ab6727ce0b4 GIT binary patch literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE;=lc$SgNX4x;Qx5Vn7;rH4ANw1A zOjfE!lUd*c&nDlX{tb`XSQRuc-QJca#B_@}^-bH#_jae;f1WP9f4~f={r`VvhVRWh Vy3c?9v;lG%JYD@<);T3K0RTNODQ^G( literal 0 HcmV?d00001 diff --git a/resources/shared/icons/bluerock/20x20/menu.png b/resources/shared/icons/bluerock/20x20/menu.png new file mode 100644 index 0000000000000000000000000000000000000000..a10473d9e1ef9b0667894122105ae6d2c7dbf6b5 GIT binary patch literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAf3?x51|2hvy@dWsUxB}__|Nkq=%L9?{J62C1 zpSdK+FPMR$LHwNiKOk4y)5S4_BRZLbm9g!@h1!Hq_ClP32VJJDW?^Eu5}>+rMbvj$ PpfUzeS3j3^P64nJ zu)P6cM!8Z8Q=p(^iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0xXJY5_^ zB3j?xFyv}>5OKZe9d%GPmG|bX?2UcC-=??;=p1A07CBtbHvePn1Wnr?-4prWS$#dQ zVQ$ga1MD-l2XozI6y}^hKk3Qhx!fK*1S`zy{8#*qaE@P}y8l>KjOQ^|W4&307kj$Z zdMEFT_CGxJU!JbYgpy0j=SmMqEBB|TtnFDdb>dc|O<~g=?md2&xA*QZCVe3ftCy^4 eepRf0_OG?-TcyL4IjVGd000McNliru;|2)}9u*sfO>+PM0xd~I zK~z}7?U+AHTtO7Yf4lqgQZ6e&gAfp+wPlKsFOd}a02UT0g0*&vwJ0egh^cJ_!4xJI z`3%`YNa3;s7t>|M-85(5GVIL0HyhSJyaSKD@1B`6mw7XH?ktSQ7BJMa#pEcZSLdFi z3UE?n`h5m8JgyJ)0{vP*UUICmdIR8h2D}G$wP+n`z&Y?XAov-0?e&QvMXv^Y%z#7S z$%sx({r&>J8QXEQC1)^2?*Oyq{pTby*h!?{f7Qz(otA)2ZKR=@_JO#vNYbm7SVvWw zd5{4%fS17XJ&o@$16F`Pzy~>d@?B3kn5Ob!OYfh6wG6lcF1?I@4s@p+;H<`WxCCzM zk=;FQ)M96G42!^m>LOZpQ}uF8{*h-&&8oMlNZo?*tfbE zM%^LoncW1QY6m)W#Qjy#(J!D^rI{+tgs^9(eb4ykwYD6$W4ImT@2l-Nz2pF|1NJR& zW!}31`$}!c=_LnPkF>9sw8wEtX=WezY6?uu-Q}HEusVEEk?IQ8UID%20Na78w{P;9 zkBi9Q?V?q5Y>MyV--cn)8FXjtU0gf!A_2N8rApL~BEWy{U&kducb!`R0000VGd000McNliru;|2)}2MLsfxFi4o0+&fd zK~z}7?U>6;RZ$eifA@AV@|iu1EV6-0*aM=W>A-=bKnR)y(ZG>|B$_yh`VX8`e}DuH zLK+s8fdq}6gql!TL0xTN)-}=ao+fL(14$}w#NYe@k<1NwoeiV1rMTs4M*^+FraQRNJ_=}O*ejA~%mm376=;Hr8q0S|x; zA)N!ROWSu~64>wQbPKox9GChN;JqZM3AhC`OWO~Z(1c_$0)7GAs%=EI&85i9oZ^ot zdyn`sZ4<68eyg5aBx`Z0Z%h$jV}jOM@ntYuNvNd0W?tEcfE|_HP?#+3h?c>;@>lW^ zx~~Wka8c}+fK6pT5STr~+Y~KCTl>1}Bi3tW@wE(vUSM6>y8;3{t$6FAl^1Pe|80%= zMC5@Ninsxs2ReZjWxo*+;7!F_5v>crA7y_YGba+!VWoaq?2F1a6%gQK#ak5HvgPAw zQnuo-3XG|GmjqO_x-I9qeVtPEqG;(MGFEB*i$fFeNqyl@SprP`3vkFo=P>Y9@n%KK z)IW-^RJd$)L)lsq`aCrHtVvh4GzWIOH{P}cbs6>Gk2?6{S!~`%q&wprEP3#k61bm5 zI}vP%_*+U0`X=}3d#Jt~aO^#{d4vE&D z;)Ior899+0lhOjbwBG6b-zVR3D}ZmZ2p8o!^Vu4TR$##~#!Ok*i}4oH)qfqqZ38E> zycegz8Q_{6M04u$wGVg-e5n6^sHI;YmCz3i%QZ5T8_6~GmHa*MLLtz}FmNw}#CQjo z4;0?YAh;lnLJILUSw7OBAvD0yanvj&+QpbJ`QCr)sG}C}4>Iorht1u2I0Jk_T!Hle|Nntx@v-JYAjMP? zEak7F*TW^m6^?GX5i`t37Uy%49p@Mf~H$ux#Li{f|=o!c*Whe T_w8$esu?_8{an^LB{Ts5XSyS3 literal 0 HcmV?d00001 diff --git a/resources/shared/icons/bluerock/20x20@2/menu.png b/resources/shared/icons/bluerock/20x20@2/menu.png new file mode 100644 index 0000000000000000000000000000000000000000..649c2a08c6995b660c0a193764545ea06a02d595 GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NV3?%C=ER6$F`~f~8u0Z<#|Nlzz@(^?|4nJ za3z8;64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1Uy{C49+_t(Kwngo&(*&f`e z?pS(*Is5_N9P9H&*31QuRileuSzYYunLSr6=JNbmbDv$v-DMw~ZFVQB{&J4Q&5*NR zVkdvOZ}PZiKgo5|zll1NzV@d~TvH!(^3}4Y1)KC{-!-fGU9tSwvWI^{H!zopr06SNTasU7T literal 0 HcmV?d00001 diff --git a/resources/shared/icons/bluerock/20x20@3/calendar.png b/resources/shared/icons/bluerock/20x20@3/calendar.png new file mode 100644 index 0000000000000000000000000000000000000000..434503cb539a28bc180faed8607cf24e7ea2962d GIT binary patch literal 888 zcmV-;1Bd*HP)VGd000McNliru;|2)}9XNG&Ld5_80|iM$ zK~!ko?V7!B6G0Hge~u3YYzPEIX!$QFDd`X?L5XNm8Ho-dx=>k&E)szbkpfy27nBr~ zv{6D6DJ2CENMgs9Vvc4kt=3~_eK(G6yiZzPG&kp$x1VqK4hF|Eka}gA;lqS?hABf7 z90f19^Z$WZX zqhigwm;i4AYPu~C0GvpT*PYruacZ({*aNM3UnfothT%VNPwT7lv1>tbV7{kr0AGNLE9AYbc`jZ8FM#5N2yO#UfhS)41Mt8%9-0?z06!JI=0^|x2NUCVF9*k4p8!KV0P7n%=l07n^l&DY_(z#gzAWlv&0 z9sxT}-Z!AC z!D}u!^ex^x@J^YfeLR+PD1VmD%4;sT8MqYGIsMH&vP>Ns@eWA8YIqu?mm9{&JWFEIZ^K~4z( O0000VGd000McNliru;|2)}1~NR9U_k%?1KmkP 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 Rdx-!5002ovPDHLkV1nbD^e5|<;NHLWJ z`2{mDlubTs0pzKBx;TbdoKEIA$|T{|^+1cqz=BoM;J^w6)uzQC?WEo}Ti$ceo5{nl Y>fhrA8|lTrfm#?mUHx3vIVCg!0QrR_P5=M^ literal 0 HcmV?d00001 diff --git a/resources/shared/icons/bluerock/20x20@4/menu.png b/resources/shared/icons/bluerock/20x20@4/menu.png new file mode 100644 index 0000000000000000000000000000000000000000..187c171cdef27bd4efc747a84402b4f23027dcdc GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r63?ysp-_HY55&=FTu0Z<#|Nlzz@@U9?gUlzO z9D7NSUoZoMLc;#@?`6aGO96%QJzX3_JdP&|s0bPGD7EtNs6Bmpj)$j3bk#IwM}fpv zpO*@)sa!0go2E58GB~zA6KFlkBD%|2WST%o1Rra2q~gVSidGdJdgTe~DWM4f D-Q-24 literal 0 HcmV?d00001 diff --git a/resources/shared/icons/bluerock/index.theme b/resources/shared/icons/bluerock/index.theme new file mode 100644 index 0000000..2457fde --- /dev/null +++ b/resources/shared/icons/bluerock/index.theme @@ -0,0 +1,24 @@ +[Icon Theme] +Name=blueROCK +Comment=blueROCK Icon Theme + +Directories=20x20,20x20@2,20x20@3,20x20@4 + +[20x20] +Size=20 +Type=Fixed + +[20x20@2] +Size=20 +Scale=2 +Type=Fixed + +[20x20@3] +Size=20 +Scale=3 +Type=Fixed + +[20x20@4] +Size=20 +Scale=4 +Type=Fixed diff --git a/resources/shared/shared.qrc b/resources/shared/shared.qrc index 7d1082e..c88314b 100644 --- a/resources/shared/shared.qrc +++ b/resources/shared/shared.qrc @@ -9,5 +9,30 @@ icons/cup.png Banner.png icons/more_black.png + icons/bluerock/20x20/back.png + icons/bluerock/20x20/cup.png + icons/bluerock/20x20/drawer.png + icons/bluerock/20x20/menu.png + icons/bluerock/20x20@2/back.png + icons/bluerock/20x20@2/cup.png + icons/bluerock/20x20@2/drawer.png + icons/bluerock/20x20@2/menu.png + icons/bluerock/20x20@3/back.png + icons/bluerock/20x20@3/cup.png + icons/bluerock/20x20@3/drawer.png + icons/bluerock/20x20@3/menu.png + icons/bluerock/20x20@4/back.png + icons/bluerock/20x20@4/cup.png + icons/bluerock/20x20@4/drawer.png + icons/bluerock/20x20@4/menu.png + icons/bluerock/index.theme + icons/dig_rock.klein.jpg + icons/dig_rock.klein.png + icons/favicon.png + icons/json.php.json + icons/bluerock/20x20/calendar.png + icons/bluerock/20x20@2/calendar.png + icons/bluerock/20x20@3/calendar.png + icons/bluerock/20x20@4/calendar.png diff --git a/sources/main.cpp b/sources/main.cpp index f10a139..6226180 100644 --- a/sources/main.cpp +++ b/sources/main.cpp @@ -20,16 +20,20 @@ #include #include #include +#include #include "headers/serverconn.h" int main(int argc, char *argv[]) { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QGuiApplication app(argc, argv); QQuickStyle::setStyle("Material"); + QIcon::setFallbackSearchPaths(QIcon::fallbackSearchPaths() << ":/resources/shared/icons"); + QIcon::setThemeName("bluerock"); qmlRegisterType("com.itsblue.digitalRockRanking", 1, 0, "ServerConn");