projects
/
qtmeetings
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Squashed commit of the following:
[qtmeetings]
/
src
/
UserInterface
/
Views
/
RoomStatusIndicatorWidget.cpp
diff --git
a/src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
b/src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
index
0295a40
..
ebe2a90
100644
(file)
--- a/
src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
+++ b/
src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
@@
-33,7
+33,6
@@
RoomStatusIndicatorWidget::RoomStatusIndicatorWidget(Room *aDefaultRoom, Room::S
iDefaultRoomLabel
= ToolBox::createLabel(aDefaultRoom->name(), importantTextFont);
iDefaultRoomLabel->setAlignment(Qt::AlignHCenter);
iDefaultRoomLabel
= ToolBox::createLabel(aDefaultRoom->name(), importantTextFont);
iDefaultRoomLabel->setAlignment(Qt::AlignHCenter);
- iDefaultRoomLabel->setStyleSheet("background-color: transparent");
iDefaultRoomLabel->setHidden( true);
// is busy
iDefaultRoomLabel->setHidden( true);
// is busy
@@
-82,6
+81,12
@@
RoomStatusIndicatorWidget::RoomStatusIndicatorWidget(Room *aDefaultRoom, Room::S
statusChanged(aStatus, aUntil);
statusChanged(aStatus, aUntil);
+ QPalette palette;
+ palette.setColor( QPalette::Window, Qt::white );
+ palette.setColor( QPalette::WindowText, Qt::darkGray );
+ setPalette( palette );
+
+ setAutoFillBackground( true );
setFocusPolicy(Qt::StrongFocus);
setEnabled( true); // enable mouse & key events
}
setFocusPolicy(Qt::StrongFocus);
setEnabled( true); // enable mouse & key events
}
@@
-124,7
+129,9
@@
QPalette RoomStatusIndicatorWidget::createPalette(Room::Status aStatus)
}
QPalette palette;
}
QPalette palette;
- palette.setBrush(QPalette::Window, brush);
+ palette.setColor( QPalette::Window, Qt::white );
+ palette.setColor( QPalette::WindowText, Qt::darkGray );
+ palette.setBrush( QPalette::Window, brush );
return palette;
}
return palette;
}