diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui index ba007aa78..ed649696e 100644 --- a/ground/openpilotgcs/src/plugins/config/stabilization.ui +++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui @@ -25419,7 +25419,7 @@ border-radius: 5; - <html><head/><body><p>How fast the vehicle should climb or descent to compensate a certain altitude difference. higher values could result in more accurate altitude hold but also more violent control actions, lower values are safer and ensure smoother flight. The default value should be fine for the majority of crafts.</p></body></html> + <html><head/><body><p>How fast the vehicle should climb or descent to compensate a certain altitude difference. Higher values could result in more accurate altitude hold but also more violent control actions, lower values are safer and ensure smoother flight. The default value should be fine for the majority of crafts.</p></body></html> 100 diff --git a/ground/openpilotgcs/src/plugins/coreplugin/core.qrc b/ground/openpilotgcs/src/plugins/coreplugin/core.qrc index f850c7aee..2a0fe8591 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/core.qrc +++ b/ground/openpilotgcs/src/plugins/coreplugin/core.qrc @@ -1,5 +1,6 @@ + images/openpilot_logo_500.png images/openpilot_logo_256.png images/openpilot_logo_128.png images/openpilot_logo_64.png diff --git a/ground/openpilotgcs/src/plugins/coreplugin/images/openpilot_logo_500.png b/ground/openpilotgcs/src/plugins/coreplugin/images/openpilot_logo_500.png new file mode 100644 index 000000000..2e44c1696 Binary files /dev/null and b/ground/openpilotgcs/src/plugins/coreplugin/images/openpilot_logo_500.png differ diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp index 60dad2b28..7f381b1fa 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp @@ -105,7 +105,7 @@ void AirframeInitialTuningPage::updatePhoto(QJsonObject *templ) QByteArray imageData = QByteArray::fromBase64(templ->value("photo").toString().toLatin1()); photo.loadFromData(imageData, "PNG"); } else { - photo.load(":/core/images/opie_90x120.gif"); + photo.load(":/core/images/openpilot_logo_500.png"); } m_photoItem = ui->templateImage->scene()->addPixmap(photo); ui->templateImage->setSceneRect(ui->templateImage->scene()->itemsBoundingRect()); @@ -133,7 +133,12 @@ void AirframeInitialTuningPage::updateDescription(QJsonObject *templ) description.append("").append(tr("Comments: ")).append("").append(templ->value("comment").toString()); ui->templateDescription->setText(description); } else { - ui->templateDescription->setText(tr("No vehicle selected!")); + ui->templateDescription->setText(tr("This option will use the current tuning settings saved on the controller, if your controller " + "is currently unconfigured, then the OpenPilot firmware defaults will be used.\n\n" + "It is suggested that if this is a first time configuration of your controller, rather than " + "use this option, instead select a tunning set that matches your own airframe as close as " + "possible from the list above or if you are not able to fine one, then select the generic item " + "from the list.")); } } @@ -181,7 +186,7 @@ void AirframeInitialTuningPage::loadValidFiles() void AirframeInitialTuningPage::setupTemplateList() { - QListWidgetItem *item = new QListWidgetItem(tr("None"), ui->templateList); + QListWidgetItem *item = new QListWidgetItem(tr("Current Tuning"), ui->templateList); item->setData(Qt::UserRole + 1, QVariant::fromValue((QJsonObject *)NULL)); foreach(QString templ, m_templates.keys()) { diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.ui b/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.ui index 4711d3fe5..8ea01d473 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.ui +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.ui @@ -531,7 +531,7 @@ false - Ok + Export diff --git a/ground/openpilotgcs/src/plugins/welcome/qml/ActivityPanel.qml b/ground/openpilotgcs/src/plugins/welcome/qml/ActivityPanel.qml index fdc258500..e1c808969 100644 --- a/ground/openpilotgcs/src/plugins/welcome/qml/ActivityPanel.qml +++ b/ground/openpilotgcs/src/plugins/welcome/qml/ActivityPanel.qml @@ -131,8 +131,9 @@ Item { id: middleRow anchors.left: parent.left anchors.leftMargin: 25 - property string prefix: "" + Text { + property string prefix: "" width: container.width - anchors.leftMargin - icon.width - 24 - 8 wrapMode: Text.WrapAtWordBoundaryOrAnywhere textFormat: Text.RichText @@ -140,37 +141,37 @@ Item { text: { switch(action) { case "commented": - case "comment": parent.prefix = qsTr("Commented on "); break; + case "comment": prefix = qsTr("Commented on "); break; case "post": - case "created": parent.prefix = qsTr("Created "); break; - case "create-and-start": parent.prefix = qsTr("Created and started "); break; - case "complete": parent.prefix = qsTr("Completed "); break; + case "created": prefix = qsTr("Created "); break; + case "create-and-start": prefix = qsTr("Created and started "); break; + case "complete": prefix = qsTr("Completed "); break; case "close": - case "closed": parent.prefix = qsTr("Closed "); break; - case "abandon": parent.prefix = qsTr("Abandoned "); break; - case "commit": parent.prefix = qsTr("Committed "); break; - case "resolved": parent.prefix = qsTr("Resolved "); break; - case "start": parent.prefix = qsTr("Started "); break; - case "started": parent.prefix = qsTr("Started working on "); break; - case "stopped": parent.prefix = qsTr("Stopped working on "); break; - case "Code Review": parent.prefix = qsTr("Requested code review on "); break; - case "Testing": parent.prefix = qsTr("Requested testing of "); break; - case "": parent.prefix = qsTr("Updated "); break; - default: parent.prefix = action.substr(0, 1).toUpperCase() + action.substr(1) + " " ; break; + case "closed": prefix = qsTr("Closed "); break; + case "abandon": prefix = qsTr("Abandoned "); break; + case "commit": prefix = qsTr("Committed "); break; + case "resolved": prefix = qsTr("Resolved "); break; + case "start": prefix = qsTr("Started "); break; + case "started": prefix = qsTr("Started working on "); break; + case "stopped": prefix = qsTr("Stopped working on "); break; + case "Code Review": prefix = qsTr("Requested code review on "); break; + case "Testing": prefix = qsTr("Requested testing of "); break; + case "": prefix = qsTr("Updated "); break; + default: prefix = action.substr(0, 1).toUpperCase() + action.substr(1) + " " ; break; } - parent.prefix = "" + parent.prefix + "" + prefix = "" + prefix + "" if(action == "commented" || action == "comment" || (action == "" && actionSummary == "")) { if(actionTargetTitle != actionTargetSummary) { - parent.prefix + actionTargetTitle + ": " + actionTargetSummary + prefix + actionTargetTitle + ": " + actionTargetSummary } else { - parent.prefix + actionTargetTitle + prefix + actionTargetTitle } } else { if(actionSummary == "") { - parent.prefix + actionTitle + prefix + actionTitle } else { - parent.prefix + actionTitle + ": " + actionSummary + prefix + actionTitle + ": " + actionSummary } } } diff --git a/ground/openpilotgcs/src/plugins/welcome/qml/main.qml b/ground/openpilotgcs/src/plugins/welcome/qml/main.qml index 97ddb8e5d..a3d47b56d 100644 --- a/ground/openpilotgcs/src/plugins/welcome/qml/main.qml +++ b/ground/openpilotgcs/src/plugins/welcome/qml/main.qml @@ -4,6 +4,7 @@ Rectangle { id: container width: 1024 height: 768 + anchors.horizontalCenter: parent.horizontalCenter color: "#272727" @@ -115,31 +116,25 @@ Rectangle { height: 18 anchors.horizontalCenter: parent.horizontalCenter - width: textOpVersion.width + textOpVersionAvailable.width + width: textOpVersion.width + textOpVersionAvailable.width + this.spacing spacing: 16 Text { id: textOpVersion color: "#c4c0c0" text: welcomePlugin.versionString - verticalAlignment: Text.AlignTop - anchors.left: parent.anchors.left font.bold: true styleColor: "#00000000" - horizontalAlignment: Text.AlignHCenter font.pixelSize: 14 } Text { id: textOpVersionAvailable color: "#5fcf07" text: welcomePlugin.newVersionText - anchors.rightMargin: 0 font.bold: true font.underline: true styleColor: "#00000000" - horizontalAlignment: Text.AlignHCenter font.pixelSize: 14 - anchors.left: textOpVersion.right MouseArea{ id: mouseAreaOpVersionAvailable hoverEnabled: true diff --git a/package/winx86/openpilotgcs.nsi b/package/winx86/openpilotgcs.nsi index e8fc236f2..4ebc32612 100644 --- a/package/winx86/openpilotgcs.nsi +++ b/package/winx86/openpilotgcs.nsi @@ -1,4 +1,4 @@ -# +# # Project: OpenPilot # NSIS configuration file for OpenPilot GCS # The OpenPilot Team, http://www.openpilot.org, Copyright (C) 2010-2014. @@ -72,7 +72,7 @@ VIAddVersionKey "Comments" "${INSTALLER_NAME}. ${BUILD_DESCRIPTION}" VIAddVersionKey "CompanyName" "The OpenPilot Team, http://www.openpilot.org" VIAddVersionKey "LegalTrademarks" "${PRODUCT_NAME} is a trademark of The OpenPilot Team" - VIAddVersionKey "LegalCopyright" "© 2010-2014 The OpenPilot Team" + VIAddVersionKey "LegalCopyright" "© 2010-2014 The OpenPilot Team" VIAddVersionKey "FileDescription" "${INSTALLER_NAME}" ;-------------------------------- @@ -93,7 +93,7 @@ ;-------------------------------- ; Branding - BrandingText "© 2010-2014 The OpenPilot Team, http://www.openpilot.org" + BrandingText "© 2010-2014 The OpenPilot Team, http://www.openpilot.org" !define MUI_ICON "${NSIS_DATA_TREE}\resources\openpilot.ico" !define MUI_HEADERIMAGE