Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-12 16:09:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added border style sheet for the Channel Thumbnail Label.

Browse Source 
Fixed to not allow to stretch the Description Label, when text is too big, then view the full text when frame is shown.
Removed one Button on PeerItem and use now a menu when want use the Advanced Messaging


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3478 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-09-13 14:24:26 +00:00
parent 690194d38f
commit a57ebbe623
4 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
retroshare-gui/src/gui/feeds/ChanMsgItem.cpp
View File

@ -128,6 +128,7 @@ void ChanMsgItem::updateItemStatic()
"PNG");
label->setPixmap(thumbnail);
label->setStyleSheet("QLabel#label{border: 2px solid #D3D3D3;border-radius: 2px;}");
}
if (mIsHome)

7
retroshare-gui/src/gui/feeds/ChanMsgItem.ui
View File

@ -155,6 +155,12 @@ p, li { white-space: pre-wrap; }
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>60</height>
</size>
</property>
<property name="text">
<string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@ -307,6 +313,7 @@ border-radius: 10px;}</string>
</widget>
<resources>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>

15
retroshare-gui/src/gui/feeds/PeerItem.cpp
View File

@ -55,7 +55,7 @@ PeerItem::PeerItem(FeedHolder *parent, uint32_t feedId, std::string peerId, uint
/* specific ones */
connect( chatButton, SIGNAL( clicked( void ) ), this, SLOT( openChat ( void ) ) );
connect( msgButton, SIGNAL( clicked( void ) ), this, SLOT( sendMsg ( void ) ) );
connect( actionNew_Message, SIGNAL( triggered( ) ), this, SLOT( sendMsg ( void ) ) );
connect( quickmsgButton, SIGNAL( clicked( ) ), this, SLOT( togglequickmessage() ) );
connect( cancelButton, SIGNAL( clicked( ) ), this, SLOT( togglequickmessage() ) );
@ -63,6 +63,11 @@ PeerItem::PeerItem(FeedHolder *parent, uint32_t feedId, std::string peerId, uint
connect( sendmsgButton, SIGNAL( clicked( ) ), this, SLOT( sendMessage() ) );
connect(NotifyQt::getInstance(), SIGNAL(peerHasNewAvatar(const QString&)), this, SLOT(updateAvatar(const QString&)));
QMenu *msgmenu = new QMenu();
msgmenu->addAction(actionNew_Message);
quickmsgButton->setMenu(msgmenu);
small();
updateItemStatic();
@ -135,9 +140,7 @@ void PeerItem::updateItemStatic()
lastLabel->setText(tr("Unknown Peer"));
chatButton->setEnabled(false);
//addButton->setEnabled(false);
//removeButton->setEnabled(false);
msgButton->setEnabled(false);
}
if (mIsHome)
@ -205,13 +208,13 @@ void PeerItem::updateItem()
{
//addButton->setEnabled(false);
//removeButton->setEnabled(true);
msgButton->setEnabled(true);
quickmsgButton->setEnabled(true);
}
else
{
//addButton->setEnabled(true);
//removeButton->setEnabled(false);
msgButton->setEnabled(false);
quickmsgButton->setEnabled(false);
}
}

36
retroshare-gui/src/gui/feeds/PeerItem.ui
View File

@ -227,31 +227,8 @@ border-radius: 10px}</string>
<iconset resource="../images.qrc">
<normaloff>:/images/message-mail.png</normaloff>:/images/message-mail.png</iconset>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="msgButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Send Mail</string>
</property>
<property name="text">
<string>Write Message</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/mail_send.png</normaloff>:/images/mail_send.png</iconset>
<property name="popupMode">
<enum>QToolButton::MenuButtonPopup</enum>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
@ -576,6 +553,15 @@ border-radius: 10px}</string>
</widget>
</item>
</layout>
<action name="actionNew_Message">
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/mail_send.png</normaloff>:/images/mail_send.png</iconset>
</property>
<property name="text">
<string>Write Message</string>
</property>
</action>
</widget>
<resources>
<include location="../images.qrc"/>