mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-06 10:15:38 +08:00
refs #445, prepared for data entry GUI
* unified init of GUIs * used CProject::swiftVersionString()
This commit is contained in:
committed by
Mathew Sutcliffe
parent
13df4302d7
commit
a2527e69e3
@@ -38,8 +38,8 @@ CSwiftCore::CSwiftCore(const SetupInfo &info, QWidget *parent) :
|
||||
setWindowTitle(name);
|
||||
setWindowIcon(CIcons::swiftNova24());
|
||||
setWindowIconText(name);
|
||||
setupLogDisplay();
|
||||
connectSlots();
|
||||
initLogDisplay();
|
||||
initSlots();
|
||||
initStyleSheet();
|
||||
startCore(info);
|
||||
}
|
||||
@@ -94,7 +94,7 @@ void CSwiftCore::ps_onStyleSheetsChanged()
|
||||
this->initStyleSheet();
|
||||
}
|
||||
|
||||
void CSwiftCore::connectSlots()
|
||||
void CSwiftCore::initSlots()
|
||||
{
|
||||
connect(ui->pb_StartCore, &QPushButton::clicked, this, &CSwiftCore::ps_startCorePressed);
|
||||
connect(ui->pb_StopCore, &QPushButton::clicked, this, &CSwiftCore::ps_stopCorePressed);
|
||||
@@ -102,7 +102,7 @@ void CSwiftCore::connectSlots()
|
||||
connect(&CStyleSheetUtility::instance(), &CStyleSheetUtility::styleSheetsChanged, this, &CSwiftCore::ps_onStyleSheetsChanged);
|
||||
}
|
||||
|
||||
void CSwiftCore::setupLogDisplay()
|
||||
void CSwiftCore::initLogDisplay()
|
||||
{
|
||||
CLogHandler::instance()->install(true);
|
||||
CLogHandler::instance()->enableConsoleOutput(false); // default disable
|
||||
|
||||
@@ -58,12 +58,12 @@ private slots:
|
||||
virtual void ps_onStyleSheetsChanged();
|
||||
|
||||
private:
|
||||
void connectSlots();
|
||||
void setupLogDisplay();
|
||||
void initSlots();
|
||||
void initLogDisplay();
|
||||
void initStyleSheet();
|
||||
void startCore(const SetupInfo &setup);
|
||||
void stopCore();
|
||||
QString getDBusAddress() const;
|
||||
void initStyleSheet();
|
||||
|
||||
QScopedPointer<Ui::CSwiftCore> ui;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user