mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-08-22 00:23:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update UI components with new SP controls

Browse Source 
Replaced several different ButtonControl, ToggleControl, and LabelControl instances with their corresponding SP versions across various sections of the UI. This improves the consistency of the user interface and lays the groundwork for further enhancements.
This commit is contained in:
DevTekVE
2024-07-21 15:04:53 +02:00
parent 69a2408c44
commit b7b813c531
20 changed files with 85 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/qt/network/networking.cc
+1
View File
@@ -8,6 +8,7 @@
#ifdef SUNNYPILOT
#include "selfdrive/ui/sunnypilot/sp_priv_ui.h"
#define ToggleControl ToggleControlSP
#else
#include "selfdrive/ui/ui.h"
#endif
selfdrive/ui/qt/network/networking.h
+2
View File
@@ -9,6 +9,8 @@
#ifdef SUNNYPILOT
#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
#define ListWidget ListWidgetSP
#define ToggleControl ToggleControlSP
#define LabelControl LabelControlSP
#else
#include "selfdrive/ui/qt/widgets/controls.h"
#endif
selfdrive/ui/qt/offroad/settings.h
+2
View File
@@ -19,6 +19,8 @@
#define ListWidget ListWidgetSP
#define ParamControl ParamControlSP
#define ButtonParamControl ButtonParamControlSP
#define ToggleControl ToggleControlSP
#define LabelControl LabelControlSP
#else
#include "selfdrive/ui/ui.h"
#include "selfdrive/ui/qt/widgets/controls.h"
selfdrive/ui/qt/widgets/ssh_keys.h
+3 -1
View File
@@ -5,6 +5,8 @@
#include "system/hardware/hw.h"
#ifdef SUNNYPILOT
#include "selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h"
#define ToggleControl ToggleControlSP
#define ButtonControl ButtonControlSP
#else
#include "selfdrive/ui/qt/widgets/controls.h"
#endif
@@ -33,4 +35,4 @@ private:
void refresh();
void getUserKeys(const QString &username);
};
};
selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_device_panel.cc
+9 -9
View File
@@ -9,10 +9,10 @@
#include "selfdrive/ui/qt/widgets/prime.h"
DevicePanelSP::DevicePanelSP(SettingsWindow *parent) : DevicePanel(parent) {
fleetManagerPin = new ButtonControl(
fleetManagerPin = new ButtonControlSP(
pin_title + pin, tr("TOGGLE"),
tr("Enable or disable PIN requirement for Fleet Manager access."));
connect(fleetManagerPin, &ButtonControl::clicked, [=]() {
connect(fleetManagerPin, &ButtonControlSP::clicked, [=]() {
if (params.getBool("FleetManagerPin")) {
if (ConfirmationDialog::confirm(tr("Are you sure you want to turn off PIN requirement?"), tr("Turn Off"), this)) {
params.remove("FleetManagerPin");
@@ -35,21 +35,21 @@ DevicePanelSP::DevicePanelSP(SettingsWindow *parent) : DevicePanel(parent) {
refreshPin();
// Error Troubleshoot
auto errorBtn = new ButtonControl(
auto errorBtn = new ButtonControlSP(
tr("Error Troubleshoot"), tr("VIEW"),
tr("Display error from the tmux session when an error has occurred from a system process."));
QFileInfo file("/data/community/crashes/error.txt");
QDateTime modifiedTime = file.lastModified();
QString modified_time = modifiedTime.toString("yyyy-MM-dd hh:mm:ss ");
connect(errorBtn, &ButtonControl::clicked, [=]() {
connect(errorBtn, &ButtonControlSP::clicked, [=]() {
const std::string txt = util::read_file("/data/community/crashes/error.txt");
ConfirmationDialog::rich(modified_time + QString::fromStdString(txt), this);
});
AddWidgetAt(3, errorBtn);
auto resetMapboxTokenBtn = new ButtonControl(tr("Reset Access Tokens for Map Services"), tr("RESET"), tr("Reset self-service access tokens for Mapbox, Amap, and Google Maps."));
connect(resetMapboxTokenBtn, &ButtonControl::clicked, [=]() {
auto resetMapboxTokenBtn = new ButtonControlSP(tr("Reset Access Tokens for Map Services"), tr("RESET"), tr("Reset self-service access tokens for Mapbox, Amap, and Google Maps."));
connect(resetMapboxTokenBtn, &ButtonControlSP::clicked, [=]() {
if (ConfirmationDialog::confirm(tr("Are you sure you want to reset access tokens for all map services?"), tr("Reset"), this)) {
std::vector<std::string> tokens = {
"CustomMapboxTokenPk",
@@ -65,8 +65,8 @@ DevicePanelSP::DevicePanelSP(SettingsWindow *parent) : DevicePanel(parent) {
});
AddWidgetAt(6, resetMapboxTokenBtn);
auto resetParamsBtn = new ButtonControl(tr("Reset sunnypilot Settings"), tr("RESET"), "");
connect(resetParamsBtn, &ButtonControl::clicked, [=]() {
auto resetParamsBtn = new ButtonControlSP(tr("Reset sunnypilot Settings"), tr("RESET"), "");
connect(resetParamsBtn, &ButtonControlSP::clicked, [=]() {
if (ConfirmationDialog::confirm(tr("Are you sure you want to reset all sunnypilot settings?"), tr("Reset"), this)) {
std::system("sudo rm -rf /data/params/d/*");
Hardware::reboot();
@@ -75,7 +75,7 @@ DevicePanelSP::DevicePanelSP(SettingsWindow *parent) : DevicePanel(parent) {
AddWidgetAt(6, resetParamsBtn);
QObject::connect(uiStateSP(), &UIStateSP::offroadTransition, [=](bool offroad) {
for (auto btn : findChildren<ButtonControl *>()) {
for (auto btn : findChildren<ButtonControlSP *>()) {
if (btn != pair_device && btn != errorBtn) {
btn->setEnabled(offroad);
}
selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_device_panel.h
+1 -1
View File
@@ -16,7 +16,7 @@ private slots:
void updateLabels();
private:
ButtonControl *fleetManagerPin;
ButtonControlSP *fleetManagerPin;
QString pin_title = tr("Fleet Manager PIN:") + " ";
QString pin = "OFF";
QFileSystemWatcher *fs_watch;
selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_osm_settings.cc
+15 -15
View File
@@ -8,10 +8,10 @@ OsmPanel::OsmPanel(QWidget *parent) : QFrame(parent) {
main_layout = new QStackedLayout(this);
const auto list = new ListWidgetSP(this, false);
list->addItem(mapdVersion = new LabelControl(tr("Mapd Version"), "Loading..."));
list->addItem(mapdVersion = new LabelControlSP(tr("Mapd Version"), "Loading..."));
list->addItem(setupOsmDeleteMapsButton(parent));
list->addItem(offlineMapsETA = new LabelControl(tr("Offline Maps ETA"), ""));
list->addItem(offlineMapsElapsed = new LabelControl(tr("Time Elapsed"), ""));
list->addItem(offlineMapsETA = new LabelControlSP(tr("Offline Maps ETA"), ""));
list->addItem(offlineMapsElapsed = new LabelControlSP(tr("Time Elapsed"), ""));
list->addItem(setupOsmUpdateButton(parent));
list->addItem(setupOsmDownloadButton(parent));
list->addItem(setupUsStatesButton(parent));
@@ -32,9 +32,9 @@ OsmPanel::OsmPanel(QWidget *parent) : QFrame(parent) {
main_layout->addWidget(osmScreen);
}
ButtonControl *OsmPanel::setupOsmDeleteMapsButton(QWidget *parent) {
osmDeleteMapsBtn = new ButtonControl(tr("Downloaded Maps"), tr("DELETE")); // Updated on updateLabels()
connect(osmDeleteMapsBtn, &ButtonControl::clicked, [=]() {
ButtonControlSP *OsmPanel::setupOsmDeleteMapsButton(QWidget *parent) {
osmDeleteMapsBtn = new ButtonControlSP(tr("Downloaded Maps"), tr("DELETE")); // Updated on updateLabels()
connect(osmDeleteMapsBtn, &ButtonControlSP::clicked, [=]() {
if (showConfirmationDialog(parent, tr("This will delete ALL downloaded maps\n\nAre you sure you want to delete all the maps?"), tr("Yes, delete all the maps."))) {
QtConcurrent::run([=]() {
QDir dir(MAP_PATH);
@@ -51,9 +51,9 @@ ButtonControl *OsmPanel::setupOsmDeleteMapsButton(QWidget *parent) {
return osmDeleteMapsBtn;
}
ButtonControl *OsmPanel::setupOsmUpdateButton(QWidget *parent) {
osmUpdateBtn = new ButtonControl(tr("Database Update"), tr("CHECK")); // Updated on updateLabels()
connect(osmUpdateBtn, &ButtonControl::clicked, [=]() {
ButtonControlSP *OsmPanel::setupOsmUpdateButton(QWidget *parent) {
osmUpdateBtn = new ButtonControlSP(tr("Database Update"), tr("CHECK")); // Updated on updateLabels()
connect(osmUpdateBtn, &ButtonControlSP::clicked, [=]() {
if (osm_download_in_progress && !download_failed_state) {
updateLabels();
} else if (showConfirmationDialog(parent)) {
@@ -65,9 +65,9 @@ ButtonControl *OsmPanel::setupOsmUpdateButton(QWidget *parent) {
return osmUpdateBtn;
}
ButtonControl *OsmPanel::setupOsmDownloadButton(QWidget *parent) {
osmDownloadBtn = new ButtonControl(tr("Country"), tr("SELECT"));
connect(osmDownloadBtn, &ButtonControl::clicked, [=]() {
ButtonControlSP *OsmPanel::setupOsmDownloadButton(QWidget *parent) {
osmDownloadBtn = new ButtonControlSP(tr("Country"), tr("SELECT"));
connect(osmDownloadBtn, &ButtonControlSP::clicked, [=]() {
osmDownloadBtn->setEnabled(false);
osmDownloadBtn->setValue(tr("Fetching Country list..."));
const std::vector<std::tuple<QString, QString, QString, QString>> locations = getOsmLocations();
@@ -107,9 +107,9 @@ ButtonControl *OsmPanel::setupOsmDownloadButton(QWidget *parent) {
return osmDownloadBtn;
}
ButtonControl *OsmPanel::setupUsStatesButton(QWidget *parent) {
usStatesBtn = new ButtonControl(tr("State"), tr("SELECT"));
connect(usStatesBtn, &ButtonControl::clicked, [=]() {
ButtonControlSP *OsmPanel::setupUsStatesButton(QWidget *parent) {
usStatesBtn = new ButtonControlSP(tr("State"), tr("SELECT"));
connect(usStatesBtn, &ButtonControlSP::clicked, [=]() {
const std::tuple<QString, QString> allStatesOption = std::make_tuple("All States (~4.8 GB)", "All");
usStatesBtn->setEnabled(false);
usStatesBtn->setValue(tr("Fetching State list..."));
selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_osm_settings.h
+13 -13
View File
@@ -49,17 +49,17 @@ private:
quint64 mapsDirSize = 0;
QLabel *osmUpdateLbl;
ButtonControl *osmDownloadBtn;
ButtonControl *osmUpdateBtn;
ButtonControl *usStatesBtn;
ButtonControl *osmDeleteMapsBtn;
ButtonControl *setupOsmDeleteMapsButton(QWidget *parent);;
ButtonControl* setupOsmUpdateButton(QWidget *parent);
ButtonControl* setupOsmDownloadButton(QWidget *parent);
ButtonControl* setupUsStatesButton(QWidget *parent);
ButtonControlSP *osmDownloadBtn;
ButtonControlSP *osmUpdateBtn;
ButtonControlSP *usStatesBtn;
ButtonControlSP *osmDeleteMapsBtn;
ButtonControlSP *setupOsmDeleteMapsButton(QWidget *parent);;
ButtonControlSP* setupOsmUpdateButton(QWidget *parent);
ButtonControlSP* setupOsmDownloadButton(QWidget *parent);
ButtonControlSP* setupUsStatesButton(QWidget *parent);
QTimer *timer;
std::string osm_download_locations;
// void updateButtonControl(ButtonControl *btnControl, QWidget *parent, const QString &initTitle, const QString &allStatesOption);
// void updateButtonControlSP(ButtonControlSP *btnControl, QWidget *parent, const QString &initTitle, const QString &allStatesOption);
void showEvent(QShowEvent *event) override;
void hideEvent(QHideEvent* event) override;
@@ -69,10 +69,10 @@ private:
QString processUpdateStatus(bool pending_update_check, int total_files, int downloaded_files, const QJsonObject& json, bool failed_state);
ConfirmationDialog* confirmationDialog;
LabelControl *mapdVersion;
LabelControl *offlineMapsStatus;
LabelControl *offlineMapsETA;
LabelControl *offlineMapsElapsed;
LabelControlSP *mapdVersion;
LabelControlSP *offlineMapsStatus;
LabelControlSP *offlineMapsETA;
LabelControlSP *offlineMapsElapsed;
std::optional<std::chrono::system_clock::time_point> lastDownloadedTimePoint;
LocationsFetcher locationsFetcher;
void updateMapSize();
selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_settings.cc
+2 -2
View File
@@ -149,10 +149,10 @@ TogglesPanelSP::TogglesPanelSP(SettingsWindow *parent) : TogglesPanel(parent) {
toggles["ExperimentalLongitudinalEnabled"]->setConfirmation(true, false);
toggles["CustomStockLong"]->setConfirmation(true, false);
connect(toggles["ExperimentalLongitudinalEnabled"], &ToggleControl::toggleFlipped, [=]() {
connect(toggles["ExperimentalLongitudinalEnabled"], &ToggleControlSP::toggleFlipped, [=]() {
updateToggles();
});
connect(toggles["CustomStockLong"], &ToggleControl::toggleFlipped, [=]() {
connect(toggles["CustomStockLong"], &ToggleControlSP::toggleFlipped, [=]() {
updateToggles();
});
selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_software_settings.cc
+3 -3
View File
@@ -3,9 +3,9 @@
#include <algorithm>
SoftwarePanelSP::SoftwarePanelSP(QWidget *parent) : SoftwarePanel(parent) {
// Get current model name and create new ButtonControl
// Get current model name and create new ButtonControlSP
const auto current_model = GetModelName();
currentModelLblBtn = new ButtonControl(tr("Driving Model"), tr("SELECT"), current_model);
currentModelLblBtn = new ButtonControlSP(tr("Driving Model"), tr("SELECT"), current_model);
currentModelLblBtn->setValue(current_model);
connect(&models_fetcher, &ModelsFetcher::downloadProgress, this, [this](const double progress) {
@@ -63,7 +63,7 @@ SoftwarePanelSP::SoftwarePanelSP(QWidget *parent) : SoftwarePanel(parent) {
// Connect click event from currentModelLblBtn to local slot
connect(currentModelLblBtn, &ButtonControl::clicked, this, &SoftwarePanelSP::handleCurrentModelLblBtnClicked);
connect(currentModelLblBtn, &ButtonControlSP::clicked, this, &SoftwarePanelSP::handleCurrentModelLblBtnClicked);
AddWidgetAt(0, currentModelLblBtn);
}
selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_software_settings.h
+1 -1
View File
@@ -69,7 +69,7 @@ private:
std::optional<Model> selectedModelToDownload;
std::optional<Model> selectedNavModelToDownload;
std::optional<Model> selectedMetadataToDownload;
ButtonControl *currentModelLblBtn;
ButtonControlSP *currentModelLblBtn;
ModelsFetcher models_fetcher;
ModelsFetcher nav_models_fetcher;
ModelsFetcher metadata_fetcher;
selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_sunnylink_settings.cc
+5 -5
View File
@@ -52,21 +52,21 @@ SunnylinkPanel::SunnylinkPanel(QWidget* parent) : QFrame(parent) {
});
status_popup = new SunnylinkSponsorPopup(false, this);
sponsorBtn = new ButtonControl(
sponsorBtn = new ButtonControlSP(
tr("Sponsor Status"), tr("SPONSOR"),
tr("Become a sponsor of sunnypilot to get early access to sunnylink features when they become available."));
list->addItem(sponsorBtn);
connect(sponsorBtn, &ButtonControl::clicked, [=]() {
connect(sponsorBtn, &ButtonControlSP::clicked, [=]() {
status_popup->exec();
});
list->addItem(horizontal_line());
pair_popup = new SunnylinkSponsorPopup(true, this);
pairSponsorBtn = new ButtonControl(
pairSponsorBtn = new ButtonControlSP(
tr("Pair GitHub Account"), tr("PAIR"),
tr("Pair your GitHub account to grant your device sponsor benefits, including API access on sunnylink.") + "🌟");
list->addItem(pairSponsorBtn);
connect(pairSponsorBtn, &ButtonControl::clicked, [=]() {
connect(pairSponsorBtn, &ButtonControlSP::clicked, [=]() {
if (getSunnylinkDongleId().value_or(tr("N/A")) == "N/A") {
ConfirmationDialog::alert(tr("sunnylink Dongle ID not found. This may be due to weak internet connection or sunnylink registration issue. Please reboot and try again."), this);
} else {
@@ -75,7 +75,7 @@ SunnylinkPanel::SunnylinkPanel(QWidget* parent) : QFrame(parent) {
});
list->addItem(horizontal_line());
list->addItem(new LabelControl(tr("Manage Settings")));
list->addItem(new LabelControlSP(tr("Manage Settings")));
backup_settings = new BackupSettings;
selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_sunnylink_settings.h
+2 -2
View File
@@ -88,8 +88,8 @@ private:
SubPanelButton *backupSettings;
SunnylinkSponsorPopup *status_popup;
SunnylinkSponsorPopup *pair_popup;
ButtonControl* sponsorBtn;
ButtonControl* pairSponsorBtn;
ButtonControlSP* sponsorBtn;
ButtonControlSP* pairSponsorBtn;
SunnylinkClient* sunnylink_client;
bool is_onroad = false;
selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_sunnypilot_settings.cc
+9 -9
View File
@@ -274,7 +274,7 @@ SunnypilotPanel::SunnypilotPanel(QWidget *parent) : QFrame(parent) {
list->addItem(laneChangeSettingsLayout);
list->addItem(horizontal_line());
list->addItem(new LabelControl(tr("Speed Limit Assist")));
list->addItem(new LabelControlSP(tr("Speed Limit Assist")));
}
if (param == "EnableSlc") {
@@ -304,7 +304,7 @@ SunnypilotPanel::SunnypilotPanel(QWidget *parent) : QFrame(parent) {
}
}
connect(toggles["NNFF"], &ToggleControl::toggleFlipped, [=](bool state) {
connect(toggles["NNFF"], &ToggleControlSP::toggleFlipped, [=](bool state) {
if (state) {
toggles["EnforceTorqueLateral"]->setEnabled(false);
params.putBool("EnforceTorqueLateral", false);
@@ -320,7 +320,7 @@ SunnypilotPanel::SunnypilotPanel(QWidget *parent) : QFrame(parent) {
// trigger updateToggles() when toggleFlipped
for (const auto& updateToggleName : updateTogglesNames) {
if (toggles.find(updateToggleName) != toggles.end()) {
connect(toggles[updateToggleName], &ToggleControl::toggleFlipped, [=](bool state) {
connect(toggles[updateToggleName], &ToggleControlSP::toggleFlipped, [=](bool state) {
updateToggles();
});
}
@@ -339,21 +339,21 @@ SunnypilotPanel::SunnypilotPanel(QWidget *parent) : QFrame(parent) {
toggles["EndToEndLongAlertLight"]->setConfirmation(true, false);
toggles["CustomOffsets"]->showDescription();
connect(toggles["EnableMads"], &ToggleControl::toggleFlipped, mads_settings, &MadsSettings::updateToggles);
connect(toggles["EnableMads"], &ToggleControl::toggleFlipped, [=](bool state) {
connect(toggles["EnableMads"], &ToggleControlSP::toggleFlipped, mads_settings, &MadsSettings::updateToggles);
connect(toggles["EnableMads"], &ToggleControlSP::toggleFlipped, [=](bool state) {
madsSettings->setEnabled(state);
});
madsSettings->setEnabled(toggles["EnableMads"]->isToggled());
connect(toggles["EnableSlc"], &ToggleControl::toggleFlipped, slc_settings, &SlcSettings::updateToggles);
connect(toggles["EnableSlc"], &ToggleControl::toggleFlipped, [=](bool state) {
connect(toggles["EnableSlc"], &ToggleControlSP::toggleFlipped, slc_settings, &SlcSettings::updateToggles);
connect(toggles["EnableSlc"], &ToggleControlSP::toggleFlipped, [=](bool state) {
slcSettings->setEnabled(state);
slcSettings->setVisible(state);
});
slcSettings->setEnabled(toggles["EnableSlc"]->isToggled());
slcSettings->setVisible(toggles["EnableSlc"]->isToggled());
connect(toggles["CustomOffsets"], &ToggleControl::toggleFlipped, [=](bool state) {
connect(toggles["CustomOffsets"], &ToggleControlSP::toggleFlipped, [=](bool state) {
customOffsetsSettings->setEnabled(state);
});
customOffsetsSettings->setEnabled(toggles["CustomOffsets"]->isToggled());
@@ -368,7 +368,7 @@ SunnypilotPanel::SunnypilotPanel(QWidget *parent) : QFrame(parent) {
});
// update "FRICTION" and "LAT_ACCEL_FACTOR" titles when TorquedOverride is flipped
connect(toggles["TorquedOverride"], &ToggleControl::toggleFlipped, [=](bool state) {
connect(toggles["TorquedOverride"], &ToggleControlSP::toggleFlipped, [=](bool state) {
friction->setEnabled(params.getBool("IsOffroad") || state);
lat_accel_factor->setEnabled(params.getBool("IsOffroad") || state);
selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_vehicle_settings.cc
+4 -4
View File
@@ -71,7 +71,7 @@ SPVehiclesTogglesPanel::SPVehiclesTogglesPanel(VehiclePanel *parent) : ListWidge
setSpacing(50);
// Hyundai/Kia/Genesis
addItem(new LabelControl(tr("Hyundai/Kia/Genesis")));
addItem(new LabelControlSP(tr("Hyundai/Kia/Genesis")));
auto hkgSmoothStop = new ParamControlSP(
"HkgSmoothStop",
tr("HKG CAN: Smoother Stopping Performance (Beta)"),
@@ -81,7 +81,7 @@ SPVehiclesTogglesPanel::SPVehiclesTogglesPanel(VehiclePanel *parent) : ListWidge
addItem(hkgSmoothStop);
// Subaru
addItem(new LabelControl(tr("Subaru")));
addItem(new LabelControlSP(tr("Subaru")));
auto subaruManualParkingBrakeSng = new ParamControlSP(
"SubaruManualParkingBrakeSng",
tr("Manual Parking Brake: Stop and Go (Beta)"),
@@ -91,7 +91,7 @@ SPVehiclesTogglesPanel::SPVehiclesTogglesPanel(VehiclePanel *parent) : ListWidge
addItem(subaruManualParkingBrakeSng);
// Toyota/Lexus
addItem(new LabelControl(tr("Toyota/Lexus")));
addItem(new LabelControlSP(tr("Toyota/Lexus")));
stockLongToyota = new ParamControlSP(
"StockLongToyota",
tr("Enable Stock Toyota Longitudinal Control"),
@@ -163,7 +163,7 @@ SPVehiclesTogglesPanel::SPVehiclesTogglesPanel(VehiclePanel *parent) : ListWidge
addItem(toyotaAutoUnlock);
// Volkswagen
addItem(new LabelControl(tr("Volkswagen")));
addItem(new LabelControlSP(tr("Volkswagen")));
auto volkswagenCCOnly = new ParamControlSP(
"VwCCOnly",
tr("Enable CC Only support"),
selfdrive/ui/sunnypilot/qt/offroad/settings/sp_priv_visuals_settings.cc
+1 -1
View File
@@ -120,7 +120,7 @@ VisualsPanel::VisualsPanel(QWidget *parent) : ListWidgetSP(parent) {
connect(uiStateSP(), &UIStateSP::offroadTransition, [=](bool offroad) {
});
QObject::connect(toggles["MapboxFullScreen"], &ToggleControl::toggleFlipped, [=](bool state) {
QObject::connect(toggles["MapboxFullScreen"], &ToggleControlSP::toggleFlipped, [=](bool state) {
toggles["MapboxFullScreen"]->showDescription();
});
}
selfdrive/ui/sunnypilot/qt/offroad/settings/sunnypilot/sp_priv_lane_change_settings.cc
+1 -1
View File
@@ -62,7 +62,7 @@ LaneChangeSettings::LaneChangeSettings(QWidget* parent) : QWidget(parent) {
}
}
connect(toggles["BelowSpeedPause"], &ToggleControl::toggleFlipped, [=](bool state) {
connect(toggles["BelowSpeedPause"], &ToggleControlSP::toggleFlipped, [=](bool state) {
pause_lateral_speed->setEnabled(state);
pause_lateral_speed->setVisible(state);
});
selfdrive/ui/sunnypilot/qt/onroad/sp_priv_onroad_settings.cc
+2 -2
View File
@@ -273,11 +273,11 @@ OptionWidget::OptionWidget(QWidget *parent) : QPushButton(parent) {
inner_frame->setContentsMargins(0, 0, 0, 0);
inner_frame->setSpacing(0);
{
title = new ElidedLabel(this);
title = new ElidedLabelSP(this);
title->setAttribute(Qt::WA_TransparentForMouseEvents);
inner_frame->addWidget(title);
subtitle = new ElidedLabel(this);
subtitle = new ElidedLabelSP(this);
subtitle->setAttribute(Qt::WA_TransparentForMouseEvents);
subtitle->setObjectName("subtitle");
inner_frame->addWidget(subtitle);
selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.cc
+1 -1
View File
@@ -43,7 +43,7 @@ AbstractControlSP::AbstractControlSP(const QString &title, const QString &desc,
hlayout->addWidget(title_label, 1);
// value next to control button
value = new ElidedLabel();
value = new ElidedLabelSP();
value->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
value->setStyleSheet("color: #aaaaaa");
hlayout->addWidget(value);
selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h
+8 -8
View File
@@ -20,11 +20,11 @@
// This is for compatibility purposes, until we properly do inheritance splitting
// This is because some controls were needing LabelControlSP, but the original code was using LabelControl
// which was modified in-place in the past but since we now have a new file, we will be moving it to LabelControlSP
#define LabelControl LabelControlSP
#define ElidedLabel ElidedLabelSP
#define ButtonControl ButtonControlSP
#define Toggle ToggleSP
#define ToggleControl ToggleControlSP
#define LabelControl LabelControlSP //Not used on SP private code
#define ElidedLabel ElidedLabelSP //Not used on SP private code
#define ButtonControl ButtonControlSP //Not used on SP private code
#define Toggle ToggleSP //Not used on SP private code
#define ToggleControl ToggleControlSP //Not used on SP private code
QFrame *horizontal_line(QWidget *parent = nullptr);
@@ -86,7 +86,7 @@ protected:
void hideEvent(QHideEvent *e) override;
QVBoxLayout *main_layout;
ElidedLabel *value;
ElidedLabelSP *value;
QLabel *description = nullptr;
};
@@ -143,7 +143,7 @@ public:
toggle.togglePosition();
}
hlayout->addWidget(&toggle);
QObject::connect(&toggle, &Toggle::stateChanged, this, &ToggleControlSP::toggleFlipped);
QObject::connect(&toggle, &ToggleSP::stateChanged, this, &ToggleControlSP::toggleFlipped);
}
void setEnabled(bool enabled) {
@@ -155,7 +155,7 @@ signals:
void toggleFlipped(bool state);
protected:
Toggle toggle;
ToggleSP toggle;
};
// widget to toggle params