Release 0.1 + a fix

diff --git a/src/06capemaycloser_modifiedlouder.mp3 b/src/06capemaycloser_modifiedlouder.mp3
new file mode 100644 (file)
index 0000000..432fb57
Binary files /dev/null and b/src/06capemaycloser_modifiedlouder.mp3 differ

diff --git a/src/KA_icon64.png b/src/KA_icon64.png
new file mode 100644 (file)
index 0000000..3a8f466
Binary files /dev/null and b/src/KA_icon64.png differ

diff --git a/src/alertsound.cpp b/src/alertsound.cpp
index fcaefa4..94470b0 100644 (file)
--- a/src/alertsound.cpp
+++ b/src/alertsound.cpp
@@ -33,12 +33,12 @@ AlertSound::AlertSound(QObject *parent) :
     QObject(parent)
 {
 
-    defaultsound_ = ":/defaultsound";
+    defaultsound_ = "/opt/KitchenAlert/06capemaycloser_modifiedlouder.mp3";
     QString filename;
 
     QSettings settings("KitchenAlert","KitchenAlert");
 
-    settings.clear(); //REMOVE THIS AFTER TESTING!!!!!!
+   // settings.clear(); //REMOVE THIS AFTER TESTING!!!!!!
 
     bool useDefaultSound = settings.value("UseDefaultSound",true).toBool();
     qDebug() << "In AlertSound constructor UseDefaultSound is " << useDefaultSound;

diff --git a/src/alertsound.h b/src/alertsound.h
index b36cc38..19f4a59 100644 (file)
--- a/src/alertsound.h
+++ b/src/alertsound.h
@@ -37,8 +37,8 @@
 /*! Class for playing the alert sound'
 
   @author Heli Hyvättinen
-  @date 2010-06-26
-  @version 0.09
+  @date 2010-07-20
+  @version 0.1
 
 Class for playing (and stopping) the alert sound.
 

diff --git a/src/createtimersequencedialog.h b/src/createtimersequencedialog.h
index 3e93f36..4765387 100644 (file)
--- a/src/createtimersequencedialog.h
+++ b/src/createtimersequencedialog.h
@@ -39,8 +39,8 @@ namespace Ui {
 /*! Class for the dialog for creating timers'
 
   @author Heli Hyvättinen
-  @date 2010-06-26
-  @version 0.09
+  @date 2010-07-20
+  @version 0.1
 
 Class for the dialog for creating timers
 

diff --git a/src/createtimersequencedialog.ui b/src/createtimersequencedialog.ui
index 3675ff7..6d97a4c 100644 (file)
--- a/src/createtimersequencedialog.ui
+++ b/src/createtimersequencedialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Create timer (sequence)</string>
+   <string>KitchenAlert - Create timer </string>
   </property>
   <widget class="QWidget" name="verticalLayoutWidget">
    <property name="geometry">

diff --git a/src/currentalertstablemodel.h b/src/currentalertstablemodel.h
index 9751671..062bc11 100644 (file)
--- 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 2010-06-26
-  @version 0.09
+  @date 2010-07-20
+  @version 0.1
 
 Class that contains the model that holds the timers
 

diff --git a/src/kitchenalert.desktop b/src/kitchenalert.desktop
new file mode 100644 (file)
index 0000000..1b14e2d
--- /dev/null
+++ b/src/kitchenalert.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Name=KitchenAlert
+Exec=/usr/bin/KitchenAlert
+Icon=KA_icon64
+Categories=Utility;
+X-Window-Icon=KA_icon64
+X-Osso-Type=application/x-executable
+Comment=Timer application with multiple timers

diff --git a/src/kitchenalertmainwindow.cpp b/src/kitchenalertmainwindow.cpp
index 2579155..bd1c1f2 100644 (file)
--- a/src/kitchenalertmainwindow.cpp
+++ b/src/kitchenalertmainwindow.cpp
@@ -260,10 +260,10 @@ void KitchenAlertMainWindow::openSelectSoundDialog()
 
 void KitchenAlertMainWindow::openAbout()
 {
-    QMessageBox::about(this,tr("About KitchenAlert"),tr("<p>Version 0.09"
+    QMessageBox::about(this,tr("About KitchenAlert"),tr("<p>Version 0.1"
                                                         "<p>Copyright &copy; Heli Hyv&auml;ttinen 2010"
                                                          "<p>License: General Public License v3"
-                                                         "<p>Bugtracker: https://garage.maemo.org/projects/kitchenalert/"));
+                                                         "<p>Bugtracker and project page: https://garage.maemo.org/projects/kitchenalert/"));
 }
 
 bool KitchenAlertMainWindow::event(QEvent *event)

diff --git a/src/kitchenalertmainwindow.h b/src/kitchenalertmainwindow.h
index 4b0e5be..cf151f0 100644 (file)
--- a/src/kitchenalertmainwindow.h
+++ b/src/kitchenalertmainwindow.h
@@ -40,8 +40,8 @@ namespace Ui {
 /*! The main window class of KitchenAlert'
 
   @author Heli Hyvättinen
-  @date 2010-06-26
-  @version 0.09
+  @date 2010-07-20
+  @version 0.1
 
 Operates the UI.
 

diff --git a/src/kitchenalertmainwindow.ui b/src/kitchenalertmainwindow.ui
index a8d78e9..4cb1893 100644 (file)
--- a/src/kitchenalertmainwindow.ui
+++ b/src/kitchenalertmainwindow.ui
@@ -91,7 +91,7 @@
          <item>
           <widget class="QPushButton" name="CreateNewScheduleButton">
            <property name="text">
-            <string>New timer schedule</string>
+            <string>New timer</string>
            </property>
           </widget>
          </item>

diff --git a/src/selectsounddialog.h b/src/selectsounddialog.h
index 6e7c77f..818d3e5 100644 (file)
--- a/src/selectsounddialog.h
+++ b/src/selectsounddialog.h
@@ -33,6 +33,16 @@ namespace Ui {
     class SelectSoundDialog;
 }
 
+/*! The class for sound selection dialog of KitchenAlert'
+
+  @author Heli Hyvättinen
+  @date 2010-07-20
+  @version 0.1
+
+The class for sound selection dialog in KitchenAlert.
+
+*/
+
 class SelectSoundDialog : public QDialog
 {
     Q_OBJECT

diff --git a/src/selectsounddialog.ui b/src/selectsounddialog.ui
index 4ecdba3..0104637 100644 (file)
--- a/src/selectsounddialog.ui
+++ b/src/selectsounddialog.ui
@@ -59,8 +59,8 @@
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-family:'Sans Serif'; font-size:16pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; font-weight:600;">Warning:</span><span style=" font-size:9pt;"> choosing a sound file inside the "N900" folder will prevent mounting it outside the device when KitchenAlert is running and the sound from playing if the folder has been mounted out before starting KitchenAlert.</span></p>
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Warning:&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt; choosing a sound file inside the &amp;quot;N900&amp;quot; folder will prevent mounting it outside the device when KitchenAlert is running and the sound from playing if the folder has been mounted out before starting KitchenAlert.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
       </property>
      </widget>
     </item>

diff --git a/src/src.pro b/src/src.pro
new file mode 100644 (file)
index 0000000..96f4059
--- /dev/null
+++ b/src/src.pro
@@ -0,0 +1,76 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2010-05-25T15:17:43
+#
+#-------------------------------------------------
+
+QT       += core gui
+QT      += phonon
+
+TARGET = KitchenAlert
+TEMPLATE = app
+
+
+SOURCES += main.cpp\
+        kitchenalertmainwindow.cpp \
+    createtimersequencedialog.cpp \
+    timer.cpp \
+    currentalertstablemodel.cpp \
+    alertsound.cpp \
+    selectsounddialog.cpp
+
+HEADERS  += kitchenalertmainwindow.h \
+    createtimersequencedialog.h \
+    timer.h \
+    currentalertstablemodel.h \
+    alertsound.h \
+    selectsounddialog.h
+
+FORMS    += kitchenalertmainwindow.ui \
+    createtimersequencedialog.ui \
+    selectsounddialog.ui \
+    kitchenalertmainwindow.ui
+
+
+symbian {
+    TARGET.UID3 = 0xe1020059
+    # TARGET.CAPABILITY += 
+    TARGET.EPOCSTACKSIZE = 0x14000
+    TARGET.EPOCHEAPSIZE = 0x020000 0x800000
+}
+
+
+unix {
+  #VARIABLES
+  isEmpty(PREFIX) {
+    PREFIX = /usr/local
+  }
+  BINDIR = $$PREFIX/bin
+  DATADIR =$$PREFIX/share
+
+  DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\"
+
+  #MAKE INSTALL
+
+  INSTALLS += target desktop service iconxpm icon26 icon48 icon64
+
+  target.path =$$BINDIR
+
+  desktop.path = $$DATADIR/applications/hildon
+  desktop.files += $${TARGET}.desktop
+
+  service.path = $$DATADIR/dbus-1/services
+  service.files += $${TARGET}.service
+
+  iconxpm.path = $$DATADIR/pixmap
+  iconxpm.files += ../data/maemo/$${TARGET}.xpm
+
+  icon26.path = $$DATADIR/icons/hicolor/26x26/apps
+  icon26.files += ../data/26x26/$${TARGET}.png
+
+  icon48.path = $$DATADIR/icons/hicolor/48x48/apps
+  icon48.files += ../data/48x48/$${TARGET}.png
+
+  icon64.path = $$DATADIR/icons/hicolor/64x64/apps
+  icon64.files += ../data/64x64/$${TARGET}.png
+}

diff --git a/src/src.pro.user b/src/src.pro.user
new file mode 100644 (file)
index 0000000..399ab95
--- /dev/null
+++ b/src/src.pro.user
@@ -0,0 +1,160 @@
+<!DOCTYPE QtCreatorProject>
+<qtcreator>
+ <data>
+  <variable>RunConfiguration0-BaseEnvironmentBase</variable>
+  <value type="int">2</value>
+ </data>
+ <data>
+  <variable>RunConfiguration0-CommandLineArguments</variable>
+  <valuelist type="QVariantList"/>
+ </data>
+ <data>
+  <variable>RunConfiguration0-ProFile</variable>
+  <value type="QString">src.pro</value>
+ </data>
+ <data>
+  <variable>RunConfiguration0-RunConfiguration.name</variable>
+  <value type="QString">src</value>
+ </data>
+ <data>
+  <variable>RunConfiguration0-UseDyldImageSuffix</variable>
+  <value type="bool">false</value>
+ </data>
+ <data>
+  <variable>RunConfiguration0-UseTerminal</variable>
+  <value type="bool">false</value>
+ </data>
+ <data>
+  <variable>RunConfiguration0-UserEnvironmentChanges</variable>
+  <valuelist type="QVariantList"/>
+ </data>
+ <data>
+  <variable>RunConfiguration0-UserSetName</variable>
+  <value type="bool">false</value>
+ </data>
+ <data>
+  <variable>RunConfiguration0-UserSetWorkingDirectory</variable>
+  <value type="bool">false</value>
+ </data>
+ <data>
+  <variable>RunConfiguration0-UserWorkingDirectory</variable>
+  <value type="QString"></value>
+ </data>
+ <data>
+  <variable>RunConfiguration0-type</variable>
+  <value type="QString">Qt4ProjectManager.Qt4RunConfiguration</value>
+ </data>
+ <data>
+  <variable>activeRunConfiguration</variable>
+  <value type="int">0</value>
+ </data>
+ <data>
+  <variable>activebuildconfiguration</variable>
+  <value type="QString">Debug</value>
+ </data>
+ <data>
+  <variable>buildConfiguration-Debug</variable>
+  <valuemap type="QVariantMap">
+   <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value>
+   <value key="QtVersionId" type="int">0</value>
+   <value key="ToolChain" type="int">0</value>
+   <value key="buildConfiguration" type="int">2</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>buildConfiguration-Release</variable>
+  <valuemap type="QVariantMap">
+   <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value>
+   <value key="QtVersionId" type="int">0</value>
+   <value key="buildConfiguration" type="int">0</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>buildconfiguration-Debug-buildstep0</variable>
+  <valuemap type="QVariantMap">
+   <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>buildconfiguration-Debug-buildstep1</variable>
+  <valuemap type="QVariantMap">
+   <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>buildconfiguration-Debug-cleanstep0</variable>
+  <valuemap type="QVariantMap">
+   <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value>
+   <value key="cleanConfig" type="bool">true</value>
+   <valuelist key="makeargs" type="QVariantList">
+    <value type="QString">clean</value>
+   </valuelist>
+  </valuemap>
+ </data>
+ <data>
+  <variable>buildconfiguration-Release-buildstep0</variable>
+  <valuemap type="QVariantMap">
+   <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>buildconfiguration-Release-buildstep1</variable>
+  <valuemap type="QVariantMap">
+   <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>buildconfiguration-Release-cleanstep0</variable>
+  <valuemap type="QVariantMap">
+   <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>buildconfigurations</variable>
+  <valuelist type="QVariantList">
+   <value type="QString">Debug</value>
+   <value type="QString">Release</value>
+  </valuelist>
+ </data>
+ <data>
+  <variable>buildstep0</variable>
+  <valuemap type="QVariantMap">
+   <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value>
+   <value key="mkspec" type="QString"></value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>buildstep1</variable>
+  <valuemap type="QVariantMap">
+   <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>buildsteps</variable>
+  <valuelist type="QVariantList">
+   <value type="QString">trolltech.qt4projectmanager.qmake</value>
+   <value type="QString">trolltech.qt4projectmanager.make</value>
+  </valuelist>
+ </data>
+ <data>
+  <variable>cleanstep0</variable>
+  <valuemap type="QVariantMap">
+   <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value>
+   <value key="clean" type="bool">true</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>cleansteps</variable>
+  <valuelist type="QVariantList">
+   <value type="QString">trolltech.qt4projectmanager.make</value>
+  </valuelist>
+ </data>
+ <data>
+  <variable>defaultFileEncoding</variable>
+  <value type="QByteArray">System</value>
+ </data>
+ <data>
+  <variable>project</variable>
+  <valuemap type="QVariantMap"/>
+ </data>
+</qtcreator>

diff --git a/src/timer.h b/src/timer.h
index 26c6f6a..abe6666 100644 (file)
--- a/src/timer.h
+++ b/src/timer.h
@@ -39,8 +39,8 @@
 /*! The timer class of KitchenAlert'
 
   @author Heli Hyvättinen
-  @date 2010-06-26
-  @version 0.09
+  @date 2010-07-20
+  @version 0.1
 
 The timer class of KitchenAlert.