Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-26 09:45:28 +03:00
Code Issues Wiki Activity

Remove the OSD preview logo switch (#1465)

Browse source 
Remove the OSD preview logo switch
This commit is contained in:
Michael Keller 2019-05-30 00:50:06 +12:00 • committed by GitHub
commit 04d6167e87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

3
locales/en/messages.json
View file

@ -3655,9 +3655,6 @@
"message": "Font {{fontName}}", "message": "Font {{fontName}}",
"description": "Content of the selector for the OSD Font in the preview" "description": "Content of the selector for the OSD Font in the preview"
}, },
"osdSetupPreviewTitleTip": {
"message": "Show or hide the logo in the preview window. This will not change any settings on the flight controller."
},
"osdSetupVideoFormatTitle": { "osdSetupVideoFormatTitle": {
"message": "Video Format" "message": "Video Format"
}, },

5
src/css/tabs/osd.css
View file

@ -349,11 +349,6 @@
cursor: move; cursor: move;
} }
.tab-osd .preview-logo {
position: absolute;
right: 0;
}
.tab-osd .preview .row { .tab-osd .preview .row {
height: 18px; height: 18px;
} }

20
src/js/tabs/osd.js
View file

@ -271,7 +271,6 @@ OSD.initData = function () {
display_items: [], display_items: [],
timers: [], timers: [],
last_positions: {}, last_positions: {},
preview_logo: true,
preview: [], preview: [],
tooltips: [], tooltips: [],
osd_profiles: {} osd_profiles: {}
@ -1947,17 +1946,6 @@ TABS.osd.initialize = function (callback) {
} }
$('.supported').fadeIn(); $('.supported').fadeIn();
// show Betaflight logo in preview
var $previewLogo = $('.preview-logo').empty();
$previewLogo.append(
$('<label for="preview-logo">Logo: </label><input type="checkbox" name="preview-logo" class="togglesmall"></input>')
.attr('checked', OSD.data.preview_logo)
.change(function (e) {
OSD.data.preview_logo = $(this).attr('checked') == undefined;
updateOsdView();
})
);
// video mode // video mode
var $videoTypes = $('.video-types').empty(); var $videoTypes = $('.video-types').empty();
for (var i = 0; i < OSD.constants.VIDEO_TYPES.length; i++) { for (var i = 0; i < OSD.constants.VIDEO_TYPES.length; i++) {
@ -2303,14 +2291,6 @@ TABS.osd.initialize = function (callback) {
for (var i = 0; i < OSD.data.display_size.total; i++) { for (var i = 0; i < OSD.data.display_size.total; i++) {
OSD.data.preview.push([null, ' '.charCodeAt(0), null, null]); OSD.data.preview.push([null, ' '.charCodeAt(0), null, null]);
} }
// logo first, so it gets overwritten by subsequent elements
if (OSD.data.preview_logo) {
var x = 160;
for (var i = 1; i < 5; i++) {
for (var j = 3; j < 27; j++)
OSD.data.preview[i * 30 + j] = [{ name: 'LOGO', positionable: false }, x++, i, j];
}
}
// draw all the displayed items and the drag and drop preview images // draw all the displayed items and the drag and drop preview images
for (let field of OSD.data.display_items) { for (let field of OSD.data.display_items) {

3
src/tabs/osd.html
View file

@ -37,7 +37,7 @@
<div class="gui_box_titlebar image"> <div class="gui_box_titlebar image">
<div class="spacer_box_title"> <div class="spacer_box_title">
<span i18n_title="osdSetupPreviewForTitle"> <span class="cf_tip" i18n_title="osdSetupPreviewForTitle">
<label id="osdprofile-selector-label" i18n="osdSetupPreviewSelectProfileTitle"/> <label id="osdprofile-selector-label" i18n="osdSetupPreviewSelectProfileTitle"/>
<select class="osdprofile-selector"> <select class="osdprofile-selector">
<!-- Populated at runtime --> <!-- Populated at runtime -->
@ -46,7 +46,6 @@
<!-- Populated at runtime --> <!-- Populated at runtime -->
</select> </select>
</span> </span>
<span class="preview-logo cf_tip" i18n_title="osdSetupPreviewTitleTip"></span>
</div> </div>
</div> </div>