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 @@
-
Go to the documentation of this file. 56 Q_INVOKABLE
void loadPreset(
const QString &preset);
149 void start(
const int &milliseconds);
154 int mRoundsMilliseconds;
155 int mRemainingMilliseconds;
157 void setRemainingMilliseconds(
const int &milliseconds);
158 void setRound(
const int &round);
183 #endif // BOXINGTIMER_H
-
BoxingTimer()
Default constructor.
Definition: boxingtimer.cpp:8
+
Go to the documentation of this file. 57 Q_INVOKABLE
void loadPreset(
const QString &preset);
150 void start(
const int &milliseconds);
155 int mRoundsMilliseconds;
156 int mRemainingMilliseconds;
158 void setRemainingMilliseconds(
const int &milliseconds);
159 void setRound(
const int &round);
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 roundsToStringChanged()
-
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 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;