projects
/
qtmeetings
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
f4c4762
..
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
#ifndef WEEKLYVIEWWIDGET_H_
\r
#define WEEKLYVIEWWIDGET_H_
\r
\r
-#include "ObservedWidget.h"
\r
+#include "ViewBase.h"
\r
#include <QDateTime>
\r
\r
class QLabel;
\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
* 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
{
\r
Q_OBJECT
\r
\r
@@
-101,14
+101,14
@@
signals:
/*!
\r
* Signal is emited when settings button is clicked.
\r
*/
\r
/*!
\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.
*/
\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
\r
public slots:
\r
//! Sets the date and time
\r
@@
-117,6
+117,12
@@
public slots:
* \param aCurrentDateTime Date and time to be displayd.
\r
*/
\r
void setCurrentDateTime( QDateTime aCurrentDateTime );
\r
* \param aCurrentDateTime Date and time to be displayd.
\r
*/
\r
void setCurrentDateTime( QDateTime aCurrentDateTime );
\r
+ //! Handle resizing
\r
+ /*!
\r
+ * Handle possible resize changes after the view is resized
\r
+ * to match the window managers client area.
\r
+ */
\r
+ void viewResized(const QSize &newSize, const QSize &oldSize) { }
\r
\r
private:
\r
//! Displays the selectable meeting rooms.
\r
\r
private:
\r
//! Displays the selectable meeting rooms.
\r