diff options
| author | Crystalwarrior <varsash@gmail.com> | 2020-08-21 18:01:24 +0300 |
|---|---|---|
| committer | Crystalwarrior <varsash@gmail.com> | 2020-08-21 18:01:24 +0300 |
| commit | f27f210efeb13a5ac29727fef271f8249e3e8c5d (patch) | |
| tree | 50051262a3982f4a6a0cb95847b233b498cf2282 /include | |
| parent | edf3d463e990ff8573bb6655c793490e6b1ea82c (diff) | |
Proof of concept complete. The timer will now take int msecs to start, and will properly display the time remaining until target time in hh:mm:ss.zzz
Clock can be defined in courtroom_config.ini and its font set in courtroom_fonts.ini
Pause and resume functions will not work as expected atm.
Diffstat (limited to 'include')
| -rw-r--r-- | include/aoclocklabel.h | 4 | ||||
| -rw-r--r-- | include/courtroom.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/aoclocklabel.h b/include/aoclocklabel.h index 518cae7b..806ed182 100644 --- a/include/aoclocklabel.h +++ b/include/aoclocklabel.h @@ -5,6 +5,7 @@ #include <QBasicTimer> #include <QTimerEvent> #include <QTime> +#include <QDebug> class AOClockLabel : public QLabel { Q_OBJECT @@ -12,7 +13,7 @@ class AOClockLabel : public QLabel { public: AOClockLabel(QWidget *parent); void start(); - void start(QTime p_time); + void start(int msecs); void pause(); void resume(); void stop(); @@ -22,7 +23,6 @@ protected: private: QBasicTimer timer; - QTime starting_time; QTime target_time; }; diff --git a/include/courtroom.h b/include/courtroom.h index 5b5ff6c1..1ff74f54 100644 --- a/include/courtroom.h +++ b/include/courtroom.h @@ -6,6 +6,7 @@ #include "aobutton.h" #include "aocharbutton.h" #include "aocharmovie.h" +#include "aoclocklabel.h" #include "aoemotebutton.h" #include "aoevidencebutton.h" #include "aoevidencedisplay.h" @@ -517,6 +518,8 @@ private: ScrollText *ui_music_name; AOMovie *ui_music_display; + AOClockLabel *ui_clock; + AOButton *ui_pair_button; QListWidget *ui_pair_list; QSpinBox *ui_pair_offset_spinbox; |