Fix an issue with non-zero exit code states in the setup, add Rokid Max 2 to the supported models list, fix the connection status in the UI, fix an issue with the negative values on the labeled sliders
This commit is contained in:
parent
d3af88ec35
commit
78a6487a5c
|
|
@ -118,17 +118,16 @@ then
|
||||||
pkgkwin_stderr=$(LOCAL_BUILD_SYSTEM=1 bin/package_kwin --download-driver 2>&1)
|
pkgkwin_stderr=$(LOCAL_BUILD_SYSTEM=1 bin/package_kwin --download-driver 2>&1)
|
||||||
pkgkwin_rc=$?
|
pkgkwin_rc=$?
|
||||||
set -e
|
set -e
|
||||||
if echo "$pkgkwin_stderr" | grep -qi "could not find"; then
|
|
||||||
if [ -z "${PRINT_FULL_STDERR+x}" ]; then
|
|
||||||
print_missing_dependencies "$0"
|
|
||||||
exit 1
|
|
||||||
else
|
|
||||||
echo "$pkgkwin_stderr"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if [ "$pkgkwin_rc" -ne 0 ]; then
|
if [ "$pkgkwin_rc" -ne 0 ]; then
|
||||||
echo "$pkgkwin_stderr"
|
if echo "$pkgkwin_stderr" | grep -qi "could not find"; then
|
||||||
echo "Error: build failed with exit code $pkgkwin_rc"
|
if [ -z "${PRINT_FULL_STDERR+x}" ]; then
|
||||||
|
print_missing_dependencies "$0"
|
||||||
|
else
|
||||||
|
echo "$pkgkwin_stderr"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
echo ""
|
||||||
|
echo "Error: Breezy Desktop build failed with exit code $pkgkwin_rc"
|
||||||
exit $pkgkwin_rc
|
exit $pkgkwin_rc
|
||||||
fi
|
fi
|
||||||
FILE_NAME="breezyKWin-$ARCH.tar.gz"
|
FILE_NAME="breezyKWin-$ARCH.tar.gz"
|
||||||
|
|
|
||||||
|
|
@ -34,6 +34,7 @@ export const SUPPORTED_MONITOR_PRODUCTS = [
|
||||||
'Air 2 Ultra',
|
'Air 2 Ultra',
|
||||||
'SmartGlasses', // TCL/RayNeo
|
'SmartGlasses', // TCL/RayNeo
|
||||||
'Rokid Max',
|
'Rokid Max',
|
||||||
|
'Rokid Max 2',
|
||||||
'Rokid Air',
|
'Rokid Air',
|
||||||
NESTED_MONITOR_PRODUCT
|
NESTED_MONITOR_PRODUCT
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -191,7 +191,7 @@ void BreezyDesktopEffectConfig::pollDriverState()
|
||||||
|
|
||||||
const bool wasDeviceConnected = m_deviceConnected;
|
const bool wasDeviceConnected = m_deviceConnected;
|
||||||
m_deviceConnected = !m_connectedDeviceBrand.isEmpty() && !m_connectedDeviceModel.isEmpty();
|
m_deviceConnected = !m_connectedDeviceBrand.isEmpty() && !m_connectedDeviceModel.isEmpty();
|
||||||
if (m_deviceConnected != wasDeviceConnected) {
|
if (ui.labelDeviceConnectionStatus->text().isEmpty() || m_deviceConnected != wasDeviceConnected) {
|
||||||
ui.labelDeviceConnectionStatus->setText(m_deviceConnected ?
|
ui.labelDeviceConnectionStatus->setText(m_deviceConnected ?
|
||||||
QStringLiteral("%1 %2 connected").arg(m_connectedDeviceBrand, m_connectedDeviceModel) :
|
QStringLiteral("%1 %2 connected").arg(m_connectedDeviceBrand, m_connectedDeviceModel) :
|
||||||
QStringLiteral("No device connected"));
|
QStringLiteral("No device connected"));
|
||||||
|
|
|
||||||
|
|
@ -2,14 +2,11 @@
|
||||||
<ui version="4.0">
|
<ui version="4.0">
|
||||||
<class>BreezyDesktopEffectConfig</class>
|
<class>BreezyDesktopEffectConfig</class>
|
||||||
<widget class="QWidget" name="BreezyDesktopEffectConfig">
|
<widget class="QWidget" name="BreezyDesktopEffectConfig">
|
||||||
<property name="minimumWidth">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
<number>800</number>
|
<item>
|
||||||
</property>
|
<widget class="QLabel" name="labelDeviceConnectionStatus">
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<property name="text">
|
||||||
<item>
|
<string></string>
|
||||||
<widget class="QLabel" name="labelDeviceConnectionStatus">
|
|
||||||
<property name="text">
|
|
||||||
<string>No device connected</string>
|
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignHCenter|Qt::AlignVCenter</set>
|
<set>Qt::AlignHCenter|Qt::AlignVCenter</set>
|
||||||
|
|
|
||||||
|
|
@ -134,11 +134,13 @@ private:
|
||||||
return QString::number(raw);
|
return QString::number(raw);
|
||||||
}
|
}
|
||||||
int divisor = 1;
|
int divisor = 1;
|
||||||
for (int i = 0; i < m_decimalShift; ++i) divisor *= 10; // small loop, m_decimalShift capped
|
for (int i = 0; i < m_decimalShift; ++i) divisor *= 10;
|
||||||
int whole = raw / divisor;
|
int whole = raw / divisor;
|
||||||
int frac = std::abs(raw % divisor);
|
int frac = std::abs(raw % divisor);
|
||||||
QString fracStr = QString::number(frac).rightJustified(m_decimalShift, QLatin1Char('0'));
|
QString fracStr = QString::number(frac).rightJustified(m_decimalShift, QLatin1Char('0'));
|
||||||
return QString::number(whole) + QLatin1Char('.') + fracStr;
|
QString result = QString::number(std::abs(whole)) + QLatin1Char('.') + fracStr;
|
||||||
|
if (raw < 0) result.prepend(QLatin1Char('-'));
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool m_showValueBubble = true;
|
bool m_showValueBubble = true;
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@ Item {
|
||||||
"Air 2 Ultra",
|
"Air 2 Ultra",
|
||||||
"SmartGlasses", // TCL/RayNeo
|
"SmartGlasses", // TCL/RayNeo
|
||||||
"Rokid Max",
|
"Rokid Max",
|
||||||
|
"Rokid Max 2",
|
||||||
"Rokid Air"
|
"Rokid Air"
|
||||||
]
|
]
|
||||||
required property QtObject effect
|
required property QtObject effect
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue