Fav table update

M    trunk/src/gui/mainwindow.h
M    trunk/src/gui/mainwindow.cpp
M    trunk/src/mvc/treeview.h
M    trunk/src/mvc/eventmodel.cpp
M    trunk/src/mvc/event.h
M    trunk/src/fosdem.pro

diff --git a/src/fosdem.pro b/src/fosdem.pro
index fb46540155b8dd712df6ad8af2f537ce1ad9b2eb..374b7b07d36982dad159475a81a190a9858002ff 100644 (file)
--- a/src/fosdem.pro
+++ b/src/fosdem.pro
@@ -3,5 +3,5 @@ TEMPLATE = subdirs
 SUBDIRS  = orm mvc sql gui app
 maemo : SUBDIRS += alarm
 #SUBDIRS += test
-CONFIG += ordered
+CONFIG += ordered debug
 

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 09263da05f907ae24434df8c320dcb819e876db4..574735683049c273419dccb84b2cd1472e42a573 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -36,6 +36,7 @@ MainWindow::MainWindow(QWidget *parent)
 
     connect(dayNavigator, SIGNAL(dateChanged(const QDate &)), SLOT(updateDayView(const QDate &)));
 
+
     // DAY EVENTS View
     dayTreeView->setHeaderHidden(true);
     dayTreeView->setRootIsDecorated(false);
@@ -66,6 +67,9 @@ MainWindow::MainWindow(QWidget *parent)
         int confId = 1;
         dayNavigator->setDates(Conference::getById(confId).start(),Conference::getById(confId).end());
     }
+
+    connect(static_cast<EventModel*>(dayTreeView->model()), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), SLOT(updateFavView()));
+    connect(static_cast<EventModel*>(favTreeView->model()), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), SLOT(updateFavView()));
 }
 
 MainWindow::~MainWindow()
@@ -126,3 +130,10 @@ void MainWindow::updateDayView(const QDate &aDate)
     dayNavigator->show();
 }
 
+void MainWindow::updateFavView()
+{
+    int confId = 1;
+    static_cast<EventModel*>(favTreeView->model())->loadFavEvents(Conference::getById(confId).start(),confId);
+    favTreeView->reset();
+    updateDayView(Conference::getById(confId).start());
+}

diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index c0716beec86131a2d92d4e5d8c481c8094ae957a..670df9516a328c8dda4c018e1e2f280c3aae7925 100644 (file)
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -19,6 +19,7 @@ private slots:
     void showParsingProgress(int aStatus);
     void aboutApp();
     void updateDayView(const QDate &aDate);
+    void updateFavView();
 private:
     SqlEngine *mSqlEngine;
     ScheduleXmlParser *mXmlParser;

diff --git a/src/mvc/event.h b/src/mvc/event.h
index 2433016dacffef66daa9d05e5fc3fb455f7c04db..b09daa8516eeb291e6c8996b79cafde7090c1577 100644 (file)
--- a/src/mvc/event.h
+++ b/src/mvc/event.h
@@ -26,7 +26,6 @@ public:
 
 public:
     static Event getById(int id, int conferenceId);
-    static Event getVirtualById(int id, int conferenceId);
     static QList<Event> getByDate(const QDate& date, int conferenceId);
     static QList<Event> getFavByDate(const QDate& date, int conferenceId); // get Favourities by Date
 

diff --git a/src/mvc/eventmodel.cpp b/src/mvc/eventmodel.cpp
index 650c37249f29731ca78a55e9906984d5d60d5032..f00750de6b2252aaf5462a340aad77cce1db1a6f 100644 (file)
--- a/src/mvc/eventmodel.cpp
+++ b/src/mvc/eventmodel.cpp
@@ -47,16 +47,11 @@ QVariant EventModel::data(const QModelIndex& index, int role) const
     if (index.isValid() && role == Qt::DisplayRole)
     {
         if (index.internalId() == 0)
-        {   //range of time data
-            //qDebug() << qVariantValue<QString>(mGroups.at(index.row()).mTitle);
+        {
             return mGroups.at(index.row()).mTitle;
         }
         else //event data
         {
-            //qDebug() << qVariantValue<QString>(static_cast<Event*>(index.internalPointer())->id());
-            //return static_cast<Event*>(index.internalPointer())->id();
-            //qDebug() << Event::getVirtualById(static_cast<Event*>(index.internalPointer())->id(), 1).title();// Id Conference is 1 by now
-            //return 1;
             return static_cast<Event*>(index.internalPointer())->id();
         }
     }

diff --git a/src/mvc/treeview.h b/src/mvc/treeview.h
index 2a8190788f70ec3295249e9e2ced383e7fee876b..fe8e0e222e15392bdb9779625e3661276a7af149 100644 (file)
--- a/src/mvc/treeview.h
+++ b/src/mvc/treeview.h
@@ -3,6 +3,7 @@
 
 #include <QTreeView>
 
+
 class TreeView : public QTreeView
 {
 public: