Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-21 23:35:22 +03:00
Code Issues Wiki Activity

Refactored version display, made text congruent.

Browse source
This commit is contained in:
mikeller 2017-10-23 09:49:21 +13:00
parent 0b1a8b0bcc
commit 6d28cac034
2 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
_locales/en/messages.json
View file

@ -213,8 +213,8 @@
"fcInfoReceived": { "fcInfoReceived": {
"message": "Flight controller info, identifier: <strong>$1</strong>, version: <strong>$2</strong>" "message": "Flight controller info, identifier: <strong>$1</strong>, version: <strong>$2</strong>"
}, },
"versionLabelHardware": { "versionLabelTarget": {
"message": "Board" "message": "Target"
}, },
"versionLabelFirmware": { "versionLabelFirmware": {
"message": "Firmware" "message": "Firmware"

31
main.js
View file

@ -518,31 +518,42 @@ function generateFilename(prefix, suffix) {
return filename + '.' + suffix; return filename + '.' + suffix;
} }
function updateTopBarVersion(firmwareVersion, firmwareId, hardwareId) { function getFirmwareVersion(firmwareVersion, firmwareId, hardwareId) {
var versionText = chrome.i18n.getMessage('versionLabelConfigurator') + ': ' + chrome.runtime.getManifest().version + '<br />'; var versionText = '';
if (firmwareVersion) { if (firmwareVersion) {
versionText += chrome.i18n.getMessage('versionLabelFirmware') + ': ' + firmwareId + ' ' + firmwareVersion; versionText += chrome.i18n.getMessage('versionLabelFirmware') + ': ' + firmwareId + ' ' + firmwareVersion;
if (hardwareId) { if (hardwareId) {
versionText += ' (Target: ' + hardwareId + ')'; versionText += ' (' + chrome.i18n.getMessage('versionLabelTarget') + ': ' + hardwareId + ')';
} }
} }
return versionText;
}
function getConfiguratorVersion() {
return chrome.i18n.getMessage('versionLabelConfigurator') + ': ' + chrome.runtime.getManifest().version;
}
function updateTopBarVersion(firmwareVersion, firmwareId, hardwareId) {
var versionText = getConfiguratorVersion() + '<br />';
versionText = versionText + getFirmwareVersion(firmwareVersion, firmwareId, hardwareId);
$('#logo .logo_text').html(versionText); $('#logo .logo_text').html(versionText);
} }
function updateStatusBarVersion(firmwareVersion, firmwareId, hardwareId) { function updateStatusBarVersion(firmwareVersion, firmwareId, hardwareId) {
var versionText = ''; var versionText = '';
if (hardwareId) { versionText = versionText + getFirmwareVersion(firmwareVersion, firmwareId, hardwareId);
versionText = versionText + chrome.i18n.getMessage('versionLabelHardware') + ': ' + hardwareId + ', ';
if (versionText !== '') {
versionText = versionText + ', ';
} }
if (firmwareVersion) { versionText = versionText + getConfiguratorVersion();
versionText = versionText + chrome.i18n.getMessage('versionLabelFirmware') + ': ' + firmwareId + ' ' + firmwareVersion + ', ';
}
versionText = versionText + chrome.i18n.getMessage('versionLabelConfigurator') + ': ' + chrome.runtime.getManifest().version;
$('#status-bar .version').text(versionText); $('#status-bar .version').text(versionText);
} }