Event 'details' dialog now contains also 'favourite' and 'alarm'

buttons, so the user can set/unset the property directly from the dialog

diff --git a/src/gui/eventdialog.cpp b/src/gui/eventdialog.cpp
index 8d11d15dc411826bad35e92142126e302b73cf04..5202663e83c80982528f87fd8ddd38363a25ff2f 100644 (file)
--- a/src/gui/eventdialog.cpp
+++ b/src/gui/eventdialog.cpp
@@ -3,6 +3,10 @@
 
 #include <QScrollBar>
 
 
 #include <QScrollBar>
 

+#ifdef MAEMO
+#include <alarm.h>
+#endif
+

 DetailsContainer::DetailsContainer(QWidget *aParent)
     : QWidget(aParent)
 {
 DetailsContainer::DetailsContainer(QWidget *aParent)
     : QWidget(aParent)
 {


@@ -55,12 +59,81 @@ EventDialog::EventDialog(const int &aEventId, QWidget *aParent)
     showFullScreen();
 #endif
 
     showFullScreen();
 #endif
 

-    Event event = Event::getById(aEventId,AppSettings::confId());
+    Event event = Event::getById(mEventId,AppSettings::confId());

 
     title->setText(event.title());
     mDetails.setPersons(event.persons());
     mDetails.setAbstract(event.abstract());
     mDetails.setDescription(event.description());
     scrollArea->setWidget(&mDetails);
 
     title->setText(event.title());
     mDetails.setPersons(event.persons());
     mDetails.setAbstract(event.abstract());
     mDetails.setDescription(event.description());
     scrollArea->setWidget(&mDetails);

+
+    connect(favouriteButton, SIGNAL(clicked()), SLOT(favouriteClicked()));
+    connect(alarmButton, SIGNAL(clicked()), SLOT(alarmClicked()));
+
+    if(event.isFavourite())
+    {
+        favouriteButton->setIcon(QIcon(":/icons/favourite-onBig.png"));
+    }
+
+    if(event.hasAlarm())
+    {
+        alarmButton->setIcon(QIcon(":/icons/alarm-onBig.png"));
+    }
+}
+
+void EventDialog::favouriteClicked()
+{
+    Event event = Event::getById(mEventId,AppSettings::confId());
+
+    if(event.isFavourite())
+    {
+        event.setFavourite(false);
+        favouriteButton->setIcon(QIcon(":/icons/favourite-offBig.png"));
+    }
+    else
+    {
+        event.setFavourite(true);
+        favouriteButton->setIcon(QIcon(":/icons/favourite-onBig.png"));
+    }
+    event.update("favourite");
+    qDebug() << " FAVOURITE [" << event.id() << "] -> " << event.isFavourite();
+    // update EVENT_CONFLICT table
+    event.updateConflicts();
+    // since the Favourite icon has changed, update TreeViews accordingly
+    // all TreeViews have to listen on this signal
+    emit(eventHasChanged(event.id()));
+}
+
+void EventDialog::alarmClicked()
+{
+    Event event = Event::getById(mEventId,AppSettings::confId());
+
+    if(event.hasAlarm())
+    {
+        event.setHasAlarm(false); // update DB
+        alarmButton->setIcon(QIcon(":/icons/alarm-offBig.png"));
+#ifdef MAEMO
+        // remove alarm from the 'alarmd' alrms list
+        Alarm alarm;
+        alarm.deleteAlarm(event.id());
+        // TODO: test if removing was successfull
+#endif /* MAEMO */
+    }
+    else
+    {
+        event.setHasAlarm(true);
+        alarmButton->setIcon(QIcon(":/icons/alarm-onBig.png"));
+#ifdef MAEMO
+        // add alarm to the 'alarmd'
+        Alarm alarm;
+        int cookie = alarm.addAlarm(event.id(),QDateTime::currentDateTime().addSecs(10));
+        qDebug() << "cookie: " << cookie;
+#endif /* MAEMO */
+    }
+    event.update("alarm");
+    qDebug() << " ALARM [" << event.id() << "] -> " << event.hasAlarm();
+    // since the Alarm icon has changed, update TreeView accordingly
+    // all TreeViews have to listen on this signal
+    emit(eventHasChanged(event.id()));

 }
 
 }
 

diff --git a/src/gui/eventdialog.h b/src/gui/eventdialog.h
index 0616fda18d47c899403f8b4bc91b2697aea206f8..e9bb33250bd71ad98c2d68254a10d47cf545ff10 100644 (file)
--- a/src/gui/eventdialog.h
+++ b/src/gui/eventdialog.h
@@ -19,12 +19,17 @@ private:
     QLabel mDescription;
 };
 
     QLabel mDescription;
 };
 

-

 class EventDialog : public QDialog, Ui::EventDialog
 { 
 class EventDialog : public QDialog, Ui::EventDialog
 { 

+    Q_OBJECT

 public:
     EventDialog(const int &aEventId, QWidget *aParent = NULL);
     ~EventDialog() {}
 public:
     EventDialog(const int &aEventId, QWidget *aParent = NULL);
     ~EventDialog() {}

+private slots:
+    void favouriteClicked();
+    void alarmClicked();
+signals:
+    void eventHasChanged(int aEventId); // emited when user changes some event details, eg. sets it Favourite

 private:
     int mEventId;
     DetailsContainer mDetails;
 private:
     int mEventId;
     DetailsContainer mDetails;

diff --git a/src/gui/eventdialog.ui b/src/gui/eventdialog.ui
index 3610861c4c1e75f609c3e1ad0d1db64a6da3404f..fcc7f5c577ff32f7800a68a3cf761a0b6318093a 100644 (file)
--- a/src/gui/eventdialog.ui
+++ b/src/gui/eventdialog.ui
@@ -61,7 +61,7 @@
           <x>0</x>
           <y>0</y>
           <width>418</width>
           <x>0</x>
           <y>0</y>
           <width>418</width>

-          <height>296</height>
+          <height>294</height>

          </rect>
         </property>
        </widget>
          </rect>
         </property>
        </widget>


@@ -69,6 +69,28 @@
      </item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout" >
      </item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout" >

+       <item>
+        <widget class="QToolButton" name="alarmButton" >
+         <property name="text" >
+          <string>...</string>
+         </property>
+         <property name="icon" >
+          <iconset resource="../icons.qrc" >
+           <normaloff>:/icons/alarm-offBig.png</normaloff>:/icons/alarm-offBig.png</iconset>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="favouriteButton" >
+         <property name="text" >
+          <string>...</string>
+         </property>
+         <property name="icon" >
+          <iconset resource="../icons.qrc" >
+           <normaloff>:/icons/favourite-offBig.png</normaloff>:/icons/favourite-offBig.png</iconset>
+         </property>
+        </widget>
+       </item>

        <item>
         <spacer name="horizontalSpacer" >
          <property name="orientation" >
        <item>
         <spacer name="horizontalSpacer" >
          <property name="orientation" >


@@ -95,7 +117,9 @@
    </item>
   </layout>
  </widget>
    </item>
   </layout>
  </widget>

- <resources/>
+ <resources>
+  <include location="../icons.qrc" />
+ </resources>

  <connections>
   <connection>
    <sender>okButton</sender>
  <connections>
   <connection>
    <sender>okButton</sender>

diff --git a/src/gui/tabcontainer.cpp b/src/gui/tabcontainer.cpp
index 993b9a2474b97fea23ef469fd4eb727b59252114..3d3cc7ba03f4e731de97b2bfbc89e004e6bf0b11 100644 (file)
--- a/src/gui/tabcontainer.cpp
+++ b/src/gui/tabcontainer.cpp
@@ -136,7 +136,9 @@ void TabContainer::itemClicked(const QModelIndex &aIndex)
         return;
 
     EventDialog dialog(static_cast<Event*>(aIndex.internalPointer())->id(),this);
         return;
 
     EventDialog dialog(static_cast<Event*>(aIndex.internalPointer())->id(),this);

+    connect(&dialog, SIGNAL(eventHasChanged(int)), this, SIGNAL(eventHasChanged(int)));

     dialog.exec();
     dialog.exec();

+    disconnect(&dialog, SIGNAL(eventHasChanged(int)), this, SIGNAL(eventHasChanged(int)));

 }
 
 void TabContainer::displayMap(const QModelIndex &aIndex)
 }
 
 void TabContainer::displayMap(const QModelIndex &aIndex)