diff --git a/brmbar3/brmbar-gui-qt4/BarButton.qml b/brmbar3/brmbar-gui-qt4/BarButton.qml index c9c9b61..494b1a0 100644 --- a/brmbar3/brmbar-gui-qt4/BarButton.qml +++ b/brmbar3/brmbar-gui-qt4/BarButton.qml @@ -9,7 +9,7 @@ Rectangle { border.color: btnColor property string text: "Button" - property int fontSize: 44 + property int fontSize: 60 property variant btnColor: "#ffffff" signal buttonClick @@ -19,7 +19,7 @@ Rectangle { id: text1 text: parent.text color: parent.btnColor - font.pointSize: parent.fontSize + font.pixelSize: parent.fontSize scale: if (!mousearea1.pressed) { 1 } else { 0.95 } horizontalAlignment: Text.AlignHCenter anchors.fill: parent diff --git a/brmbar3/brmbar-gui-qt4/BarClock.qml b/brmbar3/brmbar-gui-qt4/BarClock.qml index 2840857..45ea69c 100644 --- a/brmbar3/brmbar-gui-qt4/BarClock.qml +++ b/brmbar3/brmbar-gui-qt4/BarClock.qml @@ -7,7 +7,7 @@ Rectangle { height: 65 property variant now: new Date() property variant textColor: "#000000" - property variant textSize: 12 + property variant textSize: 16 Timer { id: clockUpdater interval: 1000 // update clock every second @@ -22,6 +22,6 @@ Rectangle { anchors.centerIn: parent text: Qt.formatDateTime(parent.now, "hh:mm:ss") color: parent.textColor - font.pointSize: parent.textSize + font.pixelSize: parent.textSize } } diff --git a/brmbar3/brmbar-gui-qt4/BarKeyboard.qml b/brmbar3/brmbar-gui-qt4/BarKeyboard.qml index fcf13a2..2d08b36 100644 --- a/brmbar3/brmbar-gui-qt4/BarKeyboard.qml +++ b/brmbar3/brmbar-gui-qt4/BarKeyboard.qml @@ -24,7 +24,7 @@ Grid { property bool special: key == "^" || key == "<" text: key == "^" ? "shift" : key == "<" ? "bksp" : key - fontSize: special ? 20 : 44 + fontSize: special ? 27 : 60 onButtonClick: { if (key == "^") diff --git a/brmbar3/brmbar-gui-qt4/BarTextHint.qml b/brmbar3/brmbar-gui-qt4/BarTextHint.qml index 4ef4e92..dcb10fc 100644 --- a/brmbar3/brmbar-gui-qt4/BarTextHint.qml +++ b/brmbar3/brmbar-gui-qt4/BarTextHint.qml @@ -19,7 +19,7 @@ Item { anchors.bottomMargin: 0 anchors.top: parent.top anchors.topMargin: 0 - font.pointSize: 44 + font.pixelSize: 60 } Text { @@ -33,6 +33,6 @@ Item { anchors.topMargin: 0 anchors.right: parent.right anchors.rightMargin: 0 - transformOrigin: Item.Center; smooth: true; font.bold: false; wrapMode: Text.NoWrap; font.pointSize: 44;horizontalAlignment: Text.AlignHCenter + transformOrigin: Item.Center; smooth: true; font.bold: false; wrapMode: Text.NoWrap; font.pixelSize: 60;horizontalAlignment: Text.AlignHCenter } } diff --git a/brmbar3/brmbar-gui-qt4/BasePage.qml b/brmbar3/brmbar-gui-qt4/BasePage.qml index 074c045..02e0b7a 100644 --- a/brmbar3/brmbar-gui-qt4/BasePage.qml +++ b/brmbar3/brmbar-gui-qt4/BasePage.qml @@ -12,7 +12,7 @@ Rectangle { y: 35 color: "#71cccc" text: "brmbar v3" - font.pointSize: 36 + font.pixelSize: 49 } BarClock { id: clock @@ -20,7 +20,7 @@ Rectangle { y: 35 color: "#000000" textColor: "#71cccc" - textSize: 36 + textSize: 49 } Image { @@ -43,7 +43,7 @@ Rectangle { text: "" horizontalAlignment: Text.AlignHCenter //anchors.horizontalCenter: clock.horizontalCenter - font.pointSize: 36 + font.pixelSize: 49 state: "HIDDEN" opacity: 0 diff --git a/brmbar3/brmbar-gui-qt4/ChargeCredit.qml b/brmbar3/brmbar-gui-qt4/ChargeCredit.qml index ccc56d6..1e90715 100644 --- a/brmbar3/brmbar-gui-qt4/ChargeCredit.qml +++ b/brmbar3/brmbar-gui-qt4/ChargeCredit.qml @@ -21,7 +21,7 @@ Item { wrapMode: Text.WordWrap horizontalAlignment: Text.AlignRight verticalAlignment: Text.AlignVCenter - font.pointSize: 44 + font.pixelSize: 60 } Text { @@ -34,7 +34,7 @@ Item { text: parent.amount horizontalAlignment: Text.AlignRight verticalAlignment: Text.AlignVCenter - font.pointSize: 90 + font.pixelSize: 122 } BarTextHint { @@ -80,7 +80,7 @@ Item { y: 582 width: 360 text: "Charge" - fontSize: 44 + fontSize: 60 visible: parent.amount && parent.userdbid onButtonClick: { parent.chargeCredit() diff --git a/brmbar3/brmbar-gui-qt4/ItemEdit.qml b/brmbar3/brmbar-gui-qt4/ItemEdit.qml index 611bf44..76df3bd 100644 --- a/brmbar3/brmbar-gui-qt4/ItemEdit.qml +++ b/brmbar3/brmbar-gui-qt4/ItemEdit.qml @@ -51,7 +51,7 @@ Item { text: page.name wrapMode: Text.WordWrap verticalAlignment: Text.AlignVCenter - font.pointSize: 34 + font.pixelSize: 46 } BarButton { @@ -60,7 +60,7 @@ Item { y: 0 width: 240 height: 60 - fontSize: 34 + fontSize: 46 text: page.state == "name_edit" ? "Assign" : "Edit" onButtonClick: { if (page.state == "name_edit") page.state = "normal"; else page.state = "name_edit"; } } @@ -92,7 +92,7 @@ Item { color: "#ffffff" text: "Buy price:" verticalAlignment: Text.AlignVCenter - font.pointSize: 34 + font.pixelSize: 46 } Text { @@ -105,7 +105,7 @@ Item { text: info.buy_price horizontalAlignment: Text.AlignRight verticalAlignment: Text.AlignVCenter - font.pointSize: 34 + font.pixelSize: 46 } BarButton { @@ -114,7 +114,7 @@ Item { y: 0 width: 240 height: 60 - fontSize: 34 + fontSize: 46 text: page.state == "buyprice_edit" ? "Assign" : "Edit" onButtonClick: { if (page.state == "buyprice_edit") page.state = "normal"; else page.state = "buyprice_edit"; } } @@ -146,7 +146,7 @@ Item { color: "#ffffff" text: "Sell price:" verticalAlignment: Text.AlignVCenter - font.pointSize: 34 + font.pixelSize: 46 } Text { @@ -159,7 +159,7 @@ Item { text: info.price horizontalAlignment: Text.AlignRight verticalAlignment: Text.AlignVCenter - font.pointSize: 34 + font.pixelSize: 46 } BarButton { @@ -168,7 +168,7 @@ Item { y: 0 width: 240 height: 60 - fontSize: 34 + fontSize: 46 text: page.state == "sellprice_edit" ? "Assign" : "Edit" onButtonClick: { if (page.state == "sellprice_edit") page.state = "normal"; else page.state = "sellprice_edit"; } } @@ -200,7 +200,7 @@ Item { color: "#ffffff" text: "Quantity:" verticalAlignment: Text.AlignVCenter - font.pointSize: 34 + font.pixelSize: 46 } Text { @@ -213,7 +213,7 @@ Item { text: info.balance horizontalAlignment: Text.AlignRight verticalAlignment: Text.AlignVCenter - font.pointSize: 34 + font.pixelSize: 46 } BarButton { @@ -222,7 +222,7 @@ Item { y: 0 width: 240 height: 60 - fontSize: 34 + fontSize: 46 text: page.state == "balance_edit" ? "Add qty" : "Restock" onButtonClick: { if (page.state == "balance_edit") { @@ -259,7 +259,7 @@ Item { color: "#ffffff" text: "Add quantity:" verticalAlignment: Text.AlignVCenter - font.pointSize: 34 + font.pixelSize: 46 } Text { @@ -271,7 +271,7 @@ Item { color: "#ffff7c" text: "" verticalAlignment: Text.AlignVCenter - font.pointSize: 44 + font.pixelSize: 60 } Text { @@ -282,7 +282,7 @@ Item { width: 248 color: "#71cccc" text: "Please specify the precise amount of newly\nstocked goods, even if the current quantity\nvalue does not match reality (you can let us\nknow about that at brmbar@brmlab.cz)" - font.pointSize: 20 + font.pixelSize: 27 } } diff --git a/brmbar3/brmbar-gui-qt4/ItemInfo.qml b/brmbar3/brmbar-gui-qt4/ItemInfo.qml index 5f13ed3..9ab7906 100644 --- a/brmbar3/brmbar-gui-qt4/ItemInfo.qml +++ b/brmbar3/brmbar-gui-qt4/ItemInfo.qml @@ -20,7 +20,7 @@ Item { text: parent.name wrapMode: Text.WordWrap verticalAlignment: Text.AlignVCenter - font.pointSize: 44 + font.pixelSize: 60 } Text { @@ -33,7 +33,7 @@ Item { text: parent.price horizontalAlignment: Text.AlignRight verticalAlignment: Text.AlignVCenter - font.pointSize: 90 + font.pixelSize: 122 } BarTextHint { @@ -68,7 +68,7 @@ Item { y: 582 width: 360 text: "Pay by cash" - fontSize: 44 + fontSize: 60 onButtonClick: { shop.sellItemCash(dbid) status_text.setStatus("Sold! Put " + price + " Kč in the money box.", "#ffff7c") diff --git a/brmbar3/brmbar-gui-qt4/MainPage.qml b/brmbar3/brmbar-gui-qt4/MainPage.qml index 4a71053..e17571a 100644 --- a/brmbar3/brmbar-gui-qt4/MainPage.qml +++ b/brmbar3/brmbar-gui-qt4/MainPage.qml @@ -31,7 +31,7 @@ Item { y: 430 width: 360 text: "Select Item" - fontSize: 44 + fontSize: 60 btnColor: "#666666" } diff --git a/brmbar3/brmbar-gui-qt4/Management.qml b/brmbar3/brmbar-gui-qt4/Management.qml index 68c5018..068b74a 100644 --- a/brmbar3/brmbar-gui-qt4/Management.qml +++ b/brmbar3/brmbar-gui-qt4/Management.qml @@ -21,7 +21,7 @@ Item { text: "Profit:" wrapMode: Text.WordWrap verticalAlignment: Text.AlignVCenter - font.pointSize: 34 + font.pixelSize: 46 } Text { @@ -34,7 +34,7 @@ Item { text: parent.profit verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignRight - font.pointSize: 34 + font.pixelSize: 46 } Text { @@ -47,7 +47,7 @@ Item { text: "Cash:" wrapMode: Text.WordWrap verticalAlignment: Text.AlignVCenter - font.pointSize: 34 + font.pixelSize: 46 } Text { @@ -60,7 +60,7 @@ Item { text: parent.cash verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignRight - font.pointSize: 34 + font.pixelSize: 46 } Text { @@ -73,7 +73,7 @@ Item { text: "Credit:" wrapMode: Text.WordWrap verticalAlignment: Text.AlignVCenter - font.pointSize: 34 + font.pixelSize: 46 } Text { @@ -86,7 +86,7 @@ Item { text: parent.credit_money verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignRight - font.pointSize: 34 + font.pixelSize: 46 } Text { @@ -99,7 +99,7 @@ Item { text: "Stock:" wrapMode: Text.WordWrap verticalAlignment: Text.AlignVCenter - font.pointSize: 34 + font.pixelSize: 46 } Text { @@ -112,7 +112,7 @@ Item { text: parent.inv_money verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignRight - font.pointSize: 34 + font.pixelSize: 46 } BarButton { diff --git a/brmbar3/brmbar-gui-qt4/Receipt.qml b/brmbar3/brmbar-gui-qt4/Receipt.qml index 55f28f2..03becd4 100644 --- a/brmbar3/brmbar-gui-qt4/Receipt.qml +++ b/brmbar3/brmbar-gui-qt4/Receipt.qml @@ -43,7 +43,7 @@ Item { text: page.description wrapMode: Text.WordWrap verticalAlignment: Text.AlignVCenter - font.pointSize: 34 + font.pixelSize: 46 } BarButton { @@ -52,7 +52,7 @@ Item { y: 0 width: 300 height: 60 - fontSize: 34 + fontSize: 46 text: page.state == "description_edit" ? "Assign" : "Description" onButtonClick: { if (page.state == "description_edit") page.state = "normal"; else page.state = "description_edit"; } } @@ -84,7 +84,7 @@ Item { color: "#ffffff" text: "Money Amount:" verticalAlignment: Text.AlignVCenter - font.pointSize: 34 + font.pixelSize: 46 } Text { @@ -97,7 +97,7 @@ Item { text: amount horizontalAlignment: Text.AlignRight verticalAlignment: Text.AlignVCenter - font.pointSize: 34 + font.pixelSize: 46 } BarButton { @@ -106,7 +106,7 @@ Item { y: 0 width: 240 height: 60 - fontSize: 34 + fontSize: 46 text: page.state == "amount_edit" ? "Assign" : "Edit" onButtonClick: { if (page.state == "amount_edit") page.state = "normal"; else page.state = "amount_edit"; } } @@ -141,7 +141,7 @@ Item { text: "This is for cashing in small brmlab expenses.\nWrite the current date on the receipt and put it to the money box.\nDo not forget to announce this on a meetup and add it to the [[newz]].\nFor restocking brmbar items, please go to the Management view instead." wrapMode: Text.WordWrap horizontalAlignment: Text.AlignHCenter - font.pointSize: 20 + font.pixelSize: 27 } BarButton { diff --git a/brmbar3/brmbar-gui-qt4/StockMgmt.qml b/brmbar3/brmbar-gui-qt4/StockMgmt.qml index 80e9672..4e7db18 100644 --- a/brmbar3/brmbar-gui-qt4/StockMgmt.qml +++ b/brmbar3/brmbar-gui-qt4/StockMgmt.qml @@ -44,7 +44,7 @@ Item { text: modelData.name anchors.verticalCenter: parent.verticalCenter color: "#ffffff" - font.pointSize: 34 + font.pixelSize: 46 } Text { @@ -54,7 +54,7 @@ Item { color: "#ffff7c" text: modelData.price horizontalAlignment: Text.AlignRight - font.pointSize: 34 + font.pixelSize: 46 } BarButton { @@ -63,7 +63,7 @@ Item { width: 240 height: 68 text: "Edit" - fontSize: 34 + fontSize: 46 onButtonClick: { loadPage("ItemEdit", { name: modelData.name, dbid: modelData.id }) } @@ -86,7 +86,7 @@ Item { y: 582 width: 360 text: "Add Item" - fontSize: 44 + fontSize: 60 onButtonClick: { loadPage("ItemEdit", { name: "", dbid: "" }) } diff --git a/brmbar3/brmbar-gui-qt4/UserInfo.qml b/brmbar3/brmbar-gui-qt4/UserInfo.qml index f54f04b..be74e17 100644 --- a/brmbar3/brmbar-gui-qt4/UserInfo.qml +++ b/brmbar3/brmbar-gui-qt4/UserInfo.qml @@ -19,7 +19,7 @@ Item { text: parent.name wrapMode: Text.WordWrap verticalAlignment: Text.AlignVCenter - font.pointSize: 44 + font.pixelSize: 60 } Text { @@ -32,7 +32,7 @@ Item { text: parent.negbalance horizontalAlignment: Text.AlignRight verticalAlignment: Text.AlignVCenter - font.pointSize: 90 + font.pixelSize: 122 } BarcodeInput { @@ -58,7 +58,7 @@ Item { y: 582 width: 360 text: "Charge" - fontSize: 44 + fontSize: 60 onButtonClick: { loadPage("ChargeCredit", { "username": name, "userdbid": dbid }) } diff --git a/brmbar3/brmbar-gui-qt4/UserMgmt.qml b/brmbar3/brmbar-gui-qt4/UserMgmt.qml index 6e87bb0..ad60f64 100644 --- a/brmbar3/brmbar-gui-qt4/UserMgmt.qml +++ b/brmbar3/brmbar-gui-qt4/UserMgmt.qml @@ -45,7 +45,7 @@ Item { text: modelData.name anchors.verticalCenter: parent.verticalCenter color: "#ffffff" - font.pointSize: 34 + font.pixelSize: 46 } Text { @@ -55,7 +55,7 @@ Item { color: "#ffff7c" text: modelData.negbalance_str horizontalAlignment: Text.AlignRight - font.pointSize: 34 + font.pixelSize: 46 } BarButton { @@ -64,7 +64,7 @@ Item { width: 240 height: 68 text: "Withdraw" - fontSize: 34 + fontSize: 46 onButtonClick: { loadPage("Withdraw", { username: modelData.name, userdbid: modelData.id }) } @@ -87,7 +87,7 @@ Item { y: 582 width: 360 text: "Add User" - fontSize: 44 + fontSize: 60 btnColor: "#666666" } diff --git a/brmbar3/brmbar-gui-qt4/Withdraw.qml b/brmbar3/brmbar-gui-qt4/Withdraw.qml index fe56f12..e202d31 100644 --- a/brmbar3/brmbar-gui-qt4/Withdraw.qml +++ b/brmbar3/brmbar-gui-qt4/Withdraw.qml @@ -21,7 +21,7 @@ Item { wrapMode: Text.WordWrap horizontalAlignment: Text.AlignRight verticalAlignment: Text.AlignVCenter - font.pointSize: 44 + font.pixelSize: 60 } Text { @@ -34,7 +34,7 @@ Item { text: parent.amount ? "-" + parent.amount : "" horizontalAlignment: Text.AlignRight verticalAlignment: Text.AlignVCenter - font.pointSize: 90 + font.pixelSize: 122 } BarTextHint { @@ -80,7 +80,7 @@ Item { y: 582 width: 360 text: "Withdraw" - fontSize: 44 + fontSize: 60 visible: parent.amount && parent.userdbid onButtonClick: { parent.withdrawCredit()