Merged and got it partly working

[qtmeetings] / src / UserInterface / Views / WeeklyViewWidget.h

diff --git a/src/UserInterface/Views/WeeklyViewWidget.h b/src/UserInterface/Views/WeeklyViewWidget.h
index f0da141..055617b 100644 (file)
--- a/src/UserInterface/Views/WeeklyViewWidget.h
+++ b/src/UserInterface/Views/WeeklyViewWidget.h
@@ -1,7 +1,7 @@
 #ifndef WEEKLYVIEWWIDGET_H_\r
 #define WEEKLYVIEWWIDGET_H_\r
 \r
-#include "ObservedWidget.h"\r
+#include "ViewBase.h"\r
 #include <QDateTime>\r
 \r
 class QLabel;\r
@@ -19,7 +19,7 @@ class Room;
  * selected meeting room. User can select meeting room, browse weeks back and forth, and can navigate\r
  * back to the current week.\r
  */\r
-class WeeklyViewWidget : public ObservedWidget\r
+class WeeklyViewWidget : public ViewBase\r
 {\r
        Q_OBJECT\r
 \r
@@ -35,12 +35,6 @@ public:
        //! Destructor.\r
        virtual ~WeeklyViewWidget();\r
 \r
-       //! Current meeting\r
-       /*!\r
-        * Returns the current meeting if any\r
-        * \return Current meeting if any, otherwise null pointer\r
-        */\r
-       Meeting* currentMeeting();\r
        //! Current room\r
        /*!\r
         * Returns the currently selected meeting room.\r
@@ -54,7 +48,17 @@ public:
         * \return First day of week.\r
         */\r
        QDate beginnigOfShownWeek();\r
-\r
+       //! Sends the refresh command to schedule widget.\r
+       /*!\r
+        * Sends the refresh command to schedule widget.\r
+        * \param aMeetings The list of meetings.\r
+        */\r
+       void refreshMeetings( const QList<Meeting*> &aMeetings );\r
+       \r
+       void showCurrentWeek();\r
+       \r
+       void setDefaultRoom();\r
+       \r
 signals:\r
        //! Signals change of the meeting room.\r
        /*!\r
@@ -62,12 +66,6 @@ signals:
         * \param aNewRoom Selected meeting room.\r
         */\r
        void currentRoomChanged( Room *aNewRoom );\r
-       //! Signals change of the current meeting.\r
-       /*!\r
-        * Signal is emited when new meeting is started.\r
-        * \param aNewMeeting Meeting that has been started.\r
-        */\r
-       void currentMeetingChanged( Meeting *aNewMeeting );\r
        //! Meeting activated.\r
        /*!\r
         * Signal is emitted when a meeting is clicked by the user.\r
@@ -103,14 +101,14 @@ signals:
        /*!\r
         * Signal is emited when settings button is clicked.\r
         */\r
-       void showSettingsView();\r
+       void settingsButtonClicked();\r
        \r
        //! Signal. Emitted if the shown week has been changed.\r
        /*!\r
         * Signal. Emitted if the shown week has been changed.
         * \param aDate The first date of the shown week.
         */
-       void shownWeekChanged( QDate aDate );
+       void shownWeekChanged( QDate aDate );\r
 \r
 public slots:\r
        //! Sets the date and time\r
@@ -119,24 +117,12 @@ public slots:
         * \param aCurrentDateTime Date and time to be displayd.\r
         */\r
        void setCurrentDateTime( QDateTime aCurrentDateTime );\r
-       //! Insert meeting\r
-       /*!\r
-        * Inserts new meeting into the calendar\r
-        * \param aMeeting Meeting to be inserted.\r
-        */\r
-       void insertMeeting( Meeting *aMeeting );\r
-       //! Delete meeting\r
-       /*!\r
-        * Removes meeting from the calendar\r
-        * \param aMeeting Meeting to be deleted.\r
-        */\r
-       void deleteMeeting( Meeting *aMeeting );\r
-       //! Update meeting\r
+       //! Handle resizing\r
        /*!\r
-        * Updates the display of given meeting in calendar.\r
-        * \param aMeeting Meeting to be updated.\r
+        * Handle possible resize changes after the view is resized\r
+        * to match the window managers client area.\r
         */\r
-       void updateMeeting( Meeting *aMeeting );\r
+       void viewResized(const QSize &newSize, const QSize &oldSize) { }\r
 \r
 private:\r
        //! Displays the selectable meeting rooms.\r