init branch

This commit is contained in:
IMback
2018-10-09 18:40:55 +02:00
parent d40974a8e6
commit 2801671ced
13 changed files with 232 additions and 149 deletions

View File

@ -4,7 +4,6 @@
#include <QMainWindow>
#include <QColorDialog>
#include <QListWidgetItem>
#include <QSettings>
#include <QTime>
#include <vector>
#include "alarmtime.h"
@ -21,7 +20,7 @@ class MainWindow : public QMainWindow
Q_OBJECT
public:
explicit MainWindow(QSettings *settings, Microcontroller *micro, bool isRemoteMode = false, QWidget *parent = 0);
explicit MainWindow(Microcontroller *micro, bool isRemoteMode = false, QWidget *parent = nullptr);
~MainWindow();
@ -31,8 +30,6 @@ private:
QColorDialog colorChooser;
QSettings *_settings;
Microcontroller *_micro;
std::vector<QAbstractButton*> _relayCheckBoxes;
@ -44,18 +41,12 @@ signals:
void signalAmpOn();
void signalAmpOff();
void signalAlmNightStateChanged(int state);
void signalAlmNightChanged(const QTime time);
void signalAlmAlarmStateChanged(int state);
void signalAlmAlarmChanged(const QTime time);
void showAlmSettingsDialog();
void showAdvRelayDialog();
private slots:
void postActivate();
//RGB
void slotChangedRgb(const QColor color);
void slotApplyPreset();
@ -70,19 +61,13 @@ private slots:
void slotBSpeakerAutoToggle(int state);
void slotInfMirrorAutoToggle(int state);
//Alarm
void slotChangedAlarmTime(const QTime time);
void saveAlarmState(int state);
//Night
void slotChangedNightTime(const QTime time);
//door
void slotDoorOpenTimeout();
public slots:
void relayStateChanged(std::vector<bool> relayStates);
void auxStateChanged(int value);
};