brmlab/brmbar
4
0
Fork 0
forked from brmlab/brmbar-github
Code Issues Pull requests Projects 1 Wiki Activity

brmbarv3: Convert font sizes from points to pixels to be DPI-independent

Browse source
This commit is contained in:
Petr Baudis 2012-10-16 17:45:21 +02:00
parent 4d72dff187
commit e55f5cfa5e
15 changed files with 59 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

4
brmbar3/brmbar-gui-qt4/BarButton.qml
View file

@ -9,7 +9,7 @@ Rectangle {
border.color: btnColor border.color: btnColor
property string text: "Button" property string text: "Button"
property int fontSize: 44 property int fontSize: 60
property variant btnColor: "#ffffff" property variant btnColor: "#ffffff"
signal buttonClick signal buttonClick
@ -19,7 +19,7 @@ Rectangle {
id: text1 id: text1
text: parent.text text: parent.text
color: parent.btnColor color: parent.btnColor
font.pointSize: parent.fontSize font.pixelSize: parent.fontSize
scale: if (!mousearea1.pressed) { 1 } else { 0.95 } scale: if (!mousearea1.pressed) { 1 } else { 0.95 }
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
anchors.fill: parent anchors.fill: parent

4
brmbar3/brmbar-gui-qt4/BarClock.qml
View file

@ -7,7 +7,7 @@ Rectangle {
height: 65 height: 65
property variant now: new Date() property variant now: new Date()
property variant textColor: "#000000" property variant textColor: "#000000"
property variant textSize: 12 property variant textSize: 16
Timer { Timer {
id: clockUpdater id: clockUpdater
interval: 1000 // update clock every second interval: 1000 // update clock every second
@ -22,6 +22,6 @@ Rectangle {
anchors.centerIn: parent anchors.centerIn: parent
text: Qt.formatDateTime(parent.now, "hh:mm:ss") text: Qt.formatDateTime(parent.now, "hh:mm:ss")
color: parent.textColor color: parent.textColor
font.pointSize: parent.textSize font.pixelSize: parent.textSize
} }
} }

2
brmbar3/brmbar-gui-qt4/BarKeyboard.qml
View file

@ -24,7 +24,7 @@ Grid {
property bool special: key == "^" || key == "<" property bool special: key == "^" || key == "<"
text: key == "^" ? "shift" : key == "<" ? "bksp" : key text: key == "^" ? "shift" : key == "<" ? "bksp" : key
fontSize: special ? 20 : 44 fontSize: special ? 27 : 60
onButtonClick: { onButtonClick: {
if (key == "^") if (key == "^")

4
brmbar3/brmbar-gui-qt4/BarTextHint.qml
View file

@ -19,7 +19,7 @@ Item {
anchors.bottomMargin: 0 anchors.bottomMargin: 0
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: 0 anchors.topMargin: 0
font.pointSize: 44 font.pixelSize: 60
} }
Text { Text {
@ -33,6 +33,6 @@ Item {
anchors.topMargin: 0 anchors.topMargin: 0
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 0 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
} }
} }

6
brmbar3/brmbar-gui-qt4/BasePage.qml
View file

@ -12,7 +12,7 @@ Rectangle {
y: 35 y: 35
color: "#71cccc" color: "#71cccc"
text: "brmbar v3" text: "brmbar v3"
font.pointSize: 36 font.pixelSize: 49
} }
BarClock { BarClock {
id: clock id: clock
@ -20,7 +20,7 @@ Rectangle {
y: 35 y: 35
color: "#000000" color: "#000000"
textColor: "#71cccc" textColor: "#71cccc"
textSize: 36 textSize: 49
} }
Image { Image {
@ -43,7 +43,7 @@ Rectangle {
text: "" text: ""
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
//anchors.horizontalCenter: clock.horizontalCenter //anchors.horizontalCenter: clock.horizontalCenter
font.pointSize: 36 font.pixelSize: 49
state: "HIDDEN" state: "HIDDEN"
opacity: 0 opacity: 0

6
brmbar3/brmbar-gui-qt4/ChargeCredit.qml
View file

@ -21,7 +21,7 @@ Item {
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 44 font.pixelSize: 60
} }
Text { Text {
@ -34,7 +34,7 @@ Item {
text: parent.amount text: parent.amount
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 90 font.pixelSize: 122
} }
BarTextHint { BarTextHint {
@ -80,7 +80,7 @@ Item {
y: 582 y: 582
width: 360 width: 360
text: "Charge" text: "Charge"
fontSize: 44 fontSize: 60
visible: parent.amount && parent.userdbid visible: parent.amount && parent.userdbid
onButtonClick: { onButtonClick: {
parent.chargeCredit() parent.chargeCredit()

28
brmbar3/brmbar-gui-qt4/ItemEdit.qml
View file

@ -51,7 +51,7 @@ Item {
text: page.name text: page.name
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 34 font.pixelSize: 46
} }
BarButton { BarButton {
@ -60,7 +60,7 @@ Item {
y: 0 y: 0
width: 240 width: 240
height: 60 height: 60
fontSize: 34 fontSize: 46
text: page.state == "name_edit" ? "Assign" : "Edit" text: page.state == "name_edit" ? "Assign" : "Edit"
onButtonClick: { if (page.state == "name_edit") page.state = "normal"; else page.state = "name_edit"; } onButtonClick: { if (page.state == "name_edit") page.state = "normal"; else page.state = "name_edit"; }
} }
@ -92,7 +92,7 @@ Item {
color: "#ffffff" color: "#ffffff"
text: "Buy price:" text: "Buy price:"
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 34 font.pixelSize: 46
} }
Text { Text {
@ -105,7 +105,7 @@ Item {
text: info.buy_price text: info.buy_price
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 34 font.pixelSize: 46
} }
BarButton { BarButton {
@ -114,7 +114,7 @@ Item {
y: 0 y: 0
width: 240 width: 240
height: 60 height: 60
fontSize: 34 fontSize: 46
text: page.state == "buyprice_edit" ? "Assign" : "Edit" text: page.state == "buyprice_edit" ? "Assign" : "Edit"
onButtonClick: { if (page.state == "buyprice_edit") page.state = "normal"; else page.state = "buyprice_edit"; } onButtonClick: { if (page.state == "buyprice_edit") page.state = "normal"; else page.state = "buyprice_edit"; }
} }
@ -146,7 +146,7 @@ Item {
color: "#ffffff" color: "#ffffff"
text: "Sell price:" text: "Sell price:"
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 34 font.pixelSize: 46
} }
Text { Text {
@ -159,7 +159,7 @@ Item {
text: info.price text: info.price
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 34 font.pixelSize: 46
} }
BarButton { BarButton {
@ -168,7 +168,7 @@ Item {
y: 0 y: 0
width: 240 width: 240
height: 60 height: 60
fontSize: 34 fontSize: 46
text: page.state == "sellprice_edit" ? "Assign" : "Edit" text: page.state == "sellprice_edit" ? "Assign" : "Edit"
onButtonClick: { if (page.state == "sellprice_edit") page.state = "normal"; else page.state = "sellprice_edit"; } onButtonClick: { if (page.state == "sellprice_edit") page.state = "normal"; else page.state = "sellprice_edit"; }
} }
@ -200,7 +200,7 @@ Item {
color: "#ffffff" color: "#ffffff"
text: "Quantity:" text: "Quantity:"
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 34 font.pixelSize: 46
} }
Text { Text {
@ -213,7 +213,7 @@ Item {
text: info.balance text: info.balance
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 34 font.pixelSize: 46
} }
BarButton { BarButton {
@ -222,7 +222,7 @@ Item {
y: 0 y: 0
width: 240 width: 240
height: 60 height: 60
fontSize: 34 fontSize: 46
text: page.state == "balance_edit" ? "Add qty" : "Restock" text: page.state == "balance_edit" ? "Add qty" : "Restock"
onButtonClick: { onButtonClick: {
if (page.state == "balance_edit") { if (page.state == "balance_edit") {
@ -259,7 +259,7 @@ Item {
color: "#ffffff" color: "#ffffff"
text: "Add quantity:" text: "Add quantity:"
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 34 font.pixelSize: 46
} }
Text { Text {
@ -271,7 +271,7 @@ Item {
color: "#ffff7c" color: "#ffff7c"
text: "" text: ""
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 44 font.pixelSize: 60
} }
Text { Text {
@ -282,7 +282,7 @@ Item {
width: 248 width: 248
color: "#71cccc" 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)" 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
} }
} }

6
brmbar3/brmbar-gui-qt4/ItemInfo.qml
View file

@ -20,7 +20,7 @@ Item {
text: parent.name text: parent.name
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 44 font.pixelSize: 60
} }
Text { Text {
@ -33,7 +33,7 @@ Item {
text: parent.price text: parent.price
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 90 font.pixelSize: 122
} }
BarTextHint { BarTextHint {
@ -68,7 +68,7 @@ Item {
y: 582 y: 582
width: 360 width: 360
text: "Pay by cash" text: "Pay by cash"
fontSize: 44 fontSize: 60
onButtonClick: { onButtonClick: {
shop.sellItemCash(dbid) shop.sellItemCash(dbid)
status_text.setStatus("Sold! Put " + price + " Kč in the money box.", "#ffff7c") status_text.setStatus("Sold! Put " + price + " Kč in the money box.", "#ffff7c")

2
brmbar3/brmbar-gui-qt4/MainPage.qml
View file

@ -31,7 +31,7 @@ Item {
y: 430 y: 430
width: 360 width: 360
text: "Select Item" text: "Select Item"
fontSize: 44 fontSize: 60
btnColor: "#666666" btnColor: "#666666"
} }

16
brmbar3/brmbar-gui-qt4/Management.qml
View file

@ -21,7 +21,7 @@ Item {
text: "Profit:" text: "Profit:"
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 34 font.pixelSize: 46
} }
Text { Text {
@ -34,7 +34,7 @@ Item {
text: parent.profit text: parent.profit
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
font.pointSize: 34 font.pixelSize: 46
} }
Text { Text {
@ -47,7 +47,7 @@ Item {
text: "Cash:" text: "Cash:"
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 34 font.pixelSize: 46
} }
Text { Text {
@ -60,7 +60,7 @@ Item {
text: parent.cash text: parent.cash
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
font.pointSize: 34 font.pixelSize: 46
} }
Text { Text {
@ -73,7 +73,7 @@ Item {
text: "Credit:" text: "Credit:"
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 34 font.pixelSize: 46
} }
Text { Text {
@ -86,7 +86,7 @@ Item {
text: parent.credit_money text: parent.credit_money
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
font.pointSize: 34 font.pixelSize: 46
} }
Text { Text {
@ -99,7 +99,7 @@ Item {
text: "Stock:" text: "Stock:"
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 34 font.pixelSize: 46
} }
Text { Text {
@ -112,7 +112,7 @@ Item {
text: parent.inv_money text: parent.inv_money
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
font.pointSize: 34 font.pixelSize: 46
} }
BarButton { BarButton {

12
brmbar3/brmbar-gui-qt4/Receipt.qml
View file

@ -43,7 +43,7 @@ Item {
text: page.description text: page.description
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 34 font.pixelSize: 46
} }
BarButton { BarButton {
@ -52,7 +52,7 @@ Item {
y: 0 y: 0
width: 300 width: 300
height: 60 height: 60
fontSize: 34 fontSize: 46
text: page.state == "description_edit" ? "Assign" : "Description" text: page.state == "description_edit" ? "Assign" : "Description"
onButtonClick: { if (page.state == "description_edit") page.state = "normal"; else page.state = "description_edit"; } onButtonClick: { if (page.state == "description_edit") page.state = "normal"; else page.state = "description_edit"; }
} }
@ -84,7 +84,7 @@ Item {
color: "#ffffff" color: "#ffffff"
text: "Money Amount:" text: "Money Amount:"
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 34 font.pixelSize: 46
} }
Text { Text {
@ -97,7 +97,7 @@ Item {
text: amount text: amount
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 34 font.pixelSize: 46
} }
BarButton { BarButton {
@ -106,7 +106,7 @@ Item {
y: 0 y: 0
width: 240 width: 240
height: 60 height: 60
fontSize: 34 fontSize: 46
text: page.state == "amount_edit" ? "Assign" : "Edit" text: page.state == "amount_edit" ? "Assign" : "Edit"
onButtonClick: { if (page.state == "amount_edit") page.state = "normal"; else page.state = "amount_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." 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 wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
font.pointSize: 20 font.pixelSize: 27
} }
BarButton { BarButton {

8
brmbar3/brmbar-gui-qt4/StockMgmt.qml
View file

@ -44,7 +44,7 @@ Item {
text: modelData.name text: modelData.name
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
color: "#ffffff" color: "#ffffff"
font.pointSize: 34 font.pixelSize: 46
} }
Text { Text {
@ -54,7 +54,7 @@ Item {
color: "#ffff7c" color: "#ffff7c"
text: modelData.price text: modelData.price
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
font.pointSize: 34 font.pixelSize: 46
} }
BarButton { BarButton {
@ -63,7 +63,7 @@ Item {
width: 240 width: 240
height: 68 height: 68
text: "Edit" text: "Edit"
fontSize: 34 fontSize: 46
onButtonClick: { onButtonClick: {
loadPage("ItemEdit", { name: modelData.name, dbid: modelData.id }) loadPage("ItemEdit", { name: modelData.name, dbid: modelData.id })
} }
@ -86,7 +86,7 @@ Item {
y: 582 y: 582
width: 360 width: 360
text: "Add Item" text: "Add Item"
fontSize: 44 fontSize: 60
onButtonClick: { onButtonClick: {
loadPage("ItemEdit", { name: "", dbid: "" }) loadPage("ItemEdit", { name: "", dbid: "" })
} }

6
brmbar3/brmbar-gui-qt4/UserInfo.qml
View file

@ -19,7 +19,7 @@ Item {
text: parent.name text: parent.name
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 44 font.pixelSize: 60
} }
Text { Text {
@ -32,7 +32,7 @@ Item {
text: parent.negbalance text: parent.negbalance
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 90 font.pixelSize: 122
} }
BarcodeInput { BarcodeInput {
@ -58,7 +58,7 @@ Item {
y: 582 y: 582
width: 360 width: 360
text: "Charge" text: "Charge"
fontSize: 44 fontSize: 60
onButtonClick: { onButtonClick: {
loadPage("ChargeCredit", { "username": name, "userdbid": dbid }) loadPage("ChargeCredit", { "username": name, "userdbid": dbid })
} }

8
brmbar3/brmbar-gui-qt4/UserMgmt.qml
View file

@ -45,7 +45,7 @@ Item {
text: modelData.name text: modelData.name
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
color: "#ffffff" color: "#ffffff"
font.pointSize: 34 font.pixelSize: 46
} }
Text { Text {
@ -55,7 +55,7 @@ Item {
color: "#ffff7c" color: "#ffff7c"
text: modelData.negbalance_str text: modelData.negbalance_str
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
font.pointSize: 34 font.pixelSize: 46
} }
BarButton { BarButton {
@ -64,7 +64,7 @@ Item {
width: 240 width: 240
height: 68 height: 68
text: "Withdraw" text: "Withdraw"
fontSize: 34 fontSize: 46
onButtonClick: { onButtonClick: {
loadPage("Withdraw", { username: modelData.name, userdbid: modelData.id }) loadPage("Withdraw", { username: modelData.name, userdbid: modelData.id })
} }
@ -87,7 +87,7 @@ Item {
y: 582 y: 582
width: 360 width: 360
text: "Add User" text: "Add User"
fontSize: 44 fontSize: 60
btnColor: "#666666" btnColor: "#666666"
} }

6
brmbar3/brmbar-gui-qt4/Withdraw.qml
View file

@ -21,7 +21,7 @@ Item {
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 44 font.pixelSize: 60
} }
Text { Text {
@ -34,7 +34,7 @@ Item {
text: parent.amount ? "-" + parent.amount : "" text: parent.amount ? "-" + parent.amount : ""
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font.pointSize: 90 font.pixelSize: 122
} }
BarTextHint { BarTextHint {
@ -80,7 +80,7 @@ Item {
y: 582 y: 582
width: 360 width: 360
text: "Withdraw" text: "Withdraw"
fontSize: 44 fontSize: 60
visible: parent.amount && parent.userdbid visible: parent.amount && parent.userdbid
onButtonClick: { onButtonClick: {
parent.withdrawCredit() parent.withdrawCredit()