ScStw/app
ScStw/app
Archived
2
0
Fork 0
Code Issues 6 Pull requests Projects Releases 2 Packages 1 Wiki Activity

Library migration #36

Merged
dorian merged 62 commits from library_migration into master 2024-10-17 17:52:36 +02:00
Conversation 0 Commits 62 Files changed 80 +6 -4
5 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit bb72de8474 - Show all commits

2
resources/qml/components/FancyButton.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.9 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
Button { Button {

2
resources/qml/components/InputDelegate.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.0 import QtQuick 2.0
import QtQuick.Controls 2.3 import QtQuick.Controls 2.2
SmoothItemDelegate { SmoothItemDelegate {
id: control id: control

2
resources/qml/components/SmoothSwitchDelegate.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.9 import QtQuick 2.9
import QtQuick.Controls 2.3 import QtQuick.Controls 2.2
SwitchDelegate { SwitchDelegate {
id: control id: control

2
resources/shared/ScStwBasestation.sb64
View file

File diff suppressed because one or more lines are too long

2
sources/baseconn.cpp
View file

@ -364,6 +364,8 @@ bool BaseConn::isFirmwareUpToDate() {
int newFirmwareVersionMinor = newFirmwareVersion.split(".")[1].toInt(); int newFirmwareVersionMinor = newFirmwareVersion.split(".")[1].toInt();
int newFirmwareVersionPatch = newFirmwareVersion.split(".")[2].toInt(); int newFirmwareVersionPatch = newFirmwareVersion.split(".")[2].toInt();
qDebug() << "App firmware version is: " << newFirmwareVersion;
QString currentFirmwareVersion = this->firmwareVersion; QString currentFirmwareVersion = this->firmwareVersion;
int currentFirmwareVersionMajor = currentFirmwareVersion.split(".")[0].toInt(); int currentFirmwareVersionMajor = currentFirmwareVersion.split(".")[0].toInt();
int currentFirmwareVersionMinor = currentFirmwareVersion.split(".")[1].toInt(); int currentFirmwareVersionMinor = currentFirmwareVersion.split(".")[1].toInt();