From 4083d09bc91ad6ee015de056a03936ac294902bd Mon Sep 17 00:00:00 2001 From: Claudio Maradonna Date: Wed, 6 Sep 2017 16:54:58 +0200 Subject: [PATCH] Fixed BUG with preset's deleting. Fixed about page --- qml/pages/AboutPage.qml | 2 +- qml/pages/PresetList.qml | 23 ++++++++++++++++------- rpm/harbour-boxing-timer.changes | 7 +++++-- rpm/harbour-boxing-timer.spec | 2 +- rpm/harbour-boxing-timer.yaml | 2 +- 5 files changed, 24 insertions(+), 12 deletions(-) diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml index caed60d..a280c3d 100644 --- a/qml/pages/AboutPage.qml +++ b/qml/pages/AboutPage.qml @@ -161,7 +161,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.

You should have received a copy of the GNU General Public License -along with this program. If not, see .


+along with this program. If not, see http://www.gnu.org/licenses.


All artworks are licensed under a
Creative Commons Attribution-ShareAlike 4.0 International diff --git a/qml/pages/PresetList.qml b/qml/pages/PresetList.qml index 43ec865..3051b43 100644 --- a/qml/pages/PresetList.qml +++ b/qml/pages/PresetList.qml @@ -29,8 +29,23 @@ Page { model: listModel delegate: ListItem { + id: listItem + width: parent.width + ListView.onRemove: animateRemoval(listItem) + function remove() { + remorseAction(qsTr("Deleting"), function() { + settings.deletePreset(presetsList.model.get(index).name) + + if (settings.presetsList().length < 1) { + pageStack.popAttached() + } else { + presetsList.model.remove(index) + } + }) + } + onClicked: { settings.preset = presetsList.model.get(index).name @@ -41,13 +56,7 @@ Page { MenuItem { text: qsTr("Delete") - onClicked: { - settings.deletePreset(presetsList.model.get(index).name) - - if (settings.presetsList().length < 1) { - pageStack.popAttached() - } - } + onClicked: remove() } } diff --git a/rpm/harbour-boxing-timer.changes b/rpm/harbour-boxing-timer.changes index 504d465..fee16b5 100644 --- a/rpm/harbour-boxing-timer.changes +++ b/rpm/harbour-boxing-timer.changes @@ -8,8 +8,11 @@ # * date Author's Name version-release # - Summary of changes -* Wed Aug 30 2017 Claudio Maradonna -1.0 +* Wed Sep 06 2017 Claudio Maradonna 1.0b +- Fixed bug with preset's deleting +- Fixed license in about page (cutted by html tag) + +* Wed Aug 30 2017 Claudio Maradonna 1.0 - Now you can add inner timers for rounds - New icon - Various bug fixes diff --git a/rpm/harbour-boxing-timer.spec b/rpm/harbour-boxing-timer.spec index 2c480bc..cabdb2a 100644 --- a/rpm/harbour-boxing-timer.spec +++ b/rpm/harbour-boxing-timer.spec @@ -13,7 +13,7 @@ Name: harbour-boxing-timer %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Boxing timer -Version: 1.0 +Version: 1.0b Release: 1 Group: Applications/Utilities License: GPLv3 diff --git a/rpm/harbour-boxing-timer.yaml b/rpm/harbour-boxing-timer.yaml index 47f8385..1b9f283 100644 --- a/rpm/harbour-boxing-timer.yaml +++ b/rpm/harbour-boxing-timer.yaml @@ -1,6 +1,6 @@ Name: harbour-boxing-timer Summary: Boxing timer -Version: 1.0 +Version: 1.0b 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