Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-27 07:41:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added a Status Label for typing..., to display on top of the textedit and not more on statusbar.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3400 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-08-28 14:59:49 +00:00
parent d352621f74
commit a0e426a527
2 changed files with 47 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -360,6 +360,7 @@ void PopupChatDialog::contextMenu( QPoint point )
void PopupChatDialog::resetStatusBar() void PopupChatDialog::resetStatusBar()
{ {
statusBar()->showMessage(tr("Chatting with ") + QString::fromStdString(dialogName)) ; statusBar()->showMessage(tr("Chatting with ") + QString::fromStdString(dialogName)) ;
ui.statusLabel->setText(QString("")) ;
} }
void PopupChatDialog::updateStatusTyping() void PopupChatDialog::updateStatusTyping()
@ -376,7 +377,8 @@ void PopupChatDialog::updateStatusTyping()
// //
void PopupChatDialog::updateStatusString(const QString& status_string) void PopupChatDialog::updateStatusString(const QString& status_string)
{ {
statusBar()->showMessage(status_string,5000) ; // displays info for 5 secs. //statusBar()->showMessage(status_string,5000) ; // displays info for 5 secs.
ui.statusLabel->setText(status_string) ; // displays info for 5 secs.
QTimer::singleShot(5000,this,SLOT(resetStatusBar())) ; QTimer::singleShot(5000,this,SLOT(resetStatusBar())) ;
} }

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

@ -27,12 +27,9 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="horizontalSpacing"> <property name="spacing">
<number>1</number> <number>1</number>
</property> </property>
<property name="verticalSpacing">
<number>2</number>
</property>
<item row="0" column="0" rowspan="3"> <item row="0" column="0" rowspan="3">
<widget class="QFrame" name="frame"> <widget class="QFrame" name="frame">
<property name="sizePolicy"> <property name="sizePolicy">
@ -105,7 +102,7 @@
<widget class="QFrame" name="avatarframe"> <widget class="QFrame" name="avatarframe">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>118</width> <width>120</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
@ -117,13 +114,13 @@
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>2</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>2</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>9</number> <number>9</number>
@ -291,7 +288,7 @@ border-image: url(:/images/closepressed.png)
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="handleWidth"> <property name="handleWidth">
<number>5</number> <number>2</number>
</property> </property>
<widget class="QTextBrowser" name="textBrowser"> <widget class="QTextBrowser" name="textBrowser">
<property name="sizePolicy"> <property name="sizePolicy">
@ -331,6 +328,25 @@ p, li { white-space: pre-wrap; }
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
<widget class="QWidget" name="">
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>1</number>
</property>
<item>
<widget class="QLabel" name="statusLabel">
<property name="text">
<string/>
</property>
<property name="margin">
<number>0</number>
</property>
<property name="indent">
<number>3</number>
</property>
</widget>
</item>
<item>
<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">
@ -350,6 +366,9 @@ border-radius: 6px;
background: white;}</string> background: white;}</string>
</property> </property>
</widget> </widget>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
<item row="2" column="2"> <item row="2" column="2">
@ -810,6 +829,7 @@ border: 1px solid #CCCCCC;
<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>