Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-27 08:29:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added a pixmap Label for display the typing icon for Private Chat

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3452 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-09-06 20:54:48 +00:00
parent a3fc110a82
commit 452faffa4b
3 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
retroshare-gui/src/gui/chat/PopupChatDialog.cpp
View File

@ -413,7 +413,8 @@ void PopupChatDialog::contextMenu( QPoint point )
void PopupChatDialog::resetStatusBar() void PopupChatDialog::resetStatusBar()
{ {
ui.statusLabel->setText(QString("")) ; ui.statusLabel->clear();
ui.typingpixmapLabel->clear();
} }
void PopupChatDialog::updateStatusTyping() void PopupChatDialog::updateStatusTyping()
@ -435,6 +436,7 @@ void PopupChatDialog::updateStatusString(const QString& peer_id, const QString&
{ {
QString status = QString::fromStdString(rsPeers->getPeerName(peer_id.toStdString())) + " " + tr(status_string.toAscii()); QString status = QString::fromStdString(rsPeers->getPeerName(peer_id.toStdString())) + " " + tr(status_string.toAscii());
ui.statusLabel->setText(status) ; // displays info for 5 secs. ui.statusLabel->setText(status) ; // displays info for 5 secs.
ui.typingpixmapLabel->setPixmap(QPixmap(":images/typing.png") );
QTimer::singleShot(5000,this,SLOT(resetStatusBar())) ; QTimer::singleShot(5000,this,SLOT(resetStatusBar())) ;
} }

36
retroshare-gui/src/gui/chat/PopupChatDialog.ui
View File

@ -222,7 +222,7 @@ border-image: url(:/images/avatarstatus_bg.png);
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout_4">
<property name="leftMargin"> <property name="leftMargin">
<number>2</number> <number>2</number>
</property> </property>
@ -405,11 +405,11 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
<widget class="QWidget" name="layoutWidget"> <widget class="QWidget" name="layoutWidget">
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QGridLayout" name="gridLayout_3">
<property name="spacing"> <property name="spacing">
<number>1</number> <number>0</number>
</property> </property>
<item> <item row="0" column="1">
<widget class="QLabel" name="statusLabel"> <widget class="QLabel" name="statusLabel">
<property name="text"> <property name="text">
<string/> <string/>
@ -422,7 +422,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="2" column="0" colspan="2">
<widget class="QTextEdit" name="chattextEdit"> <widget class="QTextEdit" name="chattextEdit">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@ -443,6 +443,28 @@ background: white;}</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0">
<widget class="QLabel" name="typingpixmapLabel">
<property name="minimumSize">
<size>
<width>18</width>
<height>18</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>18</width>
<height>18</height>
</size>
</property>
<property name="text">
<string>T</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>
@ -955,6 +977,10 @@ p, li { white-space: pre-wrap; }
<include location="../images.qrc"/> <include location="../images.qrc"/>
<include location="../images.qrc"/> <include location="../images.qrc"/>
<include location="../images.qrc"/> <include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

BIN
retroshare-gui/src/gui/images/typing.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 877 B

After

Width:  |  Height:  |  Size: 741 B