Fixes DPI scaling and added quirc submodule
This commit is contained in:
parent
bd38e5e1d8
commit
5bb95053fb
|
@ -5,3 +5,6 @@
|
||||||
path = monero
|
path = monero
|
||||||
url = https://git.wownero.com/wownero/wownero
|
url = https://git.wownero.com/wownero/wownero
|
||||||
branch = wowlet
|
branch = wowlet
|
||||||
|
[submodule "contrib/quirc"]
|
||||||
|
path = contrib/quirc
|
||||||
|
url = https://github.com/dlbeer/quirc.git
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 9c0f555acb2531d818f2c405044418fc75379fb2
|
|
@ -120,14 +120,7 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
|
||||||
|
|
||||||
if(openVREnabled) {
|
if(openVREnabled) {
|
||||||
#ifdef HAS_OPENVR
|
#ifdef HAS_OPENVR
|
||||||
// @TODO: custom DPI / AA
|
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
||||||
// QCoreApplication::setAttribute( Qt::AA_UseDesktopOpenGL );
|
|
||||||
// QCoreApplication::setAttribute( Qt::AA_Use96Dpi );
|
|
||||||
if(qgetenv("scale") == "1")
|
|
||||||
QCoreApplication::setAttribute( Qt::AA_EnableHighDpiScaling );
|
|
||||||
if(qgetenv("noscale") == "1")
|
|
||||||
QCoreApplication::setAttribute( Qt::AA_DisableHighDpiScaling );
|
|
||||||
|
|
||||||
QApplication vr_app(argc, argv);
|
QApplication vr_app(argc, argv);
|
||||||
auto *ctx = new AppContext(&parser);
|
auto *ctx = new AppContext(&parser);
|
||||||
auto *vr = new wowletvr::WowletVR(ctx, &parser, &vr_app);
|
auto *vr = new wowletvr::WowletVR(ctx, &parser, &vr_app);
|
||||||
|
|
|
@ -105,7 +105,7 @@ Rectangle {
|
||||||
id: enterPasswordDialog
|
id: enterPasswordDialog
|
||||||
dialogTitle: "Enter Wallet Password"
|
dialogTitle: "Enter Wallet Password"
|
||||||
dialogWidth: 700
|
dialogWidth: 700
|
||||||
dialogHeight: 380
|
dialogHeight: 280
|
||||||
|
|
||||||
dialogContentItem: ColumnLayout {
|
dialogContentItem: ColumnLayout {
|
||||||
RowLayout {
|
RowLayout {
|
||||||
|
@ -202,7 +202,7 @@ Rectangle {
|
||||||
MyText {
|
MyText {
|
||||||
Layout.topMargin: 20
|
Layout.topMargin: 20
|
||||||
Layout.leftMargin: 16
|
Layout.leftMargin: 16
|
||||||
fontSize: 16
|
fontSize: 24
|
||||||
fontColor: Style.fontColorDimmed
|
fontColor: Style.fontColorDimmed
|
||||||
text: "The password field is optional."
|
text: "The password field is optional."
|
||||||
}
|
}
|
||||||
|
@ -236,7 +236,7 @@ Rectangle {
|
||||||
|
|
||||||
MyText {
|
MyText {
|
||||||
text: "Credits"
|
text: "Credits"
|
||||||
fontSize: 12
|
fontSize: 16
|
||||||
opacity: 0.3
|
opacity: 0.3
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
|
|
@ -47,7 +47,7 @@ ColumnLayout {
|
||||||
Layout.leftMargin: 40
|
Layout.leftMargin: 40
|
||||||
Layout.rightMargin: 40
|
Layout.rightMargin: 40
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
fontSize: 14
|
fontSize: 21
|
||||||
text: "Shoutouts: matzman666, qvqc, ez, Gatto, RAGEHAÜZ, cisme, wowario, lza_menace, jwinterm, nioc, asymptotically, azy, selsta, kico, laura, thrmo, rottensox, solar, bl4sty, scoobybejesus"
|
text: "Shoutouts: matzman666, qvqc, ez, Gatto, RAGEHAÜZ, cisme, wowario, lza_menace, jwinterm, nioc, asymptotically, azy, selsta, kico, laura, thrmo, rottensox, solar, bl4sty, scoobybejesus"
|
||||||
wrap: true
|
wrap: true
|
||||||
}
|
}
|
||||||
|
@ -56,7 +56,7 @@ ColumnLayout {
|
||||||
Layout.leftMargin: 40
|
Layout.leftMargin: 40
|
||||||
Layout.rightMargin: 40
|
Layout.rightMargin: 40
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
fontSize: 14
|
fontSize: 21
|
||||||
text: "dsc - April 2021"
|
text: "dsc - April 2021"
|
||||||
wrap: true
|
wrap: true
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,7 +27,7 @@ ColumnLayout {
|
||||||
RowLayout {
|
RowLayout {
|
||||||
MyText {
|
MyText {
|
||||||
text: "Welcome to Wowlet VR"
|
text: "Welcome to Wowlet VR"
|
||||||
font.pointSize: 24
|
font.pointSize: 36
|
||||||
Layout.leftMargin: 0
|
Layout.leftMargin: 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ ColumnLayout {
|
||||||
MyText{
|
MyText{
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
fontSize: 14
|
fontSize: 21
|
||||||
text: "Version beta (Qt " + qtRuntimeVersion + ")"
|
text: "Version beta (Qt " + qtRuntimeVersion + ")"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -119,7 +119,7 @@ ColumnLayout {
|
||||||
return currentItem['fileName'].replace(".keys", "");
|
return currentItem['fileName'].replace(".keys", "");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
font.pointSize: 14
|
font.pointSize: 21
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.topMargin: 14
|
anchors.topMargin: 14
|
||||||
|
|
|
@ -39,7 +39,7 @@ Popup {
|
||||||
implicitWidth: dialogWidth
|
implicitWidth: dialogWidth
|
||||||
implicitHeight: dialogHeight
|
implicitHeight: dialogHeight
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
radius: 24
|
radius: 36
|
||||||
color: Style.backgroundColor
|
color: Style.backgroundColor
|
||||||
border.color: Style.fontColorDimmed
|
border.color: Style.fontColorDimmed
|
||||||
border.width: 2
|
border.width: 2
|
||||||
|
|
|
@ -17,7 +17,7 @@ Popup {
|
||||||
property int dialogHeight: 300
|
property int dialogHeight: 300
|
||||||
|
|
||||||
property Item dialogContentItem: MyText {
|
property Item dialogContentItem: MyText {
|
||||||
fontSize: 16
|
fontSize: 36
|
||||||
text: dialogText
|
text: dialogText
|
||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
|
|
@ -123,7 +123,7 @@ ColumnLayout {
|
||||||
opacity: root.enabled ? 1 : disabledOpacity
|
opacity: root.enabled ? 1 : disabledOpacity
|
||||||
|
|
||||||
Layout.preferredWidth: root.compact ? 106 : 230
|
Layout.preferredWidth: root.compact ? 106 : 230
|
||||||
fontSize: 16
|
fontSize: 36
|
||||||
text: root.compact ? "C" : "Clear"
|
text: root.compact ? "C" : "Clear"
|
||||||
onClicked: {
|
onClicked: {
|
||||||
clearPress();
|
clearPress();
|
||||||
|
|
|
@ -5,7 +5,7 @@ import QtQuick.Layouts 1.3
|
||||||
Rectangle {
|
Rectangle {
|
||||||
id: root
|
id: root
|
||||||
property string text: ""
|
property string text: ""
|
||||||
property int fontSize: 22
|
property int fontSize: 32
|
||||||
property alias mouseArea: mouseArea
|
property alias mouseArea: mouseArea
|
||||||
property alias btnTextColor: btnText.fontColor
|
property alias btnTextColor: btnText.fontColor
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,7 @@ Item {
|
||||||
Layout.fillWidth: root.hasIcon ? true : false
|
Layout.fillWidth: root.hasIcon ? true : false
|
||||||
Layout.alignment: root.hasIcon ? Qt.AlignLeft : Qt.AlignHCenter
|
Layout.alignment: root.hasIcon ? Qt.AlignLeft : Qt.AlignHCenter
|
||||||
text: root.text
|
text: root.text
|
||||||
fontSize: 16
|
fontSize: 26
|
||||||
fontColor: Style.btnTextColor
|
fontColor: Style.btnTextColor
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,6 +30,7 @@ Rectangle {
|
||||||
Layout.preferredHeight: 70
|
Layout.preferredHeight: 70
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
|
spacing: 20
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
|
@ -53,12 +54,12 @@ Rectangle {
|
||||||
id: headerTitleContainer
|
id: headerTitleContainer
|
||||||
color: "transparent"
|
color: "transparent"
|
||||||
Layout.preferredHeight: 50
|
Layout.preferredHeight: 50
|
||||||
Layout.preferredWidth: headerTitle.width
|
Layout.preferredWidth: headerTitle.width + 20
|
||||||
|
|
||||||
MyText {
|
MyText {
|
||||||
id: headerTitle
|
id: headerTitle
|
||||||
text: headerText
|
text: headerText
|
||||||
font.pointSize: 26
|
font.pointSize: 38
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
fontColor: Style.fontColorBright
|
fontColor: Style.fontColorBright
|
||||||
}
|
}
|
||||||
|
@ -105,7 +106,7 @@ Rectangle {
|
||||||
MyText{
|
MyText{
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
fontSize: 14
|
fontSize: 30
|
||||||
fontBold: true
|
fontBold: true
|
||||||
text: appWindow.balanceFormatted
|
text: appWindow.balanceFormatted
|
||||||
}
|
}
|
||||||
|
@ -160,7 +161,7 @@ Rectangle {
|
||||||
MyText {
|
MyText {
|
||||||
Layout.leftMargin: 40
|
Layout.leftMargin: 40
|
||||||
|
|
||||||
fontSize: 14
|
fontSize: 21
|
||||||
text: appWindow.statusText
|
text: appWindow.statusText
|
||||||
color: Style.fontColorDimmed
|
color: Style.fontColorDimmed
|
||||||
}
|
}
|
||||||
|
@ -176,7 +177,7 @@ Rectangle {
|
||||||
spacing: 0
|
spacing: 0
|
||||||
|
|
||||||
MyText {
|
MyText {
|
||||||
fontSize: 14
|
fontSize: 21
|
||||||
text: "Daemon: "
|
text: "Daemon: "
|
||||||
color: Style.fontColorDimmed
|
color: Style.fontColorDimmed
|
||||||
}
|
}
|
||||||
|
@ -211,7 +212,7 @@ Rectangle {
|
||||||
spacing: 0
|
spacing: 0
|
||||||
|
|
||||||
MyText {
|
MyText {
|
||||||
fontSize: 14
|
fontSize: 21
|
||||||
text: "WS: "
|
text: "WS: "
|
||||||
color: Style.fontColorDimmed
|
color: Style.fontColorDimmed
|
||||||
}
|
}
|
||||||
|
@ -231,7 +232,7 @@ Rectangle {
|
||||||
}
|
}
|
||||||
|
|
||||||
MyText {
|
MyText {
|
||||||
fontSize: 14
|
fontSize: 21
|
||||||
text: {
|
text: {
|
||||||
let rtn = "Balance: ";
|
let rtn = "Balance: ";
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -4,7 +4,7 @@ import "."
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
property bool wrap: false
|
property bool wrap: false
|
||||||
property int fontSize: 16
|
property int fontSize: 24
|
||||||
property bool fontBold: false
|
property bool fontBold: false
|
||||||
property string fontColor: Style.fontColor
|
property string fontColor: Style.fontColor
|
||||||
|
|
||||||
|
|
|
@ -112,7 +112,7 @@ Item {
|
||||||
MyText {
|
MyText {
|
||||||
// date
|
// date
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
fontSize: 12
|
fontSize: 22
|
||||||
fontColor: Style.fontColorBright
|
fontColor: Style.fontColorBright
|
||||||
text: date
|
text: date
|
||||||
|
|
||||||
|
@ -129,7 +129,7 @@ Item {
|
||||||
|
|
||||||
MyText {
|
MyText {
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
fontSize: 14
|
fontSize: 22
|
||||||
text: description !== "" ? description : "..."
|
text: description !== "" ? description : "..."
|
||||||
fontColor: description !== "" ? Style.fontColorBright : Style.fontColorDimmed
|
fontColor: description !== "" ? Style.fontColorBright : Style.fontColorDimmed
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
|
@ -152,7 +152,7 @@ Item {
|
||||||
anchors.rightMargin: 10
|
anchors.rightMargin: 10
|
||||||
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
fontSize: 14
|
fontSize: 24
|
||||||
fontBold: true
|
fontBold: true
|
||||||
text: amount
|
text: amount
|
||||||
fontColor: !isout ? Style.historyFontColorPlusAmount : Style.historyFontColorMinAmount
|
fontColor: !isout ? Style.historyFontColorPlusAmount : Style.historyFontColorMinAmount
|
||||||
|
|
|
@ -29,7 +29,7 @@ MyStackViewPage {
|
||||||
MyText {
|
MyText {
|
||||||
width: parent.width
|
width: parent.width
|
||||||
wrap: true
|
wrap: true
|
||||||
fontSize: 14
|
fontSize: 21
|
||||||
fontColor: Style.fontColorBright
|
fontColor: Style.fontColorBright
|
||||||
text: "Give the following 4 digit PIN to the person that is sending you Wownero. PIN's are valid for 10 minutes and automatically renew."
|
text: "Give the following 4 digit PIN to the person that is sending you Wownero. PIN's are valid for 10 minutes and automatically renew."
|
||||||
}
|
}
|
||||||
|
@ -46,7 +46,7 @@ MyStackViewPage {
|
||||||
id: statusText
|
id: statusText
|
||||||
width: parent.width
|
width: parent.width
|
||||||
visible: true
|
visible: true
|
||||||
fontSize: 14
|
fontSize: 21
|
||||||
fontColor: Style.fontColorBright
|
fontColor: Style.fontColorBright
|
||||||
text: "Generating PIN..."
|
text: "Generating PIN..."
|
||||||
}
|
}
|
||||||
|
@ -56,7 +56,7 @@ MyStackViewPage {
|
||||||
text: "- - - -"
|
text: "- - - -"
|
||||||
color: Style.fontColor
|
color: Style.fontColor
|
||||||
font.bold: true
|
font.bold: true
|
||||||
font.pointSize: 40
|
font.pointSize: 60
|
||||||
leftPadding: 20
|
leftPadding: 20
|
||||||
rightPadding: 20
|
rightPadding: 20
|
||||||
|
|
||||||
|
@ -92,7 +92,7 @@ MyStackViewPage {
|
||||||
|
|
||||||
MyText {
|
MyText {
|
||||||
width: parent.width
|
width: parent.width
|
||||||
fontSize: 14
|
fontSize: 21
|
||||||
wrap: true
|
wrap: true
|
||||||
fontColor: Style.fontColorBright
|
fontColor: Style.fontColorBright
|
||||||
text: "Alternatively, you may use one of the following methods to retreive your address."
|
text: "Alternatively, you may use one of the following methods to retreive your address."
|
||||||
|
|
|
@ -38,7 +38,7 @@ RowLayout {
|
||||||
Layout.alignment: Qt.AlignLeft
|
Layout.alignment: Qt.AlignLeft
|
||||||
fontBold: true
|
fontBold: true
|
||||||
text: "back"
|
text: "back"
|
||||||
fontSize: 16
|
fontSize: 24
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -55,7 +55,7 @@ ColumnLayout {
|
||||||
text: (root.pin[0] || ".") + " " + (root.pin[1] || ".") + " " + (root.pin[2] || ".") + " " + (root.pin[3] || ".");
|
text: (root.pin[0] || ".") + " " + (root.pin[1] || ".") + " " + (root.pin[2] || ".") + " " + (root.pin[3] || ".");
|
||||||
color: Style.fontColor
|
color: Style.fontColor
|
||||||
font.bold: true
|
font.bold: true
|
||||||
font.pointSize: 40
|
font.pointSize: 60
|
||||||
leftPadding: 20
|
leftPadding: 20
|
||||||
rightPadding: 20
|
rightPadding: 20
|
||||||
|
|
||||||
|
@ -91,7 +91,7 @@ ColumnLayout {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
||||||
MyText {
|
MyText {
|
||||||
fontSize: 18
|
fontSize: 22
|
||||||
fontColor: Style.fontColorBright
|
fontColor: Style.fontColorBright
|
||||||
text: "Waiting on input..."
|
text: "Waiting on input..."
|
||||||
}
|
}
|
||||||
|
@ -105,7 +105,7 @@ ColumnLayout {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
||||||
MyText {
|
MyText {
|
||||||
fontSize: 18
|
fontSize: 22
|
||||||
fontColor: Style.fontColorBright
|
fontColor: Style.fontColorBright
|
||||||
text: "Looking up address..."
|
text: "Looking up address..."
|
||||||
}
|
}
|
||||||
|
|
|
@ -125,7 +125,7 @@ ColumnLayout {
|
||||||
Layout.preferredHeight: 68
|
Layout.preferredHeight: 68
|
||||||
|
|
||||||
MyText {
|
MyText {
|
||||||
fontSize: 24
|
fontSize: 32
|
||||||
fontColor: Style.fontColorBright
|
fontColor: Style.fontColorBright
|
||||||
text: {
|
text: {
|
||||||
let rtn = "";
|
let rtn = "";
|
||||||
|
@ -172,7 +172,7 @@ ColumnLayout {
|
||||||
|
|
||||||
MyText {
|
MyText {
|
||||||
id: fiatText
|
id: fiatText
|
||||||
fontSize: 18
|
fontSize: 26
|
||||||
fontColor: Style.fontColorBright
|
fontColor: Style.fontColorBright
|
||||||
text: {
|
text: {
|
||||||
let rtn = "";
|
let rtn = "";
|
||||||
|
|
Loading…
Reference in New Issue