提交 506e8e74 编写于 作者: M manjaro

1. 解决了一个问题,在Manjaro Linux KDE环境下,在主窗口关闭后,任务栏按钮无法正确退出。

2 .解决了Splash在空白模块情况下一直显示的问题
上级 8407f7c2
...@@ -172,7 +172,11 @@ void taskBusPlatformFrm::load_default_modules() ...@@ -172,7 +172,11 @@ void taskBusPlatformFrm::load_default_modules()
QString DefaultFile = QCoreApplication::applicationDirPath() + "/default_mods.text"; QString DefaultFile = QCoreApplication::applicationDirPath() + "/default_mods.text";
QFile fin(DefaultFile); QFile fin(DefaultFile);
if (fin.open(QIODevice::ReadOnly)==false) if (fin.open(QIODevice::ReadOnly)==false)
{
QThread::msleep(2000);
emit hideSplash();
return; return;
}
QTextStream st(&fin); QTextStream st(&fin);
QStringList lstNames; QStringList lstNames;
while (st.atEnd()==false) while (st.atEnd()==false)
...@@ -183,6 +187,7 @@ void taskBusPlatformFrm::load_default_modules() ...@@ -183,6 +187,7 @@ void taskBusPlatformFrm::load_default_modules()
m_pTrayIcon->showMessage(tr("Init Modules..."),tr("Init modules from default_mods.text"),QSystemTrayIcon::Information, 1000); m_pTrayIcon->showMessage(tr("Init Modules..."),tr("Init modules from default_mods.text"),QSystemTrayIcon::Information, 1000);
load_modules(lstNames); load_modules(lstNames);
m_pTrayIcon->showMessage(tr("Succeed."),tr("Init modules from default_mods.text succeed!"),QSystemTrayIcon::Information, 2000); m_pTrayIcon->showMessage(tr("Succeed."),tr("Init modules from default_mods.text succeed!"),QSystemTrayIcon::Information, 2000);
QThread::msleep(1000);
emit hideSplash(); emit hideSplash();
} }
void taskBusPlatformFrm::save_default_modules() void taskBusPlatformFrm::save_default_modules()
...@@ -300,6 +305,7 @@ void taskBusPlatformFrm::closeEvent(QCloseEvent * event) ...@@ -300,6 +305,7 @@ void taskBusPlatformFrm::closeEvent(QCloseEvent * event)
} }
} }
event->accept(); event->accept();
this->m_pTrayIcon->hide();
} }
void taskBusPlatformFrm::on_actionhideWindow_toggled(bool arg1) void taskBusPlatformFrm::on_actionhideWindow_toggled(bool arg1)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册