refs #485, adjusted samples

This commit is contained in:
Klaus Basan
2016-02-15 00:05:54 +01:00
committed by Mathew Sutcliffe
parent 3829aaeae8
commit 7a38afe8c3
16 changed files with 43 additions and 68 deletions

View File

@@ -27,8 +27,8 @@ using namespace BlackCore;
int main(int argc, char *argv[])
{
CGuiApplication a(argc, argv, "swift launcher");
a.setWindowIcon(CIcons::swift24());
QApplication qa(argc, argv);
CGuiApplication a("swift launcher", CIcons::swift24());
a.addParserOption({{"i", "installer"}, QCoreApplication::translate("main", "Installer setup."), "installer"});
a.parse();

View File

@@ -49,7 +49,7 @@ CSwiftLauncher::CSwiftLauncher(QWidget *parent) :
connect(ui->tb_SwiftGui, &QPushButton::pressed, this, &CSwiftLauncher::ps_startButtonPressed);
connect(ui->tb_Database, &QPushButton::pressed, this, &CSwiftLauncher::ps_startButtonPressed);
connect(ui->tb_BackToMain, &QToolButton::pressed, this, &CSwiftLauncher::ps_showMainPage);
connect(&CSetupReader::instance(), &CSetupReader::versionSynchronized, this, &CSwiftLauncher::ps_loadedSetup);
// connect(&CSetupReader::instance(), &CSetupReader::updateInfoSynchronized, this, &CSwiftLauncher::ps_loadedSetup);
new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_L), this, SLOT(ps_showLogPage()));
this->ui->le_DBusServerPort->setValidator(new QIntValidator(0, 65535, this));
@@ -261,7 +261,8 @@ void CSwiftLauncher::ps_loadSetup()
if (!this->ui->le_LatestVersion->text().isEmpty())
{
this->ui->le_LatestVersion->setText("");
CSetupReader::instance().requestReload();
CStatusMessage m(sApp->requestReloadOfSetupAndVersion());
this->ps_appendLogMessage(m);
}
}