Version 0.2.1

diff --git a/debian/changelog b/debian/changelog
index b1a5f0d..d305d25 100755 (executable)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kitchenalert (0.2.1-1) unstable; urgency=low
+
+  * restored the ability to change the alert sound when there are no alerts in the list (closes #6857)
+  * uses QtMultimedia instead of Phonon (this time for real)
+
+ -- Heli Hyvättinen <heli.hyvattinen@kymp.net>  Tue, 29 Mar 2011 21:09:03 +0300
+
 kitchenalert (0.2.0-1) unstable; urgency=low
 
   * finger-friendlier alert list

diff --git a/debian/control b/debian/control
index 595d48b..75480a6 100755 (executable)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: kitchenalert
 Priority: extra
 Section: user/utilities
 Maintainer: Heli Hyvättinen <heli.hyvattinen@kymp.net>
-Build-Depends: debhelper (>= 7), libqt4-dev
+Build-Depends: debhelper (>= 7), libqt4-dev, libqtm-dev
 Standards-Version: 3.8.3
 Homepage: http://kitchenalert.garage.maemo.org/
 
@@ -21,9 +21,7 @@ XB-Maemo-Upgrade-Description: Timer application with multiple timers
  NOTE: Does not alert during phone calls. Obeys the volume setting of the device. Testing the needed volume in the location the device will be kept is highly recommended before using the application for a real alert.
  Pulseaudio (i.e. the sound system) will be restarted during the install.
  New in this version:
- Improved, finger-friendlier user interface.
- Timers can now be removed from the list.
- Bugfixes.  
+ Bugfix: restored the ability to change the alert sound when there are no alerts in the list  
 XB-Maemo-Display-Name: KitchenAlert
 XB-Maemo-Icon-26:
  iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c

diff --git a/src/alertsound.cpp b/src/alertsound.cpp
index 1eb0f22..f27eb50 100644 (file)
--- a/src/alertsound.cpp
+++ b/src/alertsound.cpp
@@ -1,7 +1,7 @@
 /**************************************************************************
-        This file is part of KitchenAlert v.0.09
+        This file is part of KitchenAlert
 
-        Copyright (C) 2010  Heli Hyvättinen
+        Copyright (C) 2010-2011  Heli Hyvättinen
 
         Kitchen Alert is free software: you can redistribute it and/or modify
         it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@ AlertSound::AlertSound(QObject *parent) :
     QObject(parent)
 {
 
-    defaultsound_ = "/home/opt/KitchenAlert/Doorbell-old-tring-modified-multiplied-low-quality.mp3";
+    defaultsound_ = "/home/opt/KitchenAlert/DoorbellModifiedFinal.mp3";
     QString filename;
 
     QSettings settings("KitchenAlert","KitchenAlert");
@@ -57,20 +57,6 @@ AlertSound::AlertSound(QObject *parent) :
 
       pSound_ = new QMediaPlayer;
       pSound_->setMedia(QUrl::fromLocalFile(filename));
- //   player->setVolume(50);
-
-
-/* NOTE:
-   sound priorities are set in /usr/share/policy/etc/current/pulse/xpolicy.conf
-
-This block needs to be appended to this file in the postinstall script
-[stream]
-exe = kitchenalert
-group   = alarm
-
-*/
-
-
 }
 
 AlertSound::~AlertSound()

diff --git a/src/alertsound.h b/src/alertsound.h
index eafcfbd..6e7dec2 100755 (executable)
--- a/src/alertsound.h
+++ b/src/alertsound.h
@@ -1,7 +1,7 @@
 /**************************************************************************
         KitchenAlert
 
-        Copyright (C) 2010  Heli Hyvättinen
+        Copyright (C) 2010-2011  Heli Hyvättinen
 
         This file is part of KitchenAlert.
 
@@ -35,8 +35,8 @@
 /*! Class for playing the alert sound'
 
   @author Heli Hyvättinen
-  @date 2011-02-10
-  @version 0.2.0
+  @date 2011-03-29
+  @version 0.2.1
 
 Class for playing (and stopping) the alert sound.
 

diff --git a/src/createtimersequencedialog.cpp b/src/createtimersequencedialog.cpp
index d7b696c..de8a606 100644 (file)
--- a/src/createtimersequencedialog.cpp
+++ b/src/createtimersequencedialog.cpp
@@ -1,7 +1,7 @@
 /**************************************************************************
         KitchenAlert
 
-        Copyright (C) 2010  Heli Hyvättinen
+        Copyright (C) 2010-2011  Heli Hyvättinen
 
         This file is part of KitchenAlert.
 

diff --git a/src/createtimersequencedialog.h b/src/createtimersequencedialog.h
index 4765387..d1d4f25 100644 (file)
--- a/src/createtimersequencedialog.h
+++ b/src/createtimersequencedialog.h
@@ -1,7 +1,7 @@
 /**************************************************************************
         KitchenAlert
 
-        Copyright (C) 2010  Heli Hyvättinen
+        Copyright (C) 2010-2011 Heli Hyvättinen
 
         This file is part of KitchenAlert.
 
@@ -39,8 +39,8 @@ namespace Ui {
 /*! Class for the dialog for creating timers'
 
   @author Heli Hyvättinen
-  @date 2010-07-20
-  @version 0.1
+  @date 2011-03-29
+  @version 0.2.1
 
 Class for the dialog for creating timers
 

diff --git a/src/currentalertstablemodel.cpp b/src/currentalertstablemodel.cpp
index b7afc18..9913288 100644 (file)
--- a/src/currentalertstablemodel.cpp
+++ b/src/currentalertstablemodel.cpp
@@ -1,7 +1,7 @@
 /**************************************************************************
         KitchenAlert
 
-        Copyright (C) 2010  Heli Hyvättinen
+        Copyright (C) 2010-2011  Heli Hyvättinen
 
         This file is part of KitchenAlert.
 

diff --git a/src/currentalertstablemodel.h b/src/currentalertstablemodel.h
index 0d4bb08..8f4622a 100755 (executable)
--- a/src/currentalertstablemodel.h
+++ b/src/currentalertstablemodel.h
@@ -35,8 +35,8 @@
 /*! Class that contains the model that holds the timers'
 
   @author Heli Hyvättinen
-  @date 2011-02-10
-  @version 0.2.0
+  @date 2011-03-29
+  @version 0.2.1
 
 Class that contains the model that holds the timers
 

diff --git a/src/kitchenalertmainwindow.h b/src/kitchenalertmainwindow.h
index cfe7938..a9e86a6 100644 (file)
--- a/src/kitchenalertmainwindow.h
+++ b/src/kitchenalertmainwindow.h
@@ -1,7 +1,7 @@
 /**************************************************************************
         KitchenAlert
 
-        Copyright (C) 2010  Heli Hyvättinen
+        Copyright (C) 2010-2011  Heli Hyvättinen
 
         This file is part of KitchenAlert.
 
@@ -40,8 +40,8 @@ namespace Ui {
 /*! The main window class of KitchenAlert'
 
   @author Heli Hyvättinen
-  @date 2011-02-10
-  @version 0.2.0
+  @date 2011-03-29
+  @version 0.2.1
 
 Operates the UI.
 

diff --git a/src/selectsounddialog.cpp b/src/selectsounddialog.cpp
index 01896e0..b23f961 100644 (file)
--- a/src/selectsounddialog.cpp
+++ b/src/selectsounddialog.cpp
@@ -1,7 +1,7 @@
 /**************************************************************************
         KitchenAlert
 
-        Copyright (C) 2010  Heli Hyvättinen
+        Copyright (C) 2010-2011  Heli Hyvättinen
         
         This file is part of KitchenAlert.
 

diff --git a/src/selectsounddialog.h b/src/selectsounddialog.h
index 818d3e5..f6b13eb 100644 (file)
--- a/src/selectsounddialog.h
+++ b/src/selectsounddialog.h
@@ -1,7 +1,7 @@
 /**************************************************************************
         KitchenAlert
 
-        Copyright (C) 2010  Heli Hyvättinen
+        Copyright (C) 2010-2011  Heli Hyvättinen
         
         This file is part of KitchenAlert.
 
@@ -36,8 +36,8 @@ namespace Ui {
 /*! The class for sound selection dialog of KitchenAlert'
 
   @author Heli Hyvättinen
-  @date 2010-07-20
-  @version 0.1
+  @date 2011-03-29
+  @version 0.2.1
 
 The class for sound selection dialog in KitchenAlert.
 

diff --git a/src/timer.cpp b/src/timer.cpp
index 0b801a1..efe8af9 100644 (file)
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -1,7 +1,7 @@
 /**************************************************************************
         KitchenAlert
 
-        Copyright (C) 2010  Heli Hyvättinen
+        Copyright (C) 2010-2011  Heli Hyvättinen
 
         This file is part of KitchenAlert.
 

diff --git a/src/timer.h b/src/timer.h
index 98d50a5..061475d 100644 (file)
--- a/src/timer.h
+++ b/src/timer.h
@@ -1,7 +1,7 @@
 /**************************************************************************
         KitchenAlert
 
-        Copyright (C) 2010  Heli Hyvättinen
+        Copyright (C) 2010-2011  Heli Hyvättinen
 
         This file is part of KitchenAlert.
 
@@ -40,7 +40,7 @@
 
   @author Heli Hyvättinen
   @date 2011-02-10
-  @version 0.2.0
+  @version 0.2.1
 
 The timer class of KitchenAlert.