Changeset a35aa83

Timestamp:

01/18/10 19:15:41 (12 years ago)

Author:

korrco <korrco@…>

Branches:

master, qt5

Children:

4be95b8

Parents:

fbc1646

Message:

grouping by time equation changed - beter group deviding, also according to favourites

Location:

src

Files:

• gui/mainwindow.cpp (modified) (2 diffs)
• gui/mainwindow.h (modified) (1 diff)
• mvc/eventmodel.cpp (modified) (1 diff)

src/gui/mainwindow.cpp

@@ -121 +121 @@
         int confId = 1;
         // 'dayNavigator' emits signal 'dateChanged' after setting valid START:END dates
-        dayNavigator->setDates(Conference::getById(confId).start(), Conference::getById(confId).end());
+        QDate aStartDate = Conference::getById(confId).start();
+        QDate aEndDate = Conference::getById(confId).end();
+        dayNavigator->setDates(aStartDate, aEndDate);
+        activityDayNavigator->setDates(aStartDate, aEndDate);
     }
 }
@@ -173 +176 @@
     activityDayNavigator->show();
 }
-
-void MainWindow::updateView(int tabIndex)
-{
-    //TODO korinpa: change to enum or names ?
-    qDebug() << "updateView index: " << tabIndex;
-    if (tabIndex == 0)
-    {
-        QDate date = dayNavigator->getCurrentDate();
-        updateDayView(date);
-    }
-    else if (tabIndex == 1)
-    {
-        updateFavView();
-    }
-    else if (tabIndex == 2)
-    {
-        QDate date = activityDayNavigator->getCurrentDate();
-        updateActivitiesDayView(date);
-    }
-}
-

src/gui/mainwindow.h

@@ -23 +23 @@
     /*void updateFavViewComplete();*/
     void updateActivitiesDayView(const QDate &aDate);
-    void updateView(int tabIndex);
 private:
     SqlEngine *mSqlEngine;

src/mvc/eventmodel.cpp

@@ -28 +28 @@
         QTime eventTime = mEvents.at(i).start().time();
 
-        if (nextGroupTime < eventTime)
+        if (nextGroupTime <= eventTime)
         {
             mGroups.last().mChildCount = i - mGroups.last().mFirstEventIndex;