diff --git a/documentation/html/annotated.html b/documentation/html/annotated.html index f90222f..2932fd8 100644 --- a/documentation/html/annotated.html +++ b/documentation/html/annotated.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
diff --git a/documentation/html/boxingsettings_8cpp.html b/documentation/html/boxingsettings_8cpp.html index d0f68d6..daa1c5a 100644 --- a/documentation/html/boxingsettings_8cpp.html +++ b/documentation/html/boxingsettings_8cpp.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
diff --git a/documentation/html/boxingsettings_8h.html b/documentation/html/boxingsettings_8h.html index 2f55476..9339140 100644 --- a/documentation/html/boxingsettings_8h.html +++ b/documentation/html/boxingsettings_8h.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
diff --git a/documentation/html/boxingsettings_8h_source.html b/documentation/html/boxingsettings_8h_source.html index 27ce3f1..ab5da78 100644 --- a/documentation/html/boxingsettings_8h_source.html +++ b/documentation/html/boxingsettings_8h_source.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
diff --git a/documentation/html/boxingtimer_8cpp.html b/documentation/html/boxingtimer_8cpp.html index bf6f25b..29c8a01 100644 --- a/documentation/html/boxingtimer_8cpp.html +++ b/documentation/html/boxingtimer_8cpp.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
@@ -70,6 +70,7 @@ $(function() {
#include <QObject>
#include <QTime>
#include <QSettings>
+#include <QSound>
#include "boxingtimer.h"
#include "boxingsettings.h"
diff --git a/documentation/html/boxingtimer_8h.html b/documentation/html/boxingtimer_8h.html index d4ec393..2ea6de3 100644 --- a/documentation/html/boxingtimer_8h.html +++ b/documentation/html/boxingtimer_8h.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
diff --git a/documentation/html/boxingtimer_8h_source.html b/documentation/html/boxingtimer_8h_source.html index aba2091..acd5217 100644 --- a/documentation/html/boxingtimer_8h_source.html +++ b/documentation/html/boxingtimer_8h_source.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
@@ -67,30 +67,30 @@ $(function() {
boxingtimer.h
-Go to the documentation of this file.
1 #ifndef BOXINGTIMER_H
2 #define BOXINGTIMER_H
3 
4 #include <QTimer>
5 #include <QString>
6 #include <QStringList>
7 
8 #ifdef QT_DEBUG
9  #include <QDebug>
10 #endif
11 
16 class BoxingSettings;
17 
26 class BoxingTimer : public QTimer {
27  Q_OBJECT
28  Q_ENUMS(Status)
29 
30 
32  Q_PROPERTY(QString roundsToString READ roundsToString NOTIFY roundsToStringChanged)
33  Q_PROPERTY(Status status READ getStatus WRITE setStatus NOTIFY statusChanged)
34  Q_PROPERTY(bool isActive READ isActive NOTIFY activeChanged)
35  Q_PROPERTY(QString preset READ getPreset NOTIFY presetChanged)
38  public:
39 
47  Q_INVOKABLE void restore();
48 
56  Q_INVOKABLE void loadPreset(const QString &preset);
57 
64  explicit BoxingTimer();
65 
73  const QString roundsToString();
74 
82  const QString remainingTimeToString();
83 
90  enum class Status : short {
91  Default = 0,
92  Start,
93  Rest,
94  Pause,
95  Reset,
96  Stop
97  };
98 
104  Status getStatus() { return this->mStatus; }
105 
112  void setStatus(const Status &status);
113 
119  const QString getPreset();
120 
121  public slots:
127  void applyStatus();
128 
135 
136  protected:
142  void stop();
143 
149  void start(const int &milliseconds);
150 
151  private:
152  int mRound;
153 
154  int mRoundsMilliseconds;
155  int mRemainingMilliseconds;
156 
157  void setRemainingMilliseconds(const int &milliseconds);
158  void setRound(const int &round);
159 
160  Status mStatus;
161  Status mOldStatus;
162 
163  BoxingSettings *settings;
164 
170  void nextRound();
171 
172  signals:
174  void roundsToStringChanged();
175 
176  void statusChanged();
177  void presetChanged();
178  void activeChanged();
179 };
180 
181 Q_DECLARE_METATYPE(BoxingTimer::Status)
182 
183 #endif // BOXINGTIMER_H
-
BoxingTimer()
Default constructor.
Definition: boxingtimer.cpp:8
+Go to the documentation of this file.
1 #ifndef BOXINGTIMER_H
2 #define BOXINGTIMER_H
3 
4 #include <QTimer>
5 #include <QString>
6 #include <QStringList>
7 
8 #ifdef QT_DEBUG
9  #include <QDebug>
10 #endif
11 
16 class QSound;
17 class BoxingSettings;
18 
27 class BoxingTimer : public QTimer {
28  Q_OBJECT
29  Q_ENUMS(Status)
30 
31 
33  Q_PROPERTY(QString roundsToString READ roundsToString NOTIFY roundsToStringChanged)
34  Q_PROPERTY(Status status READ getStatus WRITE setStatus NOTIFY statusChanged)
35  Q_PROPERTY(bool isActive READ isActive NOTIFY activeChanged)
36  Q_PROPERTY(QString preset READ getPreset NOTIFY presetChanged)
39  public:
40 
48  Q_INVOKABLE void restore();
49 
57  Q_INVOKABLE void loadPreset(const QString &preset);
58 
65  explicit BoxingTimer();
66 
74  const QString roundsToString();
75 
83  const QString remainingTimeToString();
84 
91  enum class Status : short {
92  Default = 0,
93  Start,
94  Rest,
95  Pause,
96  Reset,
97  Stop
98  };
99 
105  Status getStatus() { return this->mStatus; }
106 
113  void setStatus(const Status &status);
114 
120  const QString getPreset();
121 
122  public slots:
128  void applyStatus();
129 
136 
137  protected:
143  void stop();
144 
150  void start(const int &milliseconds);
151 
152  private:
153  int mRound;
154 
155  int mRoundsMilliseconds;
156  int mRemainingMilliseconds;
157 
158  void setRemainingMilliseconds(const int &milliseconds);
159  void setRound(const int &round);
160 
161  QSound *playBell;
162  QSound *restBell;
163  QSound *stopBell;
164 
170  void songsBell();
171 
172  Status mStatus;
173  Status mOldStatus;
174 
175  BoxingSettings *settings;
176 
182  void nextRound();
183 
184  signals:
186  void roundsToStringChanged();
187 
188  void statusChanged();
189  void presetChanged();
190  void activeChanged();
191 };
192 
193 Q_DECLARE_METATYPE(BoxingTimer::Status)
194 
195 #endif // BOXINGTIMER_H
+
BoxingTimer()
Default constructor.
Definition: boxingtimer.cpp:9
-
Q_INVOKABLE void loadPreset(const QString &preset)
Load the preset to change settings of timer.
Definition: boxingtimer.cpp:146
+
Q_INVOKABLE void loadPreset(const QString &preset)
Load the preset to change settings of timer.
Definition: boxingtimer.cpp:154
-
const QString remainingTimeToString()
Convert remaining milliseconds in human readable time.
Definition: boxingtimer.cpp:111
-
Q_INVOKABLE void restore()
Start or restore the timer.
Definition: boxingtimer.cpp:125
-
void stop()
Override of stop function to emit statusChanged() signal.
Definition: boxingtimer.cpp:48
-
const QString roundsToString()
Convert round and total rounds for view.
Definition: boxingtimer.cpp:133
-
Status
Define the status of the timer Some statuses are not saved, they are used to activate something...
Definition: boxingtimer.h:90
-
void start(const int &milliseconds)
Override of start function to emit statusChanged() signal.
Definition: boxingtimer.cpp:54
-
void setStatus(const Status &status)
Definition: boxingtimer.cpp:38
+
const QString remainingTimeToString()
Convert remaining milliseconds in human readable time.
Definition: boxingtimer.cpp:119
+
Q_INVOKABLE void restore()
Start or restore the timer.
Definition: boxingtimer.cpp:133
+
void stop()
Override of stop function to emit statusChanged() signal.
Definition: boxingtimer.cpp:52
+
const QString roundsToString()
Convert round and total rounds for view.
Definition: boxingtimer.cpp:141
+
Status
Define the status of the timer Some statuses are not saved, they are used to activate something...
Definition: boxingtimer.h:91
+
void start(const int &milliseconds)
Override of start function to emit statusChanged() signal.
Definition: boxingtimer.cpp:58
+
void setStatus(const Status &status)
Definition: boxingtimer.cpp:42
void activeChanged()
void roundsToStringChanged()
void statusChanged()
-
Status getStatus()
Definition: boxingtimer.h:104
-
void applyStatus()
Apply status and exec relative functions.
Definition: boxingtimer.cpp:60
+
Status getStatus()
Definition: boxingtimer.h:105
+
void applyStatus()
Apply status and exec relative functions.
Definition: boxingtimer.cpp:64
void presetChanged()
-
void updateRemainingMilliseconds()
Switch milliseconds from round to rest and back.
Definition: boxingtimer.cpp:95
+
void updateRemainingMilliseconds()
Switch milliseconds from round to rest and back.
Definition: boxingtimer.cpp:101
Handle settings about timer. Can save, load and delete a specific preset.
Definition: boxingsettings.h:19
-
Boxing timer class.
Definition: boxingtimer.h:26
+
Boxing timer class.
Definition: boxingtimer.h:27
void remainingTimeToStringChanged()
-
const QString getPreset()
Definition: boxingtimer.cpp:22
+
const QString getPreset()
Definition: boxingtimer.cpp:26
diff --git a/documentation/html/class_boxing_settings-members.html b/documentation/html/class_boxing_settings-members.html index 24c133e..097937b 100644 --- a/documentation/html/class_boxing_settings-members.html +++ b/documentation/html/class_boxing_settings-members.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
diff --git a/documentation/html/class_boxing_settings.html b/documentation/html/class_boxing_settings.html index 29da44d..598154a 100644 --- a/documentation/html/class_boxing_settings.html +++ b/documentation/html/class_boxing_settings.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
diff --git a/documentation/html/class_boxing_timer-members.html b/documentation/html/class_boxing_timer-members.html index e011910..310ab2e 100644 --- a/documentation/html/class_boxing_timer-members.html +++ b/documentation/html/class_boxing_timer-members.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
diff --git a/documentation/html/class_boxing_timer.html b/documentation/html/class_boxing_timer.html index 1779373..0a7029e 100644 --- a/documentation/html/class_boxing_timer.html +++ b/documentation/html/class_boxing_timer.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
diff --git a/documentation/html/classes.html b/documentation/html/classes.html index 0ed3111..9c0b7b5 100644 --- a/documentation/html/classes.html +++ b/documentation/html/classes.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
diff --git a/documentation/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html b/documentation/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html index 821165b..34776fa 100644 --- a/documentation/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html +++ b/documentation/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
diff --git a/documentation/html/files.html b/documentation/html/files.html index af6274f..413c0e1 100644 --- a/documentation/html/files.html +++ b/documentation/html/files.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
diff --git a/documentation/html/functions.html b/documentation/html/functions.html index 5398cab..35c6912 100644 --- a/documentation/html/functions.html +++ b/documentation/html/functions.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
diff --git a/documentation/html/functions_enum.html b/documentation/html/functions_enum.html index 1db1973..0808e36 100644 --- a/documentation/html/functions_enum.html +++ b/documentation/html/functions_enum.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
diff --git a/documentation/html/functions_func.html b/documentation/html/functions_func.html index 885febd..3e54561 100644 --- a/documentation/html/functions_func.html +++ b/documentation/html/functions_func.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
diff --git a/documentation/html/globals.html b/documentation/html/globals.html index bcb6e70..9831fe6 100644 --- a/documentation/html/globals.html +++ b/documentation/html/globals.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
diff --git a/documentation/html/globals_func.html b/documentation/html/globals_func.html index 42e7ed0..770d8c5 100644 --- a/documentation/html/globals_func.html +++ b/documentation/html/globals_func.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
diff --git a/documentation/html/group___q_m_l.html b/documentation/html/group___q_m_l.html index 47811c1..c71bc5f 100644 --- a/documentation/html/group___q_m_l.html +++ b/documentation/html/group___q_m_l.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
diff --git a/documentation/html/harbour-boxing-timer_8cpp.html b/documentation/html/harbour-boxing-timer_8cpp.html index 750109a..52b9bb5 100644 --- a/documentation/html/harbour-boxing-timer_8cpp.html +++ b/documentation/html/harbour-boxing-timer_8cpp.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
diff --git a/documentation/html/hierarchy.html b/documentation/html/hierarchy.html index 4e3c377..5280d10 100644 --- a/documentation/html/hierarchy.html +++ b/documentation/html/hierarchy.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
diff --git a/documentation/html/index.html b/documentation/html/index.html index 366ae7f..00bf4c9 100644 --- a/documentation/html/index.html +++ b/documentation/html/index.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
diff --git a/documentation/html/modules.html b/documentation/html/modules.html index 3a064a9..e453e3d 100644 --- a/documentation/html/modules.html +++ b/documentation/html/modules.html @@ -22,7 +22,7 @@
Boxing Timer -  1.0 +  0.1a
diff --git a/documentation/html/search/all_9.js b/documentation/html/search/all_9.js index 58e9c7b..59da41a 100644 --- a/documentation/html/search/all_9.js +++ b/documentation/html/search/all_9.js @@ -9,5 +9,5 @@ var searchData= ['start',['start',['../class_boxing_timer.html#a64ae1d3a8bfe52b225658bf4121dcdfa',1,'BoxingTimer::start(const int &milliseconds)'],['../class_boxing_timer.html#af2a4f0a0658b3685b2e0bcd965dca558aa6122a65eaa676f700ae68d393054a37',1,'BoxingTimer::Start()']]], ['status',['Status',['../class_boxing_timer.html#af2a4f0a0658b3685b2e0bcd965dca558',1,'BoxingTimer']]], ['statuschanged',['statusChanged',['../class_boxing_timer.html#ab3d16c454a2fac620bb84721c105485a',1,'BoxingTimer']]], - ['stop',['Stop',['../class_boxing_timer.html#af2a4f0a0658b3685b2e0bcd965dca558a11a755d598c0c417f9a36758c3da7481',1,'BoxingTimer::Stop()'],['../class_boxing_timer.html#aa294afc288608f91eb00d1680db67738',1,'BoxingTimer::stop()']]] + ['stop',['stop',['../class_boxing_timer.html#aa294afc288608f91eb00d1680db67738',1,'BoxingTimer::stop()'],['../class_boxing_timer.html#af2a4f0a0658b3685b2e0bcd965dca558a11a755d598c0c417f9a36758c3da7481',1,'BoxingTimer::Stop()']]] ]; diff --git a/documentation/latex/boxingtimer_8cpp.tex b/documentation/latex/boxingtimer_8cpp.tex index dbcad2f..4dd64a5 100644 --- a/documentation/latex/boxingtimer_8cpp.tex +++ b/documentation/latex/boxingtimer_8cpp.tex @@ -3,5 +3,6 @@ {\ttfamily \#include $<$Q\+Object$>$}\newline {\ttfamily \#include $<$Q\+Time$>$}\newline {\ttfamily \#include $<$Q\+Settings$>$}\newline +{\ttfamily \#include $<$Q\+Sound$>$}\newline {\ttfamily \#include \char`\"{}boxingtimer.\+h\char`\"{}}\newline {\ttfamily \#include \char`\"{}boxingsettings.\+h\char`\"{}}\newline diff --git a/documentation/latex/class_boxing_settings.pdf b/documentation/latex/class_boxing_settings.pdf index 8cb4428..f4f178d 100644 Binary files a/documentation/latex/class_boxing_settings.pdf and b/documentation/latex/class_boxing_settings.pdf differ diff --git a/documentation/latex/class_boxing_timer.pdf b/documentation/latex/class_boxing_timer.pdf index 854582e..b14228f 100644 Binary files a/documentation/latex/class_boxing_timer.pdf and b/documentation/latex/class_boxing_timer.pdf differ diff --git a/documentation/latex/refman.tex b/documentation/latex/refman.tex index f1d8e46..3014e0d 100644 --- a/documentation/latex/refman.tex +++ b/documentation/latex/refman.tex @@ -125,7 +125,7 @@ \begin{titlepage} \vspace*{7cm} \begin{center}% -{\Large Boxing Timer \\[1ex]\large 1.\+0 }\\ +{\Large Boxing Timer \\[1ex]\large 0.\+1a }\\ \vspace*{1cm} {\large Generated by Doxygen 1.8.13}\\ \end{center} diff --git a/qml/cover/CoverPage.qml b/qml/cover/CoverPage.qml index 73f6a53..f0fa848 100644 --- a/qml/cover/CoverPage.qml +++ b/qml/cover/CoverPage.qml @@ -48,7 +48,9 @@ CoverBackground { font.pixelSize: Theme.fontSizeHuge text: boxingTimer.remainingTimeToString - color: boxingTimer.status === BoxingTimer.Rest ? Theme.secondaryColor : Theme.primaryColor + color: boxingTimer.status === BoxingTimer.Rest ? + Theme.secondaryColor : + Theme.primaryColor } Item { width: 25; height: 25 } diff --git a/qml/harbour-boxing-timer.qml b/qml/harbour-boxing-timer.qml index 30227b4..6e0cd16 100644 --- a/qml/harbour-boxing-timer.qml +++ b/qml/harbour-boxing-timer.qml @@ -31,6 +31,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import Pw.Unitoo.Backend 1.0 + import "pages" ApplicationWindow { diff --git a/qml/pages/PresetList.qml b/qml/pages/PresetList.qml index 2054c0c..5b5d258 100644 --- a/qml/pages/PresetList.qml +++ b/qml/pages/PresetList.qml @@ -53,7 +53,9 @@ Page { Label { text: name - color: highlighted ? Theme.highlightColor : Theme.primaryColor + color: highlighted ? + Theme.highlightColor : + Theme.primaryColor anchors { left: parent.left diff --git a/qml/pages/SettingsPage.qml b/qml/pages/SettingsPage.qml index 92fd4b0..0a7c4e3 100644 --- a/qml/pages/SettingsPage.qml +++ b/qml/pages/SettingsPage.qml @@ -101,7 +101,9 @@ Page { width: parent.width - minimumValue: Converter.sToMs(30); maximumValue: Converter.sToMs(300); stepSize: Converter.sToMs(10) + minimumValue: Converter.sToMs(30) + maximumValue: Converter.sToMs(300) + stepSize: Converter.sToMs(10) value: mRoundMs valueText: Converter.msToTime(value) diff --git a/qml/pages/TimerPage.qml b/qml/pages/TimerPage.qml index 234e7aa..272356f 100644 --- a/qml/pages/TimerPage.qml +++ b/qml/pages/TimerPage.qml @@ -31,6 +31,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import Pw.Unitoo.Backend 1.0 + import "js/helpers.js" as Helper Page { @@ -85,7 +86,9 @@ Page { font.pixelSize: Theme.fontSizeHuge * 3.3 text: boxingTimer.remainingTimeToString - color: boxingTimer.status == BoxingTimer.Rest ? Theme.secondaryColor : Theme.primaryColor + color: boxingTimer.status == BoxingTimer.Rest ? + Theme.secondaryColor : + Theme.primaryColor } Button { diff --git a/rpm/harbour-boxing-timer.changes b/rpm/harbour-boxing-timer.changes index b8e9abf..34fceae 100644 --- a/rpm/harbour-boxing-timer.changes +++ b/rpm/harbour-boxing-timer.changes @@ -8,5 +8,5 @@ # * date Author's Name version-release # - Summary of changes -* Thu Jul 17 2017 Claudio Maradonna 0.1a +* Thu Aug 24 2017 Claudio Maradonna 0.1a - Initial release diff --git a/rpm/harbour-boxing-timer.spec b/rpm/harbour-boxing-timer.spec index 93ccbf5..7e47705 100644 --- a/rpm/harbour-boxing-timer.spec +++ b/rpm/harbour-boxing-timer.spec @@ -17,7 +17,7 @@ Version: 0.1a Release: 1 Group: Applications/Multimedia License: GPLv3 -URL: http://example.org/ +URL: https://github.com/UnitooTeam/harbour-boxing-timer Source0: %{name}-%{version}.tar.bz2 Source100: harbour-boxing-timer.yaml Requires: sailfishsilica-qt5 >= 0.10.9 diff --git a/rpm/harbour-boxing-timer.yaml b/rpm/harbour-boxing-timer.yaml index b5252de..010dbb1 100644 --- a/rpm/harbour-boxing-timer.yaml +++ b/rpm/harbour-boxing-timer.yaml @@ -5,7 +5,7 @@ Release: 1 # The contents of the Group field should be one of the groups listed here: # http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS Group: Applications/Multimedia -URL: http://example.org/ +URL: https://github.com/UnitooTeam/harbour-boxing-timer License: GPLv3 # This must be generated before uploading a package to a remote build service. # Usually this line does not need to be modified. diff --git a/src/boxingtimer.h b/src/boxingtimer.h index b5c186e..d361481 100644 --- a/src/boxingtimer.h +++ b/src/boxingtimer.h @@ -162,6 +162,11 @@ class BoxingTimer : public QTimer { QSound *restBell; QSound *stopBell; + /** + * @fn void songsBell() + * + * @brief Play the bell check actual status + */ void songsBell(); Status mStatus;