Changeset d4a8bbf

Timestamp:

01/20/10 16:27:11 (12 years ago)

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

a5c1179

Parents:

f2ef735

Message:

MAEMO: work on alarm

• snooze alarm
• cancel alarm
• run application which automatically display Event dialog for given Event ID

Location:

src

Files:

• alarm/alarm.cpp (modified) (2 diffs)
• app/main.cpp (modified) (1 diff)
• gui/alarmdialog.cpp (modified) (2 diffs)
• gui/alarmdialog.ui (modified) (1 diff)
• gui/eventdialog.cpp (modified) (2 diffs)
• gui/eventdialog.h (modified) (2 diffs)
• gui/mainwindow.cpp (modified) (3 diffs)
• gui/mainwindow.h (modified) (1 diff)

src/alarm/alarm.cpp

@@ -2 +2 @@
 
 #include <QDateTime>
+
+#include <QApplication>
+#include <QDir>
 
 int Alarm::addAlarm(int aEventId, const QDateTime &aDateTime)
@@ -19 +22 @@
     /* Add exec command action */
     action = alarm_event_add_actions(event, 1);
-    QString command = QString("/home/maemo/work/fosdem-maemo/bin/fosdem %1").arg(QString::number(aEventId));
+    QString command = QDir::currentPath() + "/" + *qApp->argv() + QString(" %1").arg(QString::number(aEventId));
     alarm_action_set_exec_command(action, command.toLocal8Bit().data());
     action->flags |= ALARM_ACTION_TYPE_EXEC;

src/app/main.cpp

@@ -23 +23 @@
     if(argc==3) 
         window = new AlarmDialog(argc,argv);
+    else if(argc==2) // display Event dialog automatically
+        window = new MainWindow(atoi(argv[1])); // eventId = argv[1]
     else
         window = new MainWindow;

src/gui/alarmdialog.cpp

@@ -6 +6 @@
 
 #include <QDir>
+#include <QProcess>
 
 const int SNOOZE_TIME = 5; // in minutes
@@ -48 +49 @@
 void AlarmDialog::runApp()
 {
-    qWarning("runApp(): NOT IMPLEMENTED YET");
+    QString program = QDir::currentPath() + "/" + *qApp->argv();
+    QProcess::startDetached(program,QStringList()<<QString::number(mEventId));
+    qApp->quit();
 }
 

src/gui/alarmdialog.ui

@@ -69 +69 @@
         <widget class="QPushButton" name="stopPB" >
          <property name="text" >
-          <string>Stop</string>
+          <string>Cancel</string>
          </property>
         </widget>

src/gui/eventdialog.cpp

@@ -3 +3 @@
 #include <QScrollBar>
 
-EventDialog::EventDialog(const QModelIndex &aIndex, QWidget *aParent)
+EventDialog::EventDialog(const int &aEventId, QWidget *aParent)
     : QDialog(aParent)
-    , mIndex(aIndex)
+    , mEventId(aEventId)
 {
     setupUi(this);
+
+    const int confId = 1;
+    Event event = Event::getById(aEventId,confId);
 
     abstract->setStyleSheet("background-color : transparent;");
@@ -28 +31 @@
     description->verticalScrollBar()->setPalette(p2);
 
-    Event *event = static_cast<Event *>(mIndex.internalPointer());
-    title->setText(event->title());
-    persons->setText(event->persons().join(" and "));
-    abstract->setPlainText(event->abstract());
-    description->setPlainText(event->description());
+    title->setText(event.title());
+    persons->setText(event.persons().join(" and "));
+    abstract->setPlainText(event.abstract());
+    description->setPlainText(event.description());
 }
 

src/gui/eventdialog.h

@@ -3 +3 @@
 
 #include <QDialog>
-#include <QModelIndex>
 #include "ui_eventdialog.h"
 #include <event.h>
@@ -10 +9 @@
 { 
 public:
-    EventDialog(const QModelIndex &aIndex, QWidget *aParent = NULL);
+    EventDialog(const int &aEventId, QWidget *aParent = NULL);
     ~EventDialog() {}
 private:
-    QModelIndex mIndex;
+    int mEventId;
 };
 

src/gui/mainwindow.cpp

@@ -21 +21 @@
 const int confId = 1;
 
-MainWindow::MainWindow(QWidget *parent)
-    : QMainWindow(parent)
+MainWindow::MainWindow(int aEventId, QWidget *aParent)
+    : QMainWindow(aParent)
 {
     setupUi(this);
@@ -116 +116 @@
     connect(tabWidget, SIGNAL(currentChanged(int)), this, SLOT(updateTab(int)));
 
+    // open dialog for given Event ID
+    // this is used in case Alarm Dialog request application to start
+    if(aEventId)
+    {
+        EventDialog dialog(aEventId,this);
+        dialog.exec();
+    }
 }
 
@@ -229 +236 @@
         return;
 
-    EventDialog dialog(aIndex,this);
+    EventDialog dialog(static_cast<Event*>(aIndex.internalPointer())->id(),this);
     dialog.exec();
 }

src/gui/mainwindow.h

@@ -13 +13 @@
     Q_OBJECT
 public:
-    MainWindow(QWidget *parent = 0);
+    // aEventId is used to inform widget to automatically open
+    // Event dialog for given Event ID
+    MainWindow(int aEventId = 0, QWidget *aParent = NULL);
     ~MainWindow();
 private slots: