projects
/
qtmeetings
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
[qtmeetings]
/
src
/
UserInterface
/
Views
/
RoomStatusIndicatorWidget.h
diff --git
a/src/UserInterface/Views/RoomStatusIndicatorWidget.h
b/src/UserInterface/Views/RoomStatusIndicatorWidget.h
index
67d40dc
..
643160a
100644
(file)
--- a/
src/UserInterface/Views/RoomStatusIndicatorWidget.h
+++ b/
src/UserInterface/Views/RoomStatusIndicatorWidget.h
@@
-60,8
+60,14
@@
public slots:
*/
\r
void statusChanged( const Room::Status aStatus, const QTime aUntil );
\r
\r
*/
\r
void statusChanged( const Room::Status aStatus, const QTime aUntil );
\r
\r
+ void currentRoomChanged( Room *aRoom );
\r
+
\r
void viewResized(const QSize &newSize, const QSize &oldSize) { }
\r
\r
void viewResized(const QSize &newSize, const QSize &oldSize) { }
\r
\r
+ void connectionEstablished();
\r
+
\r
+ void connectionLost();
\r
+
\r
private:
\r
//! Translates the status into human readable text.
\r
/*!
\r
private:
\r
//! Translates the status into human readable text.
\r
/*!
\r
@@
-82,6
+88,7
@@
private:
QLabel *iDefaultRoomLabel;
\r
QLabel *iStatusLabel;
\r
QLabel *iUntilTextLabel;
\r
QLabel *iDefaultRoomLabel;
\r
QLabel *iStatusLabel;
\r
QLabel *iUntilTextLabel;
\r
+ QLabel *iConnectionLabel;
\r
TimeDisplayWidget *iTimeDisplay;
\r
QString iTimeFormat;
\r
\r
TimeDisplayWidget *iTimeDisplay;
\r
QString iTimeFormat;
\r
\r