refs #642, fixed setup loading, in same step refs #636 clear cache

* changed signals in setup reader
* explicit mode is default
* detailed information what is loaded
* new log pattern
* allow to add message list to log component
* allow to clear cache by cmd line arg
* consolidated cmd names
This commit is contained in:
Klaus Basan
2016-04-14 02:27:23 +02:00
parent bd9de9308c
commit d0daad7d34
17 changed files with 372 additions and 159 deletions

View File

@@ -47,7 +47,7 @@ CSwiftLauncher::CSwiftLauncher(QWidget *parent) :
connect(ui->tb_BackToMain, &QToolButton::pressed, this, &CSwiftLauncher::ps_showMainPage);
// use version signal as trigger for completion
connect(sGui, &CApplication::updateInfoSynchronized, this, &CSwiftLauncher::ps_loadedUpdateInfo);
connect(sGui, &CApplication::updateInfoAvailable, this, &CSwiftLauncher::ps_loadedUpdateInfo);
new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_L), this, SLOT(ps_showLogPage()));
this->ui->le_DBusServerPort->setValidator(new QIntValidator(0, 65535, this));
@@ -287,8 +287,8 @@ void CSwiftLauncher::ps_loadSetup()
if (!this->ui->le_LatestVersion->text().isEmpty())
{
this->ui->le_LatestVersion->setText("");
const CStatusMessage m(sApp->requestReloadOfSetupAndVersion());
this->ps_appendLogMessage(m);
const CStatusMessageList msgs(sApp->requestReloadOfSetupAndVersion());
this->ps_appendLogMessages(msgs);
}
}
@@ -382,6 +382,15 @@ void CSwiftLauncher::ps_appendLogMessage(const CStatusMessage &message)
}
}
void CSwiftLauncher::ps_appendLogMessages(const CStatusMessageList &messages)
{
ui->fr_SwiftLauncherLog->appendStatusMessagesToList(messages);
if (messages.hasErrorMessages())
{
this->ps_showStatusMessage(messages.getErrorMessages().toSingleMessage());
}
}
void CSwiftLauncher::ps_showMainPage()
{
this->ui->sw_SwiftLauncher->setCurrentWidget(this->ui->pg_SwiftLauncherMain);

View File

@@ -145,6 +145,9 @@ private slots:
//! Append status message
void ps_appendLogMessage(const BlackMisc::CStatusMessage &message);
//! Append status messages
void ps_appendLogMessages(const BlackMisc::CStatusMessageList &messages);
//! Show set main page
void ps_showMainPage();