jon/esa-remote-lite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved some buttons, tabs and labels

Browse Source
This commit is contained in:
Jon ESA
2026-04-01 21:32:54 +01:00
parent 96079b493a
commit d75c80ef03
2 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
PowerPanel.cpp
View File

@@ -17,13 +17,6 @@ PowerPanel::PowerPanel(QWidget *parent) : QWidget(parent)
outer->setContentsMargins(10, 10, 10, 10); outer->setContentsMargins(10, 10, 10, 10);
outer->setSpacing(2); outer->setSpacing(2);
auto *heading = new QLabel("Status:", this);
QFont hf = heading->font();
hf.setBold(true);
hf.setPointSize(10);
heading->setFont(hf);
outer->addWidget(heading);
auto *line = new QFrame(this); auto *line = new QFrame(this);
line->setFrameShape(QFrame::HLine); line->setFrameShape(QFrame::HLine);
line->setFrameShadow(QFrame::Sunken); line->setFrameShadow(QFrame::Sunken);
@@ -52,13 +45,13 @@ PowerPanel::PowerPanel(QWidget *parent) : QWidget(parent)
void PowerPanel::reset() void PowerPanel::reset()
{ {
const QString style = "font-size: 11pt; padding: 2px 0px;"; const QString style = "font-size: 11pt; padding: 2px 0px;";
m_statusLabel ->setText("Connection status: --"); m_statusLabel ->setStyleSheet(style); m_statusLabel ->setText("Connection status: --"); m_statusLabel ->setStyleSheet(style);
m_supplyLabel ->setText("Supply voltage: --"); m_supplyLabel ->setStyleSheet(style); m_supplyLabel ->setText("Supply voltage: --"); m_supplyLabel ->setStyleSheet(style);
m_externalLabel->setText("External voltage: --"); m_externalLabel->setStyleSheet(style); m_externalLabel->setText("External voltage: --"); m_externalLabel->setStyleSheet(style);
m_ratedLabel ->setText("Rated voltage: --"); m_ratedLabel ->setStyleSheet(style); m_ratedLabel ->setText("Rated voltage: --"); m_ratedLabel ->setStyleSheet(style);
m_batt1Label ->setText("Battery 1 voltage: --"); m_batt1Label ->setStyleSheet(style); m_batt1Label ->setText("Battery 1 voltage: --"); m_batt1Label ->setStyleSheet(style);
m_batt2Label ->setText("Battery 2 voltage: --"); m_batt2Label ->setStyleSheet(style); m_batt2Label ->setText("Battery 2 voltage: --"); m_batt2Label ->setStyleSheet(style);
m_batt3Label ->setText("Battery 3 voltage: --"); m_batt3Label ->setStyleSheet(style); m_batt3Label ->setText("Battery 3 voltage: --"); m_batt3Label ->setStyleSheet(style);
} }
// #P0-P STA ext // #P0-P STA ext
@@ -82,8 +75,8 @@ void PowerPanel::setVoltages(const QStringList &v)
if (idx >= v.size()) return; if (idx >= v.size()) return;
applyLabel(l, QString("%1: %2 V").arg(prefix, v[idx]), voltColour(v[idx])); applyLabel(l, QString("%1: %2 V").arg(prefix, v[idx]), voltColour(v[idx]));
}; };
set(m_supplyLabel, "Supply voltage", 0); set(m_supplyLabel, "Supply voltage", 0);
set(m_externalLabel, "External voltage", 1); set(m_externalLabel, "External voltage", 1);
set(m_batt1Label, "Battery 1 voltage", 2); set(m_batt1Label, "Battery 1 voltage", 2);
set(m_batt2Label, "Battery 2 voltage", 3); set(m_batt2Label, "Battery 2 voltage", 3);
set(m_batt3Label, "Battery 3 voltage", 4); set(m_batt3Label, "Battery 3 voltage", 4);
@@ -119,9 +112,9 @@ QString PowerPanel::voltColour(const QString &val) const
{ {
bool ok = false; bool ok = false;
const double d = val.toDouble(&ok); const double d = val.toDouble(&ok);
if (!ok) return "palette(text)"; if (!ok) return "palette(text)";
if (d > 10.0) return "#2e7d32"; if (d > 10.0) return "#2e7d32";
if (d > 5.0) return "#e65100"; if (d > 5.0) return "#e65100";
if (d > 0.01) return "#c62828"; if (d > 0.01) return "#c62828";
return "#888888"; return "#888888";
} }

6
main.cpp
View File

@@ -135,8 +135,8 @@ static QWidget *makeSettingsTab(WebSocketController *ctrl, QWidget *parent)
auto *nameEdit = new QLineEdit(page); auto *nameEdit = new QLineEdit(page);
nameEdit->setPlaceholderText("Config name..."); nameEdit->setPlaceholderText("Config name...");
nameEdit->setMaximumWidth(160); nameEdit->setMaximumWidth(160);
auto *saveBtn = new QPushButton("Save", page); auto *saveBtn = new QPushButton("Save to Device", page);
auto *loadBtn = new QPushButton("Restore From File", page); auto *loadBtn = new QPushButton("Restore from Device", page);
auto *resetBtn = new QPushButton("Restore Defaults", page); auto *resetBtn = new QPushButton("Restore Defaults", page);
resetBtn->setStyleSheet( resetBtn->setStyleSheet(
"QPushButton { color: white; background-color: #c62828; border-radius: 4px; padding: 3px 8px; }" "QPushButton { color: white; background-color: #c62828; border-radius: 4px; padding: 3px 8px; }"
@@ -484,7 +484,7 @@ int main(int argc, char *argv[])
auto *tabs = new QTabWidget(&window); auto *tabs = new QTabWidget(&window);
tabs->addTab(makeGamesTab (ctrl, &window), "Games"); tabs->addTab(makeGamesTab (ctrl, &window), "Games");
tabs->addTab(makeVersionsTab(ctrl, &window), "Versions"); tabs->addTab(makeVersionsTab(ctrl, &window), "Versions");
tabs->addTab(makeManualTab (ctrl, &window), "Manual"); tabs->addTab(makeManualTab (ctrl, &window), "Manual Websocket");
tabs->addTab(makeSettingsTab(ctrl, &window), "Settings"); tabs->addTab(makeSettingsTab(ctrl, &window), "Settings");
tabs->addTab(makePowerTab (ctrl, &window), "Power"); tabs->addTab(makePowerTab (ctrl, &window), "Power");
tabs->addTab(makeLogsTab (ctrl, &window), "Logs"); tabs->addTab(makeLogsTab (ctrl, &window), "Logs");