[Simulator] LCD screenshot file name now includes radio type; Remove unnecessary class dependence in SimulatedUIWidget initializer; Show exit status debug; Cosmetics.

This commit is contained in:
Max Paperno
2017-02-08 00:02:34 -05:00
parent 62bcfb52c0
commit c4acbf6054
9 changed files with 81 additions and 67 deletions
+11 -17
View File
@@ -45,7 +45,7 @@ class SimulatedUIWidget : public QWidget
protected:
explicit SimulatedUIWidget(SimulatorInterface * simulator, SimulatorDialog * simuDialog = NULL, QWidget * parent = NULL);
explicit SimulatedUIWidget(SimulatorInterface * simulator, QWidget * parent = NULL);
public:
@@ -72,12 +72,13 @@ class SimulatedUIWidget : public QWidget
void mouseReleaseEvent(QMouseEvent *event);
protected:
void setLcd(LcdWidget * lcd);
void connectScrollActions();
virtual void setLightOn(bool enable) { }
SimulatorInterface * m_simulator;
SimulatorDialog * m_simuDialog;
QWidget * m_parent;
LcdWidget * m_lcd;
QVector<QColor> m_backlightColors;
QVector<keymapHelp_t> m_keymapHelp;
@@ -92,6 +93,9 @@ class SimulatedUIWidget : public QWidget
int m_beepShow;
int m_beepVal;
signals:
void customStyleRequest(const QString & style);
};
@@ -109,14 +113,12 @@ class SimulatedUIWidget9X: public SimulatedUIWidget
Q_OBJECT
public:
explicit SimulatedUIWidget9X(SimulatorInterface * simulator, SimulatorDialog * simuDialog = NULL, QWidget * parent = NULL);
explicit SimulatedUIWidget9X(SimulatorInterface * simulator, QWidget * parent = NULL);
virtual ~SimulatedUIWidget9X();
protected:
void setLightOn(bool enable);
protected slots:
private:
Ui::SimulatedUIWidget9X * ui;
@@ -127,11 +129,9 @@ class SimulatedUIWidgetX7: public SimulatedUIWidget
Q_OBJECT
public:
explicit SimulatedUIWidgetX7(SimulatorInterface * simulator, SimulatorDialog * simuDialog = NULL, QWidget * parent = NULL);
explicit SimulatedUIWidgetX7(SimulatorInterface * simulator, QWidget * parent = NULL);
virtual ~SimulatedUIWidgetX7();
protected:
private:
Ui::SimulatedUIWidgetX7 * ui;
};
@@ -141,11 +141,9 @@ class SimulatedUIWidgetX9: public SimulatedUIWidget
Q_OBJECT
public:
explicit SimulatedUIWidgetX9(SimulatorInterface * simulator, SimulatorDialog * simuDialog = NULL, QWidget * parent = NULL);
explicit SimulatedUIWidgetX9(SimulatorInterface * simulator, QWidget * parent = NULL);
virtual ~SimulatedUIWidgetX9();
protected:
private:
Ui::SimulatedUIWidgetX9 * ui;
};
@@ -155,11 +153,9 @@ class SimulatedUIWidgetX9E: public SimulatedUIWidget
Q_OBJECT
public:
explicit SimulatedUIWidgetX9E(SimulatorInterface * simulator, SimulatorDialog * simuDialog = NULL, QWidget * parent = NULL);
explicit SimulatedUIWidgetX9E(SimulatorInterface * simulator, QWidget * parent = NULL);
virtual ~SimulatedUIWidgetX9E();
protected:
private:
Ui::SimulatedUIWidgetX9E * ui;
};
@@ -169,11 +165,9 @@ class SimulatedUIWidgetX12: public SimulatedUIWidget
Q_OBJECT
public:
explicit SimulatedUIWidgetX12(SimulatorInterface * simulator, SimulatorDialog * simuDialog = NULL, QWidget * parent = NULL);
explicit SimulatedUIWidgetX12(SimulatorInterface * simulator, QWidget * parent = NULL);
virtual ~SimulatedUIWidgetX12();
protected:
private:
Ui::SimulatedUIWidgetX12 * ui;
};