piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

chore(cpn): update to Qt 5.15.2 and rework application packaging (#4270)

Browse Source 
Co-authored-by: raphaelcoeffic <raphael.coeffic@frafos.com>
Co-authored-by: philmoz <phil.a.mitchell@gmail.com>
This commit is contained in:
Neil Horne
2023-11-10 15:12:28 +10:00
committed by GitHub
co-authored by raphaelcoeffic philmoz
parent 9d5c6e62cb
commit a3faf7e9df
49 changed files with 347 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/simulation/debugoutput.ui
+2 -2
View File
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>555</width>
<width>726</width>
<height>733</height>
</rect>
</property>
@@ -121,7 +121,7 @@ To &lt;b&gt;remove a remembered entry&lt;/b&gt; from the filter list, first cho
<enum>QComboBox::InsertAtTop</enum>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLength</enum>
<enum>QComboBox::AdjustToContents</enum>
</property>
<property name="minimumContentsLength">
<number>1</number>
companion/src/simulation/radiooutputswidget.cpp
+3 -3
View File
@@ -230,7 +230,7 @@ void RadioOutputsWidget::setupGVarsDisplay()
}
QHash<int, QLabel *> fmMap;
for (int gv=0; gv < gvars; gv++) {
bgrole = ((gv % 2) ? QPalette::Background : QPalette::AlternateBase);
bgrole = ((gv % 2) ? QPalette::Window : QPalette::AlternateBase);
QLabel * label = new QLabel(gvarsWidget);
label->setText(QString(tr("GV%1")).arg(gv+1));
label->setAutoFillBackground(true);
@@ -335,7 +335,7 @@ void RadioOutputsWidget::onVirtSwValueChange(quint8 index, qint32 value)
return;
QLabel * ls = m_logicSwitchMap.value(index);
ls->setBackgroundRole(value ? QPalette::Dark : QPalette::Background);
ls->setBackgroundRole(value ? QPalette::Dark : QPalette::Window);
ls->setForegroundRole(value ? QPalette::BrightText : QPalette::WindowText);
ls->setFrameShadow(value ? QFrame::Sunken : QFrame::Raised);
QFont font = ls->font();
@@ -381,7 +381,7 @@ void RadioOutputsWidget::onPhaseChanged(qint32 phase, const QString &)
}
else {
fgrole = QPalette::WindowText;
bgrole = ((gv.key() % 2) ? QPalette::Background : QPalette::AlternateBase);
bgrole = ((gv.key() % 2) ? QPalette::Window : QPalette::AlternateBase);
font.setBold(false);
}
lbl->setForegroundRole(fgrole);
companion/src/simulation/simulateduiwidget.cpp
+3 -3
View File
@@ -148,7 +148,7 @@ void SimulatedUIWidget::captureScreenshot()
path = "./";
QDir dir(path);
if (dir.exists() && dir.isReadable()) {
QStringList fwid = getCurrentFirmware()->getId().split("-", QString::SkipEmptyParts);
QStringList fwid = getCurrentFirmware()->getId().split("-", Qt::SkipEmptyParts);
QString flavor = fwid.at(qMin(1, fwid.size()));
QString fnpfx = tr("screenshot", "Simulator LCD screenshot file name prefix");
fileName = "%1/%2_%3_%4.png";
@@ -173,7 +173,7 @@ void SimulatedUIWidget::wheelEvent(QWheelEvent * event)
void SimulatedUIWidget::mousePressEvent(QMouseEvent * event)
{
if (event->button() == Qt::MidButton && m_mouseMidClickAction)
if (event->button() == Qt::MiddleButton && m_mouseMidClickAction)
m_mouseMidClickAction->trigger(true);
else
event->ignore();
@@ -181,7 +181,7 @@ void SimulatedUIWidget::mousePressEvent(QMouseEvent * event)
void SimulatedUIWidget::mouseReleaseEvent(QMouseEvent * event)
{
if (event->button() == Qt::MidButton && m_mouseMidClickAction)
if (event->button() == Qt::MiddleButton && m_mouseMidClickAction)
m_mouseMidClickAction->trigger(false);
else
event->ignore();
companion/src/simulation/widgets/buttonswidget.h
+1 -1
View File
@@ -72,7 +72,7 @@ class ButtonsWidget : public QWidget
void onMouseButtonEvent(bool press, QMouseEvent * event)
{
if (!(event->button() & (Qt::LeftButton | Qt::MidButton))) {
if (!(event->button() & (Qt::LeftButton | Qt::MiddleButton))) {
event->ignore();
return;
}
companion/src/simulation/widgets/radiowidget.cpp
+1 -1
View File
@@ -237,6 +237,6 @@ QDebug operator << (QDebug d, const RadioWidget::RadioWidgetState & o)
{
QDebugStateSaver saver(d);
d << "RadioWidget::RadioWidgetState: type=" << o.type << "; index=" << o.index
<< "; value=" << o.value << "; flags=0x" << hex << o.flags;
<< "; value=" << o.value << "; flags=0x" << Qt::hex << o.flags;
return d;
}