refs #534 use cached data / settings

* models
* vPilot rules
* DBus address
This commit is contained in:
Klaus Basan
2015-12-02 01:38:05 +01:00
parent f7cb21c78c
commit fadb7eb750
4 changed files with 70 additions and 7 deletions

View File

@@ -54,7 +54,8 @@ CSwiftLauncher::CSwiftLauncher(QWidget *parent) :
new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_L), this, SLOT(ps_showLogPage()));
this->ui->le_DBusServerPort->setValidator(new QIntValidator(0, 65535, this));
// QTimer::singleShot(5000, this, &CSwiftLauncher::ps_loadedSetup); //deferred init of setup
// default from settings
this->ui->cb_DBusServerAddress->setCurrentText(this->m_dbusServerAddress.get());
}
CSwiftLauncher::~CSwiftLauncher()

View File

@@ -16,6 +16,7 @@
#include <QScopedPointer>
#include "blackcore/data/globalsetup.h"
#include "blackcore/data/updateinfo.h"
#include "blackcore/settings/network.h"
#include "blackgui/enableforframelesswindow.h"
#include "blackgui/overlaymessagesframe.h"
#include "swiftguistandard/guimodeenums.h"
@@ -59,10 +60,11 @@ protected:
private:
QScopedPointer<Ui::CSwiftLauncher> ui;
BlackCore::CData<BlackCore::Data::GlobalSetup> m_setup { this, &CSwiftLauncher::ps_changedCache }; //!< setup cache
BlackCore::CData<BlackCore::Data::GlobalSetup> m_setup { this, &CSwiftLauncher::ps_changedCache }; //!< setup cache
BlackCore::CData<BlackCore::Data::UpdateInfo> m_updateInfo { this, &CSwiftLauncher::ps_changedCache }; //!< version cache
QString m_executable;
QStringList m_executableArgs;
BlackCore::CSetting<BlackCore::Settings::Network::DBusServerAddress> m_dbusServerAddress { this };
//! Get core mode
GuiModes::CoreMode getCoreMode() const;