github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-30 19:40:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Show progress dialog on second instance run

Browse source 
PR #17516.
This commit is contained in:
Vladimir Golovnev 2022-08-09 19:12:12 +03:00 • committed by GitHub
parent 3f94a68e62
commit 916e53c260
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/app/application.cpp
View file

@ -339,7 +339,22 @@ void Application::processMessage(const QString &message)
#ifndef DISABLE_GUI #ifndef DISABLE_GUI
if (message.isEmpty()) if (message.isEmpty())
{ {
m_window->activate(); // show UI // TODO: use [[likely]] in C++20
if (Q_LIKELY(BitTorrent::Session::instance()->isRestored()))
{
m_window->activate(); // show UI
}
else if (m_startupProgressDialog)
{
m_startupProgressDialog->show();
m_startupProgressDialog->activateWindow();
m_startupProgressDialog->raise();
}
else
{
createStartupProgressDialog();
}
return; return;
} }
#endif #endif
@ -703,11 +718,7 @@ try
} }
else else
{ {
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
connect(m_desktopIntegration, &DesktopIntegration::activationRequested, this, &Application::createStartupProgressDialog); connect(m_desktopIntegration, &DesktopIntegration::activationRequested, this, &Application::createStartupProgressDialog);
#else
connect(m_desktopIntegration, &DesktopIntegration::activationRequested, this, &Application::createStartupProgressDialog, Qt::SingleShotConnection);
#endif
} }
#endif #endif
connect(BitTorrent::Session::instance(), &BitTorrent::Session::restored, this, [this]() connect(BitTorrent::Session::instance(), &BitTorrent::Session::restored, this, [this]()
@ -840,10 +851,10 @@ bool Application::isRunning()
#ifndef DISABLE_GUI #ifndef DISABLE_GUI
void Application::createStartupProgressDialog() void Application::createStartupProgressDialog()
{ {
Q_ASSERT(!m_startupProgressDialog);
Q_ASSERT(m_desktopIntegration); Q_ASSERT(m_desktopIntegration);
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
disconnect(m_desktopIntegration, &DesktopIntegration::activationRequested, this, &Application::createStartupProgressDialog); disconnect(m_desktopIntegration, &DesktopIntegration::activationRequested, this, &Application::createStartupProgressDialog);
#endif
m_startupProgressDialog = new QProgressDialog(tr("Loading torrents..."), tr("Exit"), 0, 100); m_startupProgressDialog = new QProgressDialog(tr("Loading torrents..."), tr("Exit"), 0, 100);
m_startupProgressDialog->setAttribute(Qt::WA_DeleteOnClose); m_startupProgressDialog->setAttribute(Qt::WA_DeleteOnClose);