rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/laurent/OP-1562_Welcome_plugin_warnings' into rel-14.10

Browse Source
This commit is contained in:
Fredrik Larsson 2014-10-24 03:26:06 +11:00
commit 35fdc803be
2 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ground/openpilotgcs/src/plugins/welcome/qml/ActivityPanel.qml
View File

@ -131,8 +131,9 @@ Item {
id: middleRow id: middleRow
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 25 anchors.leftMargin: 25
property string prefix: ""
Text { Text {
property string prefix: ""
width: container.width - anchors.leftMargin - icon.width - 24 - 8 width: container.width - anchors.leftMargin - icon.width - 24 - 8
wrapMode: Text.WrapAtWordBoundaryOrAnywhere wrapMode: Text.WrapAtWordBoundaryOrAnywhere
textFormat: Text.RichText textFormat: Text.RichText
@ -140,37 +141,37 @@ Item {
text: { text: {
switch(action) { switch(action) {
case "commented": case "commented":
case "comment": parent.prefix = qsTr("Commented on "); break; case "comment": prefix = qsTr("Commented on "); break;
case "post": case "post":
case "created": parent.prefix = qsTr("Created "); break; case "created": prefix = qsTr("Created "); break;
case "create-and-start": parent.prefix = qsTr("Created and started "); break; case "create-and-start": prefix = qsTr("Created and started "); break;
case "complete": parent.prefix = qsTr("Completed "); break; case "complete": prefix = qsTr("Completed "); break;
case "close": case "close":
case "closed": parent.prefix = qsTr("Closed "); break; case "closed": prefix = qsTr("Closed "); break;
case "abandon": parent.prefix = qsTr("Abandoned "); break; case "abandon": prefix = qsTr("Abandoned "); break;
case "commit": parent.prefix = qsTr("Committed "); break; case "commit": prefix = qsTr("Committed "); break;
case "resolved": parent.prefix = qsTr("Resolved "); break; case "resolved": prefix = qsTr("Resolved "); break;
case "start": parent.prefix = qsTr("Started "); break; case "start": prefix = qsTr("Started "); break;
case "started": parent.prefix = qsTr("Started working on "); break; case "started": prefix = qsTr("Started working on "); break;
case "stopped": parent.prefix = qsTr("Stopped working on "); break; case "stopped": prefix = qsTr("Stopped working on "); break;
case "Code Review": parent.prefix = qsTr("Requested code review on "); break; case "Code Review": prefix = qsTr("Requested code review on "); break;
case "Testing": parent.prefix = qsTr("Requested testing of "); break; case "Testing": prefix = qsTr("Requested testing of "); break;
case "": parent.prefix = qsTr("Updated "); break; case "": prefix = qsTr("Updated "); break;
default: parent.prefix = action.substr(0, 1).toUpperCase() + action.substr(1) + " " ; break; default: prefix = action.substr(0, 1).toUpperCase() + action.substr(1) + " " ; break;
} }
parent.prefix = "<font color='#224d81'>" + parent.prefix + "</font>" prefix = "<font color='#224d81'>" + prefix + "</font>"
if(action == "commented" || action == "comment" || (action == "" && actionSummary == "")) { if(action == "commented" || action == "comment" || (action == "" && actionSummary == "")) {
if(actionTargetTitle != actionTargetSummary) { if(actionTargetTitle != actionTargetSummary) {
parent.prefix + actionTargetTitle + ": " + actionTargetSummary prefix + actionTargetTitle + ": " + actionTargetSummary
} else { } else {
parent.prefix + actionTargetTitle prefix + actionTargetTitle
} }
} }
else { else {
if(actionSummary == "") { if(actionSummary == "") {
parent.prefix + actionTitle prefix + actionTitle
} else { } else {
parent.prefix + actionTitle + ": " + actionSummary prefix + actionTitle + ": " + actionSummary
} }
} }
} }

9
ground/openpilotgcs/src/plugins/welcome/qml/main.qml
View File

@ -4,6 +4,7 @@ Rectangle {
id: container id: container
width: 1024 width: 1024
height: 768 height: 768
anchors.horizontalCenter: parent.horizontalCenter
color: "#272727" color: "#272727"
@ -115,31 +116,25 @@ Rectangle {
height: 18 height: 18
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: textOpVersion.width + textOpVersionAvailable.width width: textOpVersion.width + textOpVersionAvailable.width + this.spacing
spacing: 16 spacing: 16
Text { Text {
id: textOpVersion id: textOpVersion
color: "#c4c0c0" color: "#c4c0c0"
text: welcomePlugin.versionString text: welcomePlugin.versionString
verticalAlignment: Text.AlignTop
anchors.left: parent.anchors.left
font.bold: true font.bold: true
styleColor: "#00000000" styleColor: "#00000000"
horizontalAlignment: Text.AlignHCenter
font.pixelSize: 14 font.pixelSize: 14
} }
Text { Text {
id: textOpVersionAvailable id: textOpVersionAvailable
color: "#5fcf07" color: "#5fcf07"
text: welcomePlugin.newVersionText text: welcomePlugin.newVersionText
anchors.rightMargin: 0
font.bold: true font.bold: true
font.underline: true font.underline: true
styleColor: "#00000000" styleColor: "#00000000"
horizontalAlignment: Text.AlignHCenter
font.pixelSize: 14 font.pixelSize: 14
anchors.left: textOpVersion.right
MouseArea{ MouseArea{
id: mouseAreaOpVersionAvailable id: mouseAreaOpVersionAvailable
hoverEnabled: true hoverEnabled: true