QT/Serial-Studio
1
0
Fork 0
mirror of https://github.com/Serial-Studio/Serial-Studio.git synced 2025-01-15 05:22:53 +08:00
Code Issues Projects Releases Wiki Activity

Upgrade to 3.0.1 development version

Browse Source
This commit is contained in:
Alex Spataru 2024-11-03 01:19:35 -05:00
parent bdc1ce41b9
commit 5d327df67a
6 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/deploy.yml vendored
View File

@ -1,6 +1,6 @@
#-------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Workflow configuration # Workflow configuration
#-------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
name: Deploy name: Deploy
@ -13,12 +13,12 @@ on:
paths-ignore: # File-patterns to ignore paths-ignore: # File-patterns to ignore
- '**.md' # Ignore changes to *.md files - '**.md' # Ignore changes to *.md files
#-------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Define application name & version # Define application name & version
#-------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
env: env:
VERSION: "3.0.0" VERSION: "3.0.1"
QT_VERSION_LINUX: 6.8.0 QT_VERSION_LINUX: 6.8.0
QT_VERSION_MACOS: 6.8.0 QT_VERSION_MACOS: 6.8.0
QT_VERSION_WINDOWS: 6.8.0 QT_VERSION_WINDOWS: 6.8.0
@ -29,10 +29,9 @@ env:
PUBLISHER: "Alex Spataru" PUBLISHER: "Alex Spataru"
QT_MODULES: qtserialport qtconnectivity qtpositioning qtlocation qtgraphs qtquick3d qt3d qtdatavis3d qtshadertools QT_MODULES: qtserialport qtconnectivity qtpositioning qtlocation qtgraphs qtquick3d qt3d qtdatavis3d qtshadertools
#-------------------------------------------------------------------------------
#--------------------------------------------------------------------------------
# Workflow jobs (GNU/Linux, macOS & Windows) # Workflow jobs (GNU/Linux, macOS & Windows)
#-------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
jobs: jobs:
# #

2
CMakeLists.txt
View File

@ -35,7 +35,7 @@ set(PROJECT_CONTACT "serial-studio.github.io")
set(PROJECT_DESCRIPTION_SUMMARY "Multi-purpose data visualization software") set(PROJECT_DESCRIPTION_SUMMARY "Multi-purpose data visualization software")
set(PROJECT_VERSION_MAJOR "3") set(PROJECT_VERSION_MAJOR "3")
set(PROJECT_VERSION_MINOR "0") set(PROJECT_VERSION_MINOR "0")
set(PROJECT_VERSION_PATCH "0") set(PROJECT_VERSION_PATCH "1")
set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
set(PROJECT_APPCAST "https://raw.githubusercontent.com/Serial-Studio/Serial-Studio/master/updates.json") set(PROJECT_APPCAST "https://raw.githubusercontent.com/Serial-Studio/Serial-Studio/master/updates.json")

2
app/deploy/linux/serial-studio.desktop
View File

@ -8,5 +8,5 @@ StartupNotify=true
Categories=Electronics;Engineering;Science; Categories=Electronics;Engineering;Science;
Icon=serial-studio Icon=serial-studio
X-AppImage-Name=Serial Studio X-AppImage-Name=Serial Studio
X-AppImage-Version=3.0.0 X-AppImage-Version=3.0.1
X-AppImage-Arch=x86_64 X-AppImage-Arch=x86_64

2
app/deploy/macOS/info.plist
View File

@ -19,7 +19,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>3.0.0</string> <string>3.0.1</string>
<key>LSHasLocalizedDisplayName</key> <key>LSHasLocalizedDisplayName</key>
<true/> <true/>
<key>NSPrincipalClass</key> <key>NSPrincipalClass</key>

6
app/qml/Dialogs/About.qml
View File

@ -171,7 +171,7 @@ Window {
} }
ColumnLayout { ColumnLayout {
spacing: 8 spacing: 0
Layout.fillWidth: true Layout.fillWidth: true
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
@ -180,6 +180,10 @@ Window {
font: Cpp_Misc_CommonFonts.customUiFont(28, true) font: Cpp_Misc_CommonFonts.customUiFont(28, true)
} }
Item {
implicitHeight: 8
}
Label { Label {
opacity: 0.5 opacity: 0.5
text: qsTr("Version %1").arg(Cpp_AppVersion) text: qsTr("Version %1").arg(Cpp_AppVersion)

6
app/src/Misc/ModuleManager.cpp
View File

@ -267,6 +267,10 @@ void Misc::ModuleManager::initializeQmlInterface()
connect(miscTranslator, &Misc::Translator::languageChanged, &m_engine, connect(miscTranslator, &Misc::Translator::languageChanged, &m_engine,
&QQmlApplicationEngine::retranslate); &QQmlApplicationEngine::retranslate);
// Obtain build date/time
const auto buildDate = QStringLiteral(__DATE__);
const auto buildTime = QStringLiteral(__TIME__);
// Register C++ modules with QML // Register C++ modules with QML
const auto c = m_engine.rootContext(); const auto c = m_engine.rootContext();
c->setContextProperty("Cpp_Updater", updater); c->setContextProperty("Cpp_Updater", updater);
@ -290,6 +294,8 @@ void Misc::ModuleManager::initializeQmlInterface()
c->setContextProperty("Cpp_Misc_CommonFonts", miscCommonFonts); c->setContextProperty("Cpp_Misc_CommonFonts", miscCommonFonts);
c->setContextProperty("Cpp_UpdaterEnabled", autoUpdaterEnabled()); c->setContextProperty("Cpp_UpdaterEnabled", autoUpdaterEnabled());
c->setContextProperty("Cpp_ModuleManager", this); c->setContextProperty("Cpp_ModuleManager", this);
c->setContextProperty("Cpp_BuildDate", buildDate);
c->setContextProperty("Cpp_BuildTime", buildTime);
// Register app info with QML // Register app info with QML
c->setContextProperty("Cpp_AppName", qApp->applicationDisplayName()); c->setContextProperty("Cpp_AppName", qApp->applicationDisplayName());