Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 13:18:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Polished fonts, colors, etc.

Browse source
This commit is contained in:
David Rowe 2015-07-07 17:08:02 -07:00
parent b123e280d6
commit abc54f2e3f
3 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/LoginDialog.qml
View file

@ -41,8 +41,6 @@ DialogContainer {
readonly property int closeMargin: 16 readonly property int closeMargin: 16
readonly property real tan30: 0.577 // tan(30°) readonly property real tan30: 0.577 // tan(30°)
readonly property int inputSpacing: 16 readonly property int inputSpacing: 16
property int maximumX: parent ? parent.width - width : 0
property int maximumY: parent ? parent.height - height : 0
Rectangle { Rectangle {
id: backgroundRectangle id: backgroundRectangle

36
interface/resources/qml/UpdateDialog.qml
View file

@ -34,6 +34,7 @@ DialogContainer {
readonly property int buttonWidth: 100 readonly property int buttonWidth: 100
readonly property int buttonHeight: 30 readonly property int buttonHeight: 30
readonly property int noticeHeight: 15 * inputSpacing readonly property int noticeHeight: 15 * inputSpacing
readonly property string fontFamily: "Futura"
signal triggerBuildDownload signal triggerBuildDownload
signal closeUpdateDialog signal closeUpdateDialog
@ -90,12 +91,22 @@ DialogContainer {
Text { Text {
id: updateAvailable id: updateAvailable
text: "Update Available" text: "Update Available"
font {
family: updateDialog.fontFamily
pixelSize: hifi.fonts.pixelSize * 1.5
weight: Font.DemiBold
}
color: "#303030"
} }
Text { Text {
id: versionDetails id: versionDetails
text: updateDialog.updateAvailableDetails text: updateDialog.updateAvailableDetails
font.pixelSize: 14 font {
family: updateDialog.fontFamily
pixelSize: hifi.fonts.pixelSize * 0.6
letterSpacing: -0.5
}
color: hifi.colors.text color: hifi.colors.text
anchors { anchors {
top: updateAvailable.bottom top: updateAvailable.bottom
@ -109,7 +120,7 @@ DialogContainer {
border { border {
width: 1 width: 1
color: "#808080" color: "#a0a0a0"
} }
ScrollView { ScrollView {
@ -125,8 +136,11 @@ DialogContainer {
wrapMode: Text.Wrap wrapMode: Text.Wrap
width: parent.width - updateDialog.closeMargin width: parent.width - updateDialog.closeMargin
text: updateDialog.releaseNotes text: updateDialog.releaseNotes
font.pixelSize: 14 color: hifi.colors.text
color: "#000000" font {
family: updateDialog.fontFamily
pixelSize: hifi.fonts.pixelSize * 0.7
}
} }
} }
} }
@ -142,7 +156,12 @@ DialogContainer {
Text { Text {
text: "Cancel" text: "Cancel"
font.weight: Font.DemiBold color: "#0c9ab4" // Same as logo
font {
family: updateDialog.fontFamily
pixelSize: hifi.fonts.pixelSize * 1.2
weight: Font.DemiBold
}
anchors { anchors {
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
horizontalCenter: parent.horizontalCenter horizontalCenter: parent.horizontalCenter
@ -164,7 +183,12 @@ DialogContainer {
Text { Text {
text: "Update" text: "Update"
font.weight: Font.DemiBold color: "#0c9ab4" // Same as logo
font {
family: updateDialog.fontFamily
pixelSize: hifi.fonts.pixelSize * 1.2
weight: Font.DemiBold
}
anchors { anchors {
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
horizontalCenter: parent.horizontalCenter horizontalCenter: parent.horizontalCenter

2
interface/src/ui/UpdateDialog.cpp
View file

@ -25,7 +25,7 @@ UpdateDialog::UpdateDialog(QQuickItem* parent) :
int latestVersion = applicationUpdater.data()->getBuildData().lastKey(); int latestVersion = applicationUpdater.data()->getBuildData().lastKey();
int versionsBehind = latestVersion - currentVersion; int versionsBehind = latestVersion - currentVersion;
_updateAvailableDetails = "v" + QString::number(latestVersion) + " released on " _updateAvailableDetails = "v" + QString::number(latestVersion) + " released on "
+ applicationUpdater.data()->getBuildData()[latestVersion]["releaseTime"]; + QString(applicationUpdater.data()->getBuildData()[latestVersion]["releaseTime"]).replace(" ", " ");
_updateAvailableDetails += "\nYou are " + QString::number(versionsBehind) + " version" _updateAvailableDetails += "\nYou are " + QString::number(versionsBehind) + " version"
+ (versionsBehind > 1 ? "s" : "") + " behind"; + (versionsBehind > 1 ? "s" : "") + " behind";