QT/Serial-Studio
1
0
Fork 0
mirror of https://github.com/Serial-Studio/Serial-Studio.git synced 2025-01-31 17:42:55 +08:00
Code Issues Projects Releases Wiki Activity

Hide splash screen on main.qml

Browse Source
This commit is contained in:
Alex Spataru 2021-11-19 11:26:20 -06:00
parent fae3c56c27
commit 8986a3e6d0
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
assets/qml/Windows/MainWindow.qml
View File

@ -79,12 +79,25 @@ FramelessWindow.CustomWindow {
function consoleSelectAll() { terminal.selectAll() }
//
// Displays the main window & checks for updates
// Window geometry
//
function showMainWindow() {
visible: false
title: Cpp_AppName
width: minimumWidth
height: minimumHeight
minimumWidth: 1250 + 2 * root.shadowMargin
backgroundColor: Cpp_ThemeManager.windowBackground
minimumHeight: 720 + 2 * root.shadowMargin + root.titlebar.height
//
// Startup code
//
Component.onCompleted: {
// Load welcome text
terminal.showWelcomeGuide()
// Increment app launch count & hide splash screen
++appLaunchCount
Cpp_ModuleManager.hideSplashscreen()
// Show app window
if (root.isFullscreen)
@ -128,25 +141,6 @@ FramelessWindow.CustomWindow {
Cpp_Updater.checkForUpdates(Cpp_AppUpdaterUrl)
}
//
// Window geometry
//
visible: false
title: Cpp_AppName
width: minimumWidth
height: minimumHeight
minimumWidth: 1250 + 2 * root.shadowMargin
backgroundColor: Cpp_ThemeManager.windowBackground
minimumHeight: 720 + 2 * root.shadowMargin + root.titlebar.height
//
// Startup code
//
Component.onCompleted: {
terminal.showWelcomeGuide()
root.showMainWindow()
}
//
// Hide console & device manager when we receive first valid frame
//
@ -155,7 +149,8 @@ FramelessWindow.CustomWindow {
enabled: !root.firstValidFrame
function onUpdated() {
if ((Cpp_IO_Manager.connected || Cpp_CSV_Player.isOpen) && Cpp_UI_Dashboard.frameValid()) {
if ((Cpp_IO_Manager.connected || Cpp_CSV_Player.isOpen) &&
Cpp_UI_Dashboard.frameValid()) {
setup.hide()
root.showDashboard()
root.firstValidFrame = true

1
assets/qml/main.qml
View File

@ -59,6 +59,7 @@ Item {
asynchronous: true
sourceComponent: Windows.MainWindow {
Component.onCompleted: {
Cpp_ModuleManager.hideSplashscreen()
app.forceActiveFocus()
app.mainWindow = this
}