Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 17:03:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update upgrade dialog

Browse source 
- Strip out "<br />"s
- Show information for all new versions since current, not just latest
- Display scrollbar if content too long to show all at once
- "version" / "versions" behind depending on if one or more
- Align buttons with heading and text
- Darken text so that is more readable
This commit is contained in:
David Rowe 2015-07-06 13:19:42 -07:00
parent 21562c0766
commit 5046f4c1ac
2 changed files with 30 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,6 @@
import Hifi 1.0
import QtQuick 2.3
import QtQuick.Controls 1.3
import QtQuick.Controls.Styles 1.3
import QtGraphicalEffects 1.0
import "controls"
@ -85,33 +86,31 @@ DialogContainer {
}
}
Flickable {
ScrollView {
id: scrollArea
anchors {
top: dialogTitle.bottom
topMargin: updateDialog.closeMargin
left: dialogTitle.left
}
contentWidth: updateDialog.inputWidth
contentHeight: backgroundRectangle.height - (dialogTitle.height * 2.5)
width: updateDialog.inputWidth
height: backgroundRectangle.height - (dialogTitle.height * 2.5)
flickableDirection: Flickable.VerticalFlick
clip: true
TextEdit {
height: backgroundRectangle.height - (dialogTitle.height * 2.5) - updateDialog.closeMargin
horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
verticalScrollBarPolicy: Qt.ScrollBarAsNeeded
Text {
id: releaseNotes
wrapMode: TextEdit.Wrap
width: parent.width
readOnly: true
wrapMode: Text.Wrap
width: parent.width - updateDialog.closeMargin
text: updateDialog.releaseNotes
font.pixelSize: 14
color: hifi.colors.text
color: "#000000"
anchors {
left: parent.left
leftMargin: updateDialog.borderWidth
}
}
}
Rectangle {
id: downloadButton
width: updateDialog.buttonWidth
@ -122,7 +121,7 @@ DialogContainer {
top: scrollArea.bottom
topMargin: 10
right: backgroundRectangle.right
rightMargin: 15
rightMargin: updateDialog.borderWidth
}
Text {
text: "Upgrade"
@ -169,4 +168,4 @@ DialogContainer {
}
}
}
}
}

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

@ -24,9 +24,21 @@ UpdateDialog::UpdateDialog(QQuickItem* parent) :
int currentVersion = QCoreApplication::applicationVersion().toInt();
int latestVersion = applicationUpdater.data()->getBuildData().lastKey();
int versionsBehind = latestVersion - currentVersion;
_updateAvailableDetails = "v" + QString::number(latestVersion) + " released on " + applicationUpdater.data()->getBuildData()[latestVersion]["releaseTime"];
_updateAvailableDetails += "\nYou are " + QString::number(versionsBehind) + " versions behind";
_releaseNotes = applicationUpdater.data()->getBuildData()[latestVersion]["releaseNotes"];
_updateAvailableDetails = "v" + QString::number(latestVersion) + " released on "
+ applicationUpdater.data()->getBuildData()[latestVersion]["releaseTime"];
_updateAvailableDetails += "\nYou are " + QString::number(versionsBehind) + " version"
+ (versionsBehind > 1 ? "s" : "") + " behind";
_releaseNotes = "";
for (int i = latestVersion; i > currentVersion; i--) {
QString releaseNotes = applicationUpdater.data()->getBuildData()[i]["releaseNotes"];
releaseNotes.remove("<br />");
releaseNotes.remove(QRegExp("^\n"));
_releaseNotes += releaseNotes;
if (i > currentVersion + 1) {
_releaseNotes += "\n\n";
}
}
}
const QString& UpdateDialog::updateAvailableDetails() const {