Browse Source

Fixes DPI scaling and added quirc submodule

pull/45/head
dsc 4 months ago
parent
commit
5bb95053fb
  1. 3
      .gitmodules
  2. 1
      contrib/quirc
  3. 9
      src/main.cpp
  4. 6
      src/vr/main.qml
  5. 4
      src/vr/qml/AboutPage.qml
  6. 6
      src/vr/qml/DashboardPage.qml
  7. 2
      src/vr/qml/common/MyDialogOkCancelPopup.qml
  8. 2
      src/vr/qml/common/MyDialogOkPopup.qml
  9. 2
      src/vr/qml/common/MyNumPad.qml
  10. 2
      src/vr/qml/common/MyNumPadButton.qml
  11. 2
      src/vr/qml/common/MyPushButton.qml
  12. 15
      src/vr/qml/common/MyStackViewPage.qml
  13. 2
      src/vr/qml/common/MyText.qml
  14. 6
      src/vr/qml/wallet/HistoryTable.qml
  15. 8
      src/vr/qml/wallet/ReceivePage.qml
  16. 2
      src/vr/qml/wallet/send/SendPageNavBack.qml
  17. 6
      src/vr/qml/wallet/send/SendPagePIN.qml
  18. 4
      src/vr/qml/wallet/send/SendPageTransfer.qml

3
.gitmodules

@ -5,3 +5,6 @@
path = monero
url = https://git.wownero.com/wownero/wownero
branch = wowlet
[submodule "contrib/quirc"]
path = contrib/quirc
url = https://github.com/dlbeer/quirc.git

1
contrib/quirc

@ -0,0 +1 @@
Subproject commit 9c0f555acb2531d818f2c405044418fc75379fb2

9
src/main.cpp

@ -120,14 +120,7 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
if(openVREnabled) {
#ifdef HAS_OPENVR
// @TODO: custom DPI / AA
// 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 );
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QApplication vr_app(argc, argv);
auto *ctx = new AppContext(&parser);
auto *vr = new wowletvr::WowletVR(ctx, &parser, &vr_app);

6
src/vr/main.qml

@ -105,7 +105,7 @@ Rectangle {
id: enterPasswordDialog
dialogTitle: "Enter Wallet Password"
dialogWidth: 700
dialogHeight: 380
dialogHeight: 280
dialogContentItem: ColumnLayout {
RowLayout {
@ -202,7 +202,7 @@ Rectangle {
MyText {
Layout.topMargin: 20
Layout.leftMargin: 16
fontSize: 16
fontSize: 24
fontColor: Style.fontColorDimmed
text: "The password field is optional."
}
@ -236,7 +236,7 @@ Rectangle {
MyText {
text: "Credits"
fontSize: 12
fontSize: 16
opacity: 0.3
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter

4
src/vr/qml/AboutPage.qml

@ -47,7 +47,7 @@ ColumnLayout {
Layout.leftMargin: 40
Layout.rightMargin: 40
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"
wrap: true
}
@ -56,7 +56,7 @@ ColumnLayout {
Layout.leftMargin: 40
Layout.rightMargin: 40
Layout.fillWidth: true
fontSize: 14
fontSize: 21
text: "dsc - April 2021"
wrap: true
}

6
src/vr/qml/DashboardPage.qml

@ -27,7 +27,7 @@ ColumnLayout {
RowLayout {
MyText {
text: "Welcome to Wowlet VR"
font.pointSize: 24
font.pointSize: 36
Layout.leftMargin: 0
}
@ -44,7 +44,7 @@ ColumnLayout {
MyText{
anchors.right: parent.right
anchors.bottom: parent.bottom
fontSize: 14
fontSize: 21
text: "Version beta (Qt " + qtRuntimeVersion + ")"
}
}
@ -119,7 +119,7 @@ ColumnLayout {
return currentItem['fileName'].replace(".keys", "");
}
}
font.pointSize: 14
font.pointSize: 21
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: parent.top
anchors.topMargin: 14

2
src/vr/qml/common/MyDialogOkCancelPopup.qml

@ -39,7 +39,7 @@ Popup {
implicitWidth: dialogWidth
implicitHeight: dialogHeight
anchors.centerIn: parent
radius: 24
radius: 36
color: Style.backgroundColor
border.color: Style.fontColorDimmed
border.width: 2

2
src/vr/qml/common/MyDialogOkPopup.qml

@ -17,7 +17,7 @@ Popup {
property int dialogHeight: 300
property Item dialogContentItem: MyText {
fontSize: 16
fontSize: 36
text: dialogText
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter

2
src/vr/qml/common/MyNumPad.qml

@ -123,7 +123,7 @@ ColumnLayout {
opacity: root.enabled ? 1 : disabledOpacity
Layout.preferredWidth: root.compact ? 106 : 230
fontSize: 16
fontSize: 36
text: root.compact ? "C" : "Clear"
onClicked: {
clearPress();

2
src/vr/qml/common/MyNumPadButton.qml

@ -5,7 +5,7 @@ import QtQuick.Layouts 1.3
Rectangle {
id: root
property string text: ""
property int fontSize: 22
property int fontSize: 32
property alias mouseArea: mouseArea
property alias btnTextColor: btnText.fontColor

2
src/vr/qml/common/MyPushButton.qml

@ -51,7 +51,7 @@ Item {
Layout.fillWidth: root.hasIcon ? true : false
Layout.alignment: root.hasIcon ? Qt.AlignLeft : Qt.AlignHCenter
text: root.text
fontSize: 16
fontSize: 26
fontColor: Style.btnTextColor
}
}

15
src/vr/qml/common/MyStackViewPage.qml

@ -30,6 +30,7 @@ Rectangle {
Layout.preferredHeight: 70
RowLayout {
spacing: 20
anchors.fill: parent
Rectangle {
@ -53,12 +54,12 @@ Rectangle {
id: headerTitleContainer
color: "transparent"
Layout.preferredHeight: 50
Layout.preferredWidth: headerTitle.width
Layout.preferredWidth: headerTitle.width + 20
MyText {
id: headerTitle
text: headerText
font.pointSize: 26
font.pointSize: 38
anchors.verticalCenter: parent.verticalCenter
fontColor: Style.fontColorBright
}
@ -105,7 +106,7 @@ Rectangle {
MyText{
anchors.right: parent.right
anchors.bottom: parent.bottom
fontSize: 14
fontSize: 30
fontBold: true
text: appWindow.balanceFormatted
}
@ -160,7 +161,7 @@ Rectangle {
MyText {
Layout.leftMargin: 40
fontSize: 14
fontSize: 21
text: appWindow.statusText
color: Style.fontColorDimmed
}
@ -176,7 +177,7 @@ Rectangle {
spacing: 0
MyText {
fontSize: 14
fontSize: 21
text: "Daemon: "
color: Style.fontColorDimmed
}
@ -211,7 +212,7 @@ Rectangle {
spacing: 0
MyText {
fontSize: 14
fontSize: 21
text: "WS: "
color: Style.fontColorDimmed
}
@ -231,7 +232,7 @@ Rectangle {
}
MyText {
fontSize: 14
fontSize: 21
text: {
let rtn = "Balance: ";
try {

2
src/vr/qml/common/MyText.qml

@ -4,7 +4,7 @@ import "."
Text {
property bool wrap: false
property int fontSize: 16
property int fontSize: 24
property bool fontBold: false
property string fontColor: Style.fontColor

6
src/vr/qml/wallet/HistoryTable.qml

@ -112,7 +112,7 @@ Item {
MyText {
// date
anchors.verticalCenter: parent.verticalCenter
fontSize: 12
fontSize: 22
fontColor: Style.fontColorBright
text: date
@ -129,7 +129,7 @@ Item {
MyText {
anchors.verticalCenter: parent.verticalCenter
fontSize: 14
fontSize: 22
text: description !== "" ? description : "..."
fontColor: description !== "" ? Style.fontColorBright : Style.fontColorDimmed
Component.onCompleted: {
@ -152,7 +152,7 @@ Item {
anchors.rightMargin: 10
anchors.verticalCenter: parent.verticalCenter
fontSize: 14
fontSize: 24
fontBold: true
text: amount
fontColor: !isout ? Style.historyFontColorPlusAmount : Style.historyFontColorMinAmount

8
src/vr/qml/wallet/ReceivePage.qml

@ -29,7 +29,7 @@ MyStackViewPage {
MyText {
width: parent.width
wrap: true
fontSize: 14
fontSize: 21
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."
}
@ -46,7 +46,7 @@ MyStackViewPage {
id: statusText
width: parent.width
visible: true
fontSize: 14
fontSize: 21
fontColor: Style.fontColorBright
text: "Generating PIN..."
}
@ -56,7 +56,7 @@ MyStackViewPage {
text: "- - - -"
color: Style.fontColor
font.bold: true
font.pointSize: 40
font.pointSize: 60
leftPadding: 20
rightPadding: 20
@ -92,7 +92,7 @@ MyStackViewPage {
MyText {
width: parent.width
fontSize: 14
fontSize: 21
wrap: true
fontColor: Style.fontColorBright
text: "Alternatively, you may use one of the following methods to retreive your address."

2
src/vr/qml/wallet/send/SendPageNavBack.qml

@ -38,7 +38,7 @@ RowLayout {
Layout.alignment: Qt.AlignLeft
fontBold: true
text: "back"
fontSize: 16
fontSize: 24
}
}

6
src/vr/qml/wallet/send/SendPagePIN.qml

@ -55,7 +55,7 @@ ColumnLayout {
text: (root.pin[0] || ".") + " " + (root.pin[1] || ".") + " " + (root.pin[2] || ".") + " " + (root.pin[3] || ".");
color: Style.fontColor
font.bold: true
font.pointSize: 40
font.pointSize: 60
leftPadding: 20
rightPadding: 20
@ -91,7 +91,7 @@ ColumnLayout {
Layout.fillWidth: true
MyText {
fontSize: 18
fontSize: 22
fontColor: Style.fontColorBright
text: "Waiting on input..."
}
@ -105,7 +105,7 @@ ColumnLayout {
Layout.fillWidth: true
MyText {
fontSize: 18
fontSize: 22
fontColor: Style.fontColorBright
text: "Looking up address..."
}

4
src/vr/qml/wallet/send/SendPageTransfer.qml

@ -125,7 +125,7 @@ ColumnLayout {
Layout.preferredHeight: 68
MyText {
fontSize: 24
fontSize: 32
fontColor: Style.fontColorBright
text: {
let rtn = "";
@ -172,7 +172,7 @@ ColumnLayout {
MyText {
id: fiatText
fontSize: 18
fontSize: 26
fontColor: Style.fontColorBright
text: {
let rtn = "";

Loading…
Cancel
Save