mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-07 19:35:32 +08:00
Ref T554, improved auto publishing handling during shutdown
This commit is contained in:
@@ -217,8 +217,13 @@ void CSwiftData::checkMinimumVersion()
|
||||
|
||||
void CSwiftData::checkAutoPublishing()
|
||||
{
|
||||
if (!sApp || sApp->isShuttingDown()) { return; }
|
||||
if (!CAutoPublishData::existAutoPublishFiles()) { return; }
|
||||
this->showAutoPublishing();
|
||||
}
|
||||
|
||||
void CSwiftData::showAutoPublishing()
|
||||
{
|
||||
if (!sApp || sApp->isShuttingDown()) { return; }
|
||||
if (!m_autoPublishDialog) { m_autoPublishDialog = new CAutoPublishDialog(this); }
|
||||
m_autoPublishDialog->readAndShow();
|
||||
}
|
||||
|
||||
@@ -70,9 +70,11 @@ private:
|
||||
//! Check auto-publishing
|
||||
void checkAutoPublishing();
|
||||
|
||||
//! Show auto publishing
|
||||
void showAutoPublishing();
|
||||
|
||||
void performGracefulShutdown();
|
||||
void consolidationSettingChanged();
|
||||
|
||||
void displayConsole();
|
||||
void displayLog();
|
||||
void checkMinimumVersion();
|
||||
|
||||
@@ -55,7 +55,7 @@ void CSwiftData::initDynamicMenus()
|
||||
ui->menu_InfoAreas->addActions(ui->comp_MainInfoArea->getInfoAreaSelectActions(true, ui->menu_InfoAreas));
|
||||
|
||||
// menu entry for auto publish data
|
||||
ui->menu_Mapping->addAction(CIcons::database16(), "Auto publish data", this, &CSwiftData::checkAutoPublishing);
|
||||
ui->menu_Mapping->addAction(CIcons::database16(), "Auto publish data", this, &CSwiftData::showAutoPublishing);
|
||||
|
||||
QString resourceDir(CDirectoryUtils::shareDirectory());
|
||||
if (!resourceDir.isEmpty() && QDir(resourceDir).exists())
|
||||
|
||||
Reference in New Issue
Block a user