From 1574894964bf4a07cd6b83dc8535b726bddd54b1 Mon Sep 17 00:00:00 2001 From: Raphael Scholle Date: Sun, 14 Jul 2024 17:17:52 +0200 Subject: [PATCH] better naming --- .../settings/mavlinksettingsmodel.cpp | 8 +- app/util/qopenhd.h | 2 +- package.sh | 2 +- .../qopenhd_settings/AppDevSettingsView.qml | 41 +-- .../AppGeneralSettingsView.qml | 38 +-- .../AppScreenSettingsView.qml | 59 ++-- .../AppVehicleSettingsView.qml | 1 - .../qopenhd_settings/AppVideoSettingsView.qml | 272 ++++++++++-------- .../AppWidgetStyleSettingsView.qml | 16 +- qml/ui/elements/AppSettings.qml | 8 +- 10 files changed, 216 insertions(+), 231 deletions(-) diff --git a/app/telemetry/settings/mavlinksettingsmodel.cpp b/app/telemetry/settings/mavlinksettingsmodel.cpp index c361488b1..20bd9da7c 100644 --- a/app/telemetry/settings/mavlinksettingsmodel.cpp +++ b/app/telemetry/settings/mavlinksettingsmodel.cpp @@ -131,7 +131,7 @@ void MavlinkSettingsModel::try_refetch_all_parameters_async(bool log_result) set_has_params_fetched(true); }else{ if(log_result){ - QOpenHD::instance().show_toast("Fetch all parameters failed, is your uplink working ? Use the status view for more info..",true); + QOpenHD::instance().show_toast("Fetch all parameters failed",true); } } m_is_currently_busy=false; @@ -240,7 +240,7 @@ QString MavlinkSettingsModel::try_update_parameter_int(const QString param_id,in return ss.str().c_str(); } if(result==SetParamResult::NO_CONNECTION){ - return "Update failed,please try again"; + return "Update failed,try again"; } return "Update failed, unknown error"; } @@ -261,7 +261,7 @@ QString MavlinkSettingsModel::try_update_parameter_string(const QString param_id return ss.str().c_str(); } if(result==SetParamResult::NO_CONNECTION){ - return "Update failed,please try again"; + return "Update failed,try again"; } return "Update failed, unknown error"; } @@ -551,7 +551,7 @@ MavlinkSettingsModel::ParamStringEnum MavlinkSettingsModel::string_param_get_enu QString MavlinkSettingsModel::get_warning_before_safe(const QString param_id) { if(param_id=="V_OS_CAM_CONFIG"){ - return "WARNING: Changing this parameter will perform some special operations and then automatically reboot the air pi after a 3second delay"; + return "WARNING: Changing this parameter will reboot the Air Unit"; } return ""; } diff --git a/app/util/qopenhd.h b/app/util/qopenhd.h index 5475ea559..a631b8bc4 100644 --- a/app/util/qopenhd.h +++ b/app/util/qopenhd.h @@ -70,7 +70,7 @@ class QOpenHD : public QObject // Tries to mimic android toast as much as possible // Q_INVOKABLE void show_toast(QString message,bool long_toast=false); - L_RO_PROP(QString,version_string,set_version_string,"2.6.0-evo"); + L_RO_PROP(QString,version_string,set_version_string,"2.6.1-evo"); // // Shows a message popup to the user that needs to be clicked away - use sparingly // diff --git a/package.sh b/package.sh index ca2340f2f..878e7705a 100755 --- a/package.sh +++ b/package.sh @@ -82,7 +82,7 @@ elif [[ "${PACKAGE_ARCH}" = "arm64" ]]; then cp rock_qt_eglfs_kms_config.json /tmp/qopenhd/usr/local/share/qopenhd/ || exit 1 fi -VERSION="2.6.0-$(date -d '+1 hour' +'%m-%d-%Y--%H-%M-%S')-${VER2}" +VERSION="2.6.1-$(date -d '+1 hour' +'%m-%d-%Y--%H-%M-%S')-${VER2}" ls -a ${TMPDIR}/usr/local/bin echo "going into packaging stage" diff --git a/qml/ui/configpopup/qopenhd_settings/AppDevSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppDevSettingsView.qml index 2b6d73d27..316881ccc 100755 --- a/qml/ui/configpopup/qopenhd_settings/AppDevSettingsView.qml +++ b/qml/ui/configpopup/qopenhd_settings/AppDevSettingsView.qml @@ -29,8 +29,7 @@ ScrollView { anchors.right: parent.right // SettingBaseElement{ - m_short_description: "DEV_SHOW_WHITELISTED_PARAMS" - m_long_description: "Enabling this gives you full controll over the mavlink parameters set openhd exposes (both air and ground) BUT BE WARNED yu can easily break things!" + m_short_description: "Enable advanced settings" Switch { width: 32 height: elementHeight @@ -39,26 +38,14 @@ ScrollView { anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter checked: settings.dev_show_whitelisted_params - onCheckedChanged: settings.dev_show_whitelisted_params = checked - } - } - SettingBaseElement{ - m_short_description:"DEV_SHOW_ADVANCED_BUTTON" - m_long_description: "Allows more customization of the mavlink parameters set than what openhd exposes, BE WARNED you can easily break things this way !" - Switch { - width: 32 - height: elementHeight - anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36 - - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - checked: settings.dev_show_advanced_button - onCheckedChanged: settings.dev_show_advanced_button = checked + onCheckedChanged: { + settings.dev_show_whitelisted_params = checked + settings.dev_show_advanced_button = checked + } } } SettingBaseElement{ - m_short_description:"dev_allow_freq_change_when_armed" - m_long_description: "Allows changing the frequency and channel width while armed, THIS CAN BREAK YOUR LINK DURING FLIGHT !" + m_short_description:"Allow frequency change when armed" Switch { width: 32 height: elementHeight @@ -71,8 +58,7 @@ ScrollView { } } SettingBaseElement{ - m_short_description:"dev_show_5180mhz_lowband" - m_long_description: "Shows the 5180Mhz, 5200Mhz and 5220Mhz channels by default (NOTE: These channels are rarely free)" + m_short_description:"Show all wifi channels" Switch { width: 32 height: elementHeight @@ -85,8 +71,7 @@ ScrollView { } } SettingBaseElement{ - m_short_description:"dev_disable_autofetch_params" - m_long_description: "Disables automatic fetching of the air / ground openhd param set(s)" + m_short_description:"Disable auto fetch" Switch { width: 32 height: elementHeight @@ -124,7 +109,7 @@ ScrollView { } SettingBaseElement{ m_short_description: "Load Settings from file" - m_long_description: "Load a previosuly backed up QOpenHD settings file (e.g. OSD layout,..) from your SD card. Only works from/to linux." + m_long_description: "Load a previosly backed up QOpenHD settings file (e.g. OSD layout,..) from your SD card. Only works from/to linux." Button { id:load @@ -148,7 +133,6 @@ ScrollView { } SettingBaseElement{ m_short_description: "Reset all QOpenHD Settings" - m_long_description: "Reset all QOpenHD Settings (e.g. OSD layout,...). Does not reset your openhd settings on the air or ground unit. Only works from/to linux." Button { id:reset @@ -167,7 +151,6 @@ ScrollView { } SettingBaseElement{ m_short_description: "Enable audio playback" - m_long_description: "Enable live audio playback in QOpenHD, NOTE: audio streaming is not supported in OpenHD yet. Requires restart of QOpenHD." Switch { width: 32 @@ -181,8 +164,7 @@ ScrollView { } } SettingBaseElement{ - m_short_description: "dirty_enable_inav_hacks" - m_long_description: "NEVER ENABLE UNLESS YOU HAVE TO. INAV mavlink support is quirky in some ways to say the least." + m_short_description: "Improve Inav support" Switch { width: 32 @@ -196,8 +178,7 @@ ScrollView { } } SettingBaseElement{ - m_short_description: "dev_wb_show_no_stbc_enabled_warning" - m_long_description: "Do not show the STBC recommended enabled message" + m_short_description: "Disable STBC warning" Switch { width: 32 height: elementHeight diff --git a/qml/ui/configpopup/qopenhd_settings/AppGeneralSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppGeneralSettingsView.qml index eb39ae8bb..d0d03d09e 100755 --- a/qml/ui/configpopup/qopenhd_settings/AppGeneralSettingsView.qml +++ b/qml/ui/configpopup/qopenhd_settings/AppGeneralSettingsView.qml @@ -29,8 +29,7 @@ ScrollView { anchors.right: parent.right SettingBaseElement{ - m_short_description: "Enable speech" - m_long_description: "Enable text to speech - events like flight mode change are given as audio messages" + m_short_description: "Enable text to speech" Switch { width: 32 @@ -44,7 +43,7 @@ ScrollView { } SettingBaseElement{ - m_short_description: "Imperial units" + m_short_description: "Use Imperial units" Switch { width: 32 @@ -64,7 +63,7 @@ ScrollView { color: (Positioner.index % 2 == 0) ? "#8cbfd7f3" : "#00000000" Text { - text: qsTr("Animation Smoothing,0 to disable") + text: qsTr("Animation Smoothing") font.weight: Font.Bold font.pixelSize: 13 anchors.leftMargin: 8 @@ -129,7 +128,7 @@ ScrollView { } SettingBaseElement{ - m_short_description: "Language / Locale" + m_short_description: "Language" LanguageSelect { id: languageSelectBox @@ -143,31 +142,6 @@ ScrollView { } // exp - SettingBaseElement{ - m_short_description: "N Cameras to controll" - - SpinBox { - id: dev_qopenhd_n_cameras_spinbox - height: elementHeight - width: 210 - font.pixelSize: 14 - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - from: 1 - to: 2 - stepSize: 1 - anchors.rightMargin: Qt.inputMethod.visible ? 78 : 18 - - value: settings.dev_qopenhd_n_cameras - onValueChanged: { - var actually_changed=settings.dev_qopenhd_n_cameras!=value - settings.dev_qopenhd_n_cameras = value - if(actually_changed){ - _restartqopenhdmessagebox.show() - } - } - } - } SettingBaseElement{ m_short_description: "Mavlink sys id" m_long_description: "Mavlink sys id of QOpenHD (this Ground control station application). Leave default (255) ! . Change requires restart." @@ -195,7 +169,7 @@ ScrollView { } } SettingBaseElement{ - m_short_description: "Hide identity offset lattitude" + m_short_description: "Latitude GPS offset" m_long_description: "Set this to a random value only you know to hide lat identity" /*SpinBox { @@ -235,7 +209,7 @@ ScrollView { } SettingBaseElement{ - m_short_description: "Hide identity offset longitude" + m_short_description: "Longitude GPS offset" m_long_description: "Set this to a random value only you know to hide lon identity" XDecimalSpinBox{ diff --git a/qml/ui/configpopup/qopenhd_settings/AppScreenSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppScreenSettingsView.qml index 5039fbab1..c494ddb12 100755 --- a/qml/ui/configpopup/qopenhd_settings/AppScreenSettingsView.qml +++ b/qml/ui/configpopup/qopenhd_settings/AppScreenSettingsView.qml @@ -30,7 +30,6 @@ ScrollView { SettingBaseElement{ m_short_description: "Screen Scale" - m_long_description: "Increase OSD elements and text size, requires restart of QOpenHD" Text { text: Number(settings.global_scale).toLocaleString(Qt.locale(), 'f', 1) + "x"; font.pixelSize: 16 @@ -67,8 +66,7 @@ ScrollView { } } SettingBaseElement{ - m_short_description: "Cursor AutoHide" - m_long_description: "Automatically hide cursor on inactivity" + m_short_description: "Auto hide cursor" Switch { width: 32 @@ -87,8 +85,7 @@ ScrollView { } } SettingBaseElement{ - m_short_description: "Custom cursor" - m_long_description: "Customize cursor for high visibility in the field" + m_short_description: "Set cursor Skin" SpinBox { width: 210 font.pixelSize: 14 @@ -108,8 +105,7 @@ ScrollView { } } SettingBaseElement{ - m_short_description: "Custom cursor scale" - m_long_description: "Scale of your custom cursor. NOTE: Only works if custom cursor is not 0 !" + m_short_description: "Cursor Scale" SpinBox { width: 210 @@ -130,12 +126,11 @@ ScrollView { } } SettingsCategory{ - m_description: "ADVANCED USERS ONLY" + m_description: "Advanced settings" m_hide_elements: true SettingBaseElement{ m_short_description: "Screen rotation" - m_long_description: "Rotate QOpenHD, can be usefull if your screen is installed the wrong way around. Might or might not work." // anything other than 0 and 180 can breaks things ComboBox { height: elementHeight @@ -166,8 +161,7 @@ ScrollView { } } SettingBaseElement{ - m_short_description: "Background transparent" - m_long_description: "Use a transparent surface, such that another application can play (hw composer accelerated) video behind the QOpenHD surface." + m_short_description: "Transparent Background" Switch { width: 32 @@ -181,8 +175,7 @@ ScrollView { } } SettingBaseElement{ - m_short_description: "Force full screen" - m_long_description: "Force Full screen if QOpenHD is not already full screen" + m_short_description: "Full screen" Switch { width: 32 @@ -211,30 +204,28 @@ ScrollView { } } - SettingBaseElement{ - m_short_description: "Settings window size" - m_long_description: "Change the size of the settings window, such that you can view the live video while changing settings" + // SettingBaseElement{ + // m_short_description: "Settings window scale" - SpinBox { - width: 210 - font.pixelSize: 14 - height: elementHeight - anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36 - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter + // SpinBox { + // width: 210 + // font.pixelSize: 14 + // height: elementHeight + // anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36 + // anchors.right: parent.right + // anchors.verticalCenter: parent.verticalCenter - from: 50 - to: 100 - stepSize: 1 - value: settings.screen_settings_overlay_size_percent - onValueChanged: { - settings.screen_settings_overlay_size_percent = value - } - } - } + // from: 50 + // to: 100 + // stepSize: 1 + // value: settings.screen_settings_overlay_size_percent + // onValueChanged: { + // settings.screen_settings_overlay_size_percent = value + // } + // } + // } SettingBaseElement{ - m_short_description: "Settings window transparency" - m_long_description: "make the openhd parameters window semi-transparent" + m_short_description: "Transparent settings" Switch { width: 32 diff --git a/qml/ui/configpopup/qopenhd_settings/AppVehicleSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppVehicleSettingsView.qml index 1441db980..9f1c511b8 100755 --- a/qml/ui/configpopup/qopenhd_settings/AppVehicleSettingsView.qml +++ b/qml/ui/configpopup/qopenhd_settings/AppVehicleSettingsView.qml @@ -51,7 +51,6 @@ ScrollView { SettingBaseElement{ m_short_description: "Show FC Messages in HUD" - m_long_description: "When enabled, FC log messages are shown in the HUD log messages element,e.g. they might apear before,during and after flight" Switch { width: 32 height: elementHeight diff --git a/qml/ui/configpopup/qopenhd_settings/AppVideoSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppVideoSettingsView.qml index 435789f4a..84493567b 100755 --- a/qml/ui/configpopup/qopenhd_settings/AppVideoSettingsView.qml +++ b/qml/ui/configpopup/qopenhd_settings/AppVideoSettingsView.qml @@ -33,10 +33,33 @@ ScrollView { ListElement { text: "H264"; } ListElement { text: "H265"; } } + SettingBaseElement{ + m_short_description: "Number of Cameras" //will be removed in the future, we just should autodetect it + + SpinBox { + id: dev_qopenhd_n_cameras_spinbox + height: elementHeight + width: 210 + font.pixelSize: 14 + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + from: 1 + to: 2 + stepSize: 1 + anchors.rightMargin: Qt.inputMethod.visible ? 78 : 18 + value: settings.dev_qopenhd_n_cameras + onValueChanged: { + var actually_changed=settings.dev_qopenhd_n_cameras!=value + settings.dev_qopenhd_n_cameras = value + if(actually_changed){ + _restartqopenhdmessagebox.show() + } + } + } + } SettingBaseElement{ - m_short_description: "Scale primary video to fit" - m_long_description: "Fit the primary video to the exact screen size (discards actual video aspect ratio,aka video is a bit distorted). Not supported on all platforms / implementations. Might require a restart." + m_short_description: "Scale primary video to fit screen" Switch { width: 32 @@ -50,14 +73,26 @@ ScrollView { enabled: _qopenhd.is_android() || (_qopenhd.is_linux() && (!_qopenhd.is_platform_rock() && !_qopenhd.is_platform_rpi())) } } + SettingBaseElement{ + m_short_description: "Switch primary / secondary video" + Switch { + width: 32 + height: elementHeight + anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36 + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + checked: settings.qopenhd_switch_primary_secondary + onCheckedChanged: settings.qopenhd_switch_primary_secondary = checked + } + } + SettingsCategory{ - m_description: "DEVELOPER ONLY" + m_description: "Advanced Settings" m_hide_elements: true SettingBaseElement{ - m_short_description: "Video codec primary" - m_long_description: "Video codec of primary stream (main video). Automatically fetched from OpenHD." + m_short_description: "Primary video codec" ComboBox { id: selectVideoCodecPrimary width: 320 @@ -81,8 +116,7 @@ ScrollView { } } SettingBaseElement{ - m_short_description: "Primary video force SW" - m_long_description: "Force SW decode for primary video stream (unless it already defaulted to sw decode). Can fix bug(s) in rare hardware incompability cases." + m_short_description: "Use Software Decode" Switch { width: 32 height: elementHeight @@ -91,12 +125,14 @@ ScrollView { anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter checked: settings.qopenhd_primary_video_force_sw - onCheckedChanged: settings.qopenhd_primary_video_force_sw = checked + onCheckedChanged: { + settings.qopenhd_primary_video_force_sw = checked + settings.qopenhd_secondary_video_force_sw = checked + } } } SettingBaseElement{ - m_short_description: "Primary video udp in port" - m_long_description: "UDP port where qopenhd listens for video data for the primary video stream" + m_short_description: "Primary video udp port" SpinBox { height: elementHeight width: 210 @@ -113,8 +149,7 @@ ScrollView { } } SettingBaseElement{ - m_short_description: "Video codec secondary" - m_long_description: "Video codec of secondary stream (pip video). Automatically fetched from OpenHD." + m_short_description: "Secondary video codec" // only show to dualcam users visible: settings.dev_qopenhd_n_cameras==2 ComboBox { @@ -139,26 +174,24 @@ ScrollView { } } } + // SettingBaseElement{ + // m_short_description: "Secondary video force SW" + // m_long_description: "Force SW decode for secondary video stream (unless it already defaulted to sw decode). Can fix bug(s) in rare hardware incompability cases." + // // only show to dualcam users + // visible: false //settings.dev_qopenhd_n_cameras==2 + // Switch { + // width: 32 + // height: elementHeight + // anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36 + // anchors.right: parent.right + // anchors.verticalCenter: parent.verticalCenter + // checked: settings.qopenhd_secondary_video_force_sw + // onCheckedChanged: settings.qopenhd_secondary_video_force_sw = checked + // } + // } SettingBaseElement{ - m_short_description: "Secondary video force SW" - m_long_description: "Force SW decode for secondary video stream (unless it already defaulted to sw decode). Can fix bug(s) in rare hardware incompability cases." - // only show to dualcam users - visible: settings.dev_qopenhd_n_cameras==2 - Switch { - width: 32 - height: elementHeight - anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36 - - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - checked: settings.qopenhd_secondary_video_force_sw - onCheckedChanged: settings.qopenhd_secondary_video_force_sw = checked - } - } - SettingBaseElement{ - m_short_description: "Secondary video udp in port" - m_long_description: "UDP port where qopenhd listens for video data for the secondary video stream" + m_short_description: "Secondary video udp port" visible: settings.dev_qopenhd_n_cameras==2 SpinBox { height: elementHeight @@ -182,7 +215,7 @@ ScrollView { color: (Positioner.index % 2 == 0) ? "#8cbfd7f3" : "#00000000" Text { - text: qsTr("DEV_TEST_VIDEO_MODE") + text: qsTr("Video test mode") font.weight: Font.Bold font.pixelSize: 13 anchors.leftMargin: 8 @@ -224,7 +257,7 @@ ScrollView { color: (Positioner.index % 2 == 0) ? "#8cbfd7f3" : "#00000000" Text { - text: qsTr("dev_limit_fps_on_test_file") + text: qsTr("Limit FPS in test file") font.weight: Font.Bold font.pixelSize: 13 anchors.leftMargin: 8 @@ -251,92 +284,99 @@ ScrollView { onValueChanged: settings.dev_limit_fps_on_test_file = value } } - Rectangle { - width: parent.width - height: rowHeight - color: (Positioner.index % 2 == 0) ? "#8cbfd7f3" : "#00000000" + // Rectangle { + // width: parent.width + // height: rowHeight + // color: (Positioner.index % 2 == 0) ? "#8cbfd7f3" : "#00000000" + // visible:false - Text { - text: qsTr("dev_draw_alternating_rgb_dummy_frames") - font.weight: Font.Bold - font.pixelSize: 13 - anchors.leftMargin: 8 - verticalAlignment: Text.AlignVCenter - anchors.verticalCenter: parent.verticalCenter - width: 224 - height: elementHeight - anchors.left: parent.left - } - Switch { - width: 32 - height: elementHeight - anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36 - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - checked: settings.dev_draw_alternating_rgb_dummy_frames - onCheckedChanged: settings.dev_draw_alternating_rgb_dummy_frames = checked - } - } - Rectangle { - width: parent.width - height: rowHeight - color: (Positioner.index % 2 == 0) ? "#8cbfd7f3" : "#00000000" - Text { - text: qsTr("dev_use_low_latency_parser_when_possible") - font.weight: Font.Bold - font.pixelSize: 13 - anchors.leftMargin: 8 - verticalAlignment: Text.AlignVCenter - anchors.verticalCenter: parent.verticalCenter - width: 224 - height: elementHeight - anchors.left: parent.left - } - Switch { - width: 32 - height: elementHeight - anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36 - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - checked: settings.dev_use_low_latency_parser_when_possible - onCheckedChanged: settings.dev_use_low_latency_parser_when_possible = checked - } - } - Rectangle { - width: parent.width - height: rowHeight - color: (Positioner.index % 2 == 0) ? "#8cbfd7f3" : "#00000000" + // Text { + // text: qsTr("Draw RGB dummy frames") + // font.weight: Font.Bold + // font.pixelSize: 13 + // anchors.leftMargin: 8 + // verticalAlignment: Text.AlignVCenter + // anchors.verticalCenter: parent.verticalCenter + // width: 224 + // height: elementHeight + // anchors.left: parent.left + // } + // Switch { + // width: 32 + // height: elementHeight + // anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36 + // anchors.right: parent.right + // anchors.verticalCenter: parent.verticalCenter + // checked: settings.dev_draw_alternating_rgb_dummy_frames + // onCheckedChanged: settings.dev_draw_alternating_rgb_dummy_frames = checked + // } + // } + // Rectangle { + // width: parent.width + // height: rowHeight + // color: (Positioner.index % 2 == 0) ? "#8cbfd7f3" : "#00000000" + // visible:false + + + // Text { + // text: qsTr("dev_use_low_latency_parser_when_possible") + // font.weight: Font.Bold + // font.pixelSize: 13 + // anchors.leftMargin: 8 + // verticalAlignment: Text.AlignVCenter + // anchors.verticalCenter: parent.verticalCenter + // width: 224 + // height: elementHeight + // anchors.left: parent.left + // } + // Switch { + // width: 32 + // height: elementHeight + // anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36 + // anchors.right: parent.right + // anchors.verticalCenter: parent.verticalCenter + // checked: settings.dev_use_low_latency_parser_when_possible + // onCheckedChanged: settings.dev_use_low_latency_parser_when_possible = checked + // } + // } + // Rectangle { + // width: parent.width + // height: rowHeight + // color: (Positioner.index % 2 == 0) ? "#8cbfd7f3" : "#00000000" + // visible:false - Text { - text: qsTr("dev_feed_incomplete_frames_to_decoder") - font.weight: Font.Bold - font.pixelSize: 13 - anchors.leftMargin: 8 - verticalAlignment: Text.AlignVCenter - anchors.verticalCenter: parent.verticalCenter - width: 224 - height: elementHeight - anchors.left: parent.left - } - Switch { - width: 32 - height: elementHeight - anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36 - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - checked: settings.dev_feed_incomplete_frames_to_decoder - onCheckedChanged: settings.dev_feed_incomplete_frames_to_decoder = checked - } - } + + // Text { + // text: qsTr("dev_feed_incomplete_frames_to_decoder") + // font.weight: Font.Bold + // font.pixelSize: 13 + // anchors.leftMargin: 8 + // verticalAlignment: Text.AlignVCenter + // anchors.verticalCenter: parent.verticalCenter + // width: 224 + // height: elementHeight + // anchors.left: parent.left + // } + // Switch { + // width: 32 + // height: elementHeight + // anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36 + // anchors.right: parent.right + // anchors.verticalCenter: parent.verticalCenter + // checked: settings.dev_feed_incomplete_frames_to_decoder + // onCheckedChanged: settings.dev_feed_incomplete_frames_to_decoder = checked + // } + // } // dirty SettingBaseElement{ - m_short_description: "dev_rpi_use_external_omx_decode_service" + m_short_description: "Use RPI decoding" //m_long_description: "On by default, RPI specific." Switch { width: 32 height: elementHeight + visible: true anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36 anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter @@ -345,7 +385,7 @@ ScrollView { } } SettingBaseElement{ - m_short_description: "dev_always_use_generic_external_decode_service" + m_short_description: "Use external decoding service" //m_long_description: "Video decode is not done via QOpenHD, but rather in an extra service (started and stopped by QOpenHD). For platforms other than rpi" Switch { width: 32 @@ -357,20 +397,6 @@ ScrollView { onCheckedChanged: settings.dev_always_use_generic_external_decode_service = checked } } - - SettingBaseElement{ - m_short_description: "Switch primary / secondary video" - m_long_description: "Show secondary video in main video window & primary video in pip window (if the platform supports pip)" - Switch { - width: 32 - height: elementHeight - anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36 - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - checked: settings.qopenhd_switch_primary_secondary - onCheckedChanged: settings.qopenhd_switch_primary_secondary = checked - } - } } } } diff --git a/qml/ui/configpopup/qopenhd_settings/AppWidgetStyleSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppWidgetStyleSettingsView.qml index bf57fb1e4..38bc2cc98 100644 --- a/qml/ui/configpopup/qopenhd_settings/AppWidgetStyleSettingsView.qml +++ b/qml/ui/configpopup/qopenhd_settings/AppWidgetStyleSettingsView.qml @@ -49,7 +49,7 @@ ScrollView { Layout.fillHeight: true } Button{ - text: "GREEN-Norbert" + text: "Matrix" Layout.alignment: Qt.AlignRight Layout.leftMargin: 10 Layout.rightMargin: 10 @@ -62,6 +62,20 @@ ScrollView { settings.font_text="Quicksand" } } + Button{ + text: "Trainwreck" + Layout.alignment: Qt.AlignRight + Layout.leftMargin: 10 + Layout.rightMargin: 10 + onClicked: { + settings.color_caution="yellow" + settings.color_glow="black" + settings.color_shape="#ec71bf" + settings.color_text="#ffff00" + settings.color_warn="red" + settings.font_text="Quicksand" + } + } Button{ text: "RESET" Layout.alignment: Qt.AlignRight diff --git a/qml/ui/elements/AppSettings.qml b/qml/ui/elements/AppSettings.qml index da2523395..009dbdb8f 100644 --- a/qml/ui/elements/AppSettings.qml +++ b/qml/ui/elements/AppSettings.qml @@ -231,7 +231,7 @@ Settings { property bool show_message_hud: true - property bool show_horizon: true + property bool show_horizon: false property bool horizon_invert_pitch: false property bool horizon_invert_roll: false property double horizon_width: 2 @@ -250,7 +250,7 @@ Settings { property bool show_heading_ladder: true // experimental - property bool show_performance_horizon: false + property bool show_performance_horizon: true // experimental end // false by default for now, since it has a big performance hit. (only noticeable on embedded devices like rpi - @@ -284,7 +284,7 @@ Settings { property bool altitude_ladder_show_unit: true property bool show_altitude_second: true - property bool altitude_second_msl_rel: true + property bool altitude_second_msl_rel: false property bool show_arrow: true property bool arrow_invert: false @@ -306,7 +306,7 @@ Settings { property double map_size: 1 property bool show_throttle: true - property bool show_control: true + property bool show_control: false property bool double_control: true property bool control_rev_pitch: false property bool control_rev_roll: false