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

Merge pull request #2232 from defnax/ui-fixes-7

Browse Source 
Fixed Group Chat toaster to use No Frame
This commit is contained in:
defnax 2021-01-16 23:02:39 +01:00 committed by GitHub
commit 7861dcb32e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
retroshare-gui/src/gui/People/PeopleDialog.cpp
View File

@ -69,6 +69,7 @@ PeopleDialog::PeopleDialog(QWidget *parent)
tabWidget->removeTab(1); tabWidget->removeTab(1);
//hide circle flow widget not functional yet //hide circle flow widget not functional yet
pictureFlowWidgetExternal->hide(); pictureFlowWidgetExternal->hide();
widgetExternal->hide();
//need erase QtCreator Layout first(for Win) //need erase QtCreator Layout first(for Win)
delete idExternal->layout(); delete idExternal->layout();

80
retroshare-gui/src/gui/People/PeopleDialog.ui
View File

@ -20,76 +20,25 @@
<string/> <string/>
</property> </property>
<layout class="QGridLayout" name="titleBarLayout"> <layout class="QGridLayout" name="titleBarLayout">
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QFrame" name="titleBarFrame">
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<layout class="QHBoxLayout">
<property name="margin">
<number>2</number>
</property>
<item>
<widget class="QLabel" name="titleBarPixmap">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/identity/identities_32.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="StyledLabel" name="titleBarLabel">
<property name="text">
<string>People</string>
</property>
</widget>
</item>
<item>
<spacer name="titleBarSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="tabExternal"> <widget class="QWidget" name="tabExternal">
<property name="sizePolicy"> <property name="sizePolicy">
@ -129,7 +78,7 @@
<layout class="QVBoxLayout"/> <layout class="QVBoxLayout"/>
</widget> </widget>
</widget> </widget>
<widget class="QWidget" name="widgetExternal"> <widget class="QFrame" name="widgetExternal">
<layout class="QGridLayout" name="layoutExternal"> <layout class="QGridLayout" name="layoutExternal">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_External"> <widget class="QLabel" name="label_External">
@ -234,11 +183,6 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
<customwidget> <customwidget>
<class>PictureFlow</class> <class>PictureFlow</class>
<extends>QWidget</extends> <extends>QWidget</extends>

2
retroshare-gui/src/gui/toaster/GroupChatToaster.cpp
View File

@ -37,7 +37,7 @@ GroupChatToaster::GroupChatToaster(const RsPeerId &peerId, const QString &messag
/* set informations */ /* set informations */
ui.textLabel->setText(RsHtml().formatText(NULL, message, RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS | RSHTML_FORMATTEXT_CLEANSTYLE)); ui.textLabel->setText(RsHtml().formatText(NULL, message, RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS | RSHTML_FORMATTEXT_CLEANSTYLE));
ui.toasterLabel->setText(QString::fromUtf8(rsPeers->getPeerName(peerId).c_str())); ui.toasterLabel->setText(QString::fromUtf8(rsPeers->getPeerName(peerId).c_str()));
ui.avatarWidget->setFrameType(AvatarWidget::STATUS_FRAME); ui.avatarWidget->setFrameType(AvatarWidget::NO_FRAME);
ui.avatarWidget->setDefaultAvatar(":/images/user/personal64.png"); ui.avatarWidget->setDefaultAvatar(":/images/user/personal64.png");
ui.avatarWidget->setId(ChatId(peerId)); ui.avatarWidget->setId(ChatId(peerId));
} }