Changeset 1006c4f

Timestamp:

09/06/11 21:15:35 (11 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

c0559b6

Parents:

3655d06

Message:

Fixed ticket #26 (empty tabs after some actions).

Location:

src

Files:

• gui/daynavigatorwidget.cpp (modified) (1 diff)
• gui/daynavigatorwidget.h (modified) (1 diff)
• gui/tabcontainer.cpp (modified) (2 diffs)
• mvc/treeview.cpp (modified) (1 diff)

src/gui/daynavigatorwidget.cpp

@@ -46 +46 @@
     mStartDate = aStartDate;
     mEndDate = aEndDate;
-    mCurDate = aStartDate;
+    if (!mCurDate.isValid()) mCurDate = mStartDate;
+    else if (mCurDate < mStartDate) mCurDate = mStartDate;
+    else if (mCurDate > mEndDate) mCurDate = mEndDate;
 
-    // QRect rect = mFontMetrics->boundingRect(mCurDate.toString("MMM dd yyyy"));
-
-    if(mStartDate==mEndDate) // only one day conference
-    {
-        prevDayButton->setDisabled(true);
-        nextDayButton->setDisabled(true);
-        emit(dateChanged(mCurDate));
-    }
-    else
-    {
-        // at least 2-days conference
-        prevDayButton->setDisabled(true);
-        nextDayButton->setDisabled(false);
-        emit(dateChanged(mCurDate));
-    }
+    prevDayButton->setDisabled(mCurDate == mStartDate);
+    nextDayButton->setDisabled(mCurDate == mEndDate);
+    emit(dateChanged(mCurDate));
 }
 

src/gui/daynavigatorwidget.h

@@ -78 +78 @@
         ~DayNavigatorWidget() {}
         void setDates(const QDate &aStartDate, const QDate &aEndDate);
+        QDate curDate() const {return mCurDate;}
     protected:
         void paintEvent(QPaintEvent *);

src/gui/tabcontainer.cpp

@@ -97 +97 @@
     {
         // requires special handling
-        // eg. in case of favourities - some favourities may have changed
+        // eg. in case of favourites - some favourites may have changed
         // and so we need to reload them
         int confId = Conference::activeConference();
@@ -103 +103 @@
         QDate endDate = Conference::getById(confId).end();
         dayNavigator->setDates(startDate, endDate);
-        updateTreeView( Conference::getById(confId).start() );
+        updateTreeView(dayNavigator->curDate());
     }
     else

src/mvc/treeview.cpp

@@ -71 +71 @@
 
                 QList<Event> conflicts = Event::conflictEvents(event.id(),Conference::activeConference());
-                if(event.isFavourite())
-                    event.setFavourite(false);
-                else
-                    event.setFavourite(true);
+                event.setFavourite(!event.isFavourite());
                 event.update("favourite");