Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:00:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/worklist/hifi into 19495

Browse source
This commit is contained in:
stojce 2014-03-12 23:11:55 +01:00
commit e6ea51a8bd
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/interface_en.ts
View file

@ -28,19 +28,19 @@
<name>ChatWindow</name> <name>ChatWindow</name>
<message> <message>
<location filename="ui/chatWindow.ui" line="14"/> <location filename="ui/chatWindow.ui" line="14"/>
<location filename="../build/interface/ui_chatWindow.h" line="112"/> <location filename="../build/interface/ui_chatWindow.h" line="113"/>
<source>Chat</source> <source>Chat</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/chatWindow.ui" line="41"/> <location filename="ui/chatWindow.ui" line="41"/>
<location filename="../build/interface/ui_chatWindow.h" line="113"/> <location filename="../build/interface/ui_chatWindow.h" line="114"/>
<source>Connecting to XMPP...</source> <source>Connecting to XMPP...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/chatWindow.ui" line="60"/> <location filename="ui/chatWindow.ui" line="60"/>
<location filename="../build/interface/ui_chatWindow.h" line="114"/> <location filename="../build/interface/ui_chatWindow.h" line="115"/>
<source> online now:</source> <source> online now:</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

5
interface/src/ui/ChatWindow.cpp
View file

@ -184,11 +184,8 @@ void ChatWindow::messageReceived(const QXmppMessage& message) {
} }
QLabel* userLabel = new QLabel(getParticipantName(message.from())); QLabel* userLabel = new QLabel(getParticipantName(message.from()));
QFont font = userLabel->font();
font.setBold(true);
userLabel->setFont(font);
userLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); userLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
userLabel->setStyleSheet("padding: 2px;"); userLabel->setStyleSheet("padding: 2px; font-weight: bold");
userLabel->setAlignment(Qt::AlignTop); userLabel->setAlignment(Qt::AlignTop);
QLabel* messageLabel = new QLabel(message.body().replace(regexLinks, "<a href=\"\\1\">\\1</a>")); QLabel* messageLabel = new QLabel(message.body().replace(regexLinks, "<a href=\"\\1\">\\1</a>"));

5
interface/ui/chatWindow.ui
View file

@ -67,7 +67,7 @@
<item> <item>
<widget class="QScrollArea" name="messagesScrollArea"> <widget class="QScrollArea" name="messagesScrollArea">
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">margin-top: 12px;</string> <string notr="true">margin-top: 12px; font-family: Helvetica, Arial, sans-serif;</string>
</property> </property>
<property name="horizontalScrollBarPolicy"> <property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum> <enum>Qt::ScrollBarAlwaysOff</enum>
@ -121,6 +121,9 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="styleSheet">
<string notr="true">font-family: Helvetica, Arial, sans-serif;</string>
</property>
<property name="horizontalScrollBarPolicy"> <property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum> <enum>Qt::ScrollBarAlwaysOff</enum>
</property> </property>